Merge changes from topic "yl-interstitial" into main

* changes:
  Resize & round corners on a placeholder interstitial image
  Add interstitial for modes that are disabled but not by user
This commit is contained in:
Yuri Lin
2024-08-06 19:38:45 +00:00
committed by Android (Google) Code Review
9 changed files with 901 additions and 3 deletions

View File

@@ -1369,6 +1369,12 @@
android:value="true" />
</activity>
<activity
android:name=".notification.modes.SetupInterstitialActivity"
android:exported="false"
android:theme="@style/Theme.Settings.NoActionBar">
</activity>
<activity
android:name=".notification.zen.ZenSuggestionActivity"
android:label="@string/zen_mode_settings_title"

View File

@@ -0,0 +1,126 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2024 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<LinearLayout
android:id="@+id/interstitial_page"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:transitionGroup="true"
android:orientation="vertical">
<Toolbar
android:id="@+id/action_bar"
style="?android:attr/actionBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?android:attr/actionBarTheme"
android:elevation="0dp"
android:background="@android:color/transparent"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="12dp"
android:paddingBottom="24dp"
android:paddingHorizontal="24dp"
android:clipChildren="true">
<ScrollView
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constrainedHeight="true"
app:layout_constraintBottom_toTopOf="@+id/enable_mode_button"
app:layout_constraintEnd_toStartOf="@+id/guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingEnd="12dp"
android:paddingStart="12dp">
<TextView
android:id="@+id/mode_name_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
android:paddingVertical="12dp"
android:textSize="36sp"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title" />
<TextView
android:id="@+id/mode_name_subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
android:paddingBottom="12dp"
android:text="@string/zen_mode_setup_page_summary"
android:textSize="18sp"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" />
</LinearLayout>
</ScrollView>
<Button
android:id="@+id/enable_mode_button"
style="@style/ActionPrimaryButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline"
android:paddingEnd="12dp" />
<!-- guideline to have text/button side & image side take up half the page each -->
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
<FrameLayout
android:id="@+id/image_frame"
android:layout_height="0dp"
android:layout_width="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/guideline"
app:layout_constraintEnd_toEndOf="parent"
android:paddingHorizontal="12dp">
<ImageView
android:id="@+id/image"
android:clickable="false"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:layout_gravity="center" />
</FrameLayout>
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

View File

@@ -0,0 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2024 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<LinearLayout
android:id="@+id/interstitial_page"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:transitionGroup="true"
android:orientation="vertical">
<Toolbar
android:id="@+id/action_bar"
style="?android:attr/actionBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?android:attr/actionBarTheme"
android:elevation="0dp"
android:background="@android:color/transparent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="12dp"
android:paddingBottom="64dp"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:orientation="vertical">
<!-- image goes here -->
<FrameLayout
android:id="@+id/image_frame"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/mode_name_title"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:clickable="false"
android:scaleType="centerCrop"
android:layout_gravity="center" />
</FrameLayout>
<TextView
android:id="@+id/mode_name_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title"
app:layout_constraintBottom_toTopOf="@+id/mode_name_subtitle"
android:textSize="36sp"
android:paddingVertical="12dp" />
<TextView
android:id="@+id/mode_name_subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
android:text="@string/zen_mode_setup_page_summary"
android:textSize="18sp"
android:paddingBottom="12dp"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
app:layout_constraintBottom_toTopOf="@+id/enable_mode_button" />
<Button
android:id="@+id/enable_mode_button"
style="@style/ActionPrimaryButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintVertical_bias="1" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

View File

@@ -517,4 +517,6 @@
<dimen name="zen_mode_circular_icon_margin_between">4dp</dimen>
<dimen name="zen_mode_circular_icon_margin_vertical">8dp</dimen>
<dimen name="zen_mode_circular_icon_text_size">18dp</dimen>
<!-- For images in SetupInterstitialActivity -->
<dimen name="zen_mode_interstitial_corner_radius">30dp</dimen>
</resources>

View File

@@ -8014,6 +8014,12 @@
<!-- Subtitle for the Do not Disturb slice. [CHAR LIMIT=50]-->
<string name="zen_mode_slice_subtitle">Limit interruptions</string>
<!-- Priority Modes: Summary on a page prompting the user to set up/enable a mode [CHAR_LIMIT=NONE] -->
<string name="zen_mode_setup_page_summary">Block interruptions and distractions</string>
<!-- Priority Modes: Label on a button prompting the user to set up the mode with the given name. [CHAR_LIMIT=40] -->
<string name="zen_mode_setup_button_label">Set up <xliff:g id="mode" example="My Mode">%1$s</xliff:g></string>
<!-- Do not disturb: Title for the Do not Disturb dialog to turn on Do not disturb. [CHAR LIMIT=50]-->
<string name="zen_mode_settings_turn_on_dialog_title">Turn on Do Not Disturb</string>

View File

@@ -0,0 +1,267 @@
/*
* Copyright (C) 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.notification.modes;
import static android.graphics.drawable.GradientDrawable.LINEAR_GRADIENT;
import static android.graphics.drawable.GradientDrawable.Orientation.BL_TR;
import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
import android.app.ActionBar;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.Outline;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewOutlineProvider;
import android.view.ViewTreeObserver;
import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.Toolbar;
import androidx.activity.EdgeToEdge;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.notification.modes.ZenMode;
import com.android.settingslib.notification.modes.ZenModesBackend;
/**
* Interstitial page for modes that are disabled, but not disabled by the user. This page
* provides a button to enable the mode, and then goes to the mode setup page.
*/
public class SetupInterstitialActivity extends FragmentActivity {
private static final String TAG = "ModeSetupInterstitial";
private ZenModesBackend mBackend;
private final ViewOutlineProvider mOutlineProvider = new ViewOutlineProvider() {
@Override
public void getOutline(View view, Outline outline) {
// Provides a rounded rectangle outline whose width & height matches the View.
float cornerRadius = getResources().getDimensionPixelSize(
R.dimen.zen_mode_interstitial_corner_radius);
outline.setRoundRect(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight(),
cornerRadius);
}
};
/**
* Returns an intent leading to this page for the given mode and context.
*/
public static @NonNull Intent getIntent(@NonNull Context context, @NonNull ZenMode mode) {
return new Intent(Intent.ACTION_MAIN)
.setClass(context, SetupInterstitialActivity.class)
.setPackage(context.getPackageName())
.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT)
.putExtra(EXTRA_AUTOMATIC_ZEN_RULE_ID, mode.getId());
}
@Override
protected void onCreate(Bundle savedInstanceState) {
EdgeToEdge.enable(this);
Utils.setupEdgeToEdge(this);
super.onCreate(savedInstanceState);
mBackend = ZenModesBackend.getInstance(this);
setContentView(R.layout.mode_interstitial_layout);
// Set up toolbar to only have a back button & no title
Toolbar toolbar = findViewById(R.id.action_bar);
setActionBar(toolbar);
ActionBar actionBar = getActionBar();
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setHomeButtonEnabled(true);
actionBar.setDisplayShowTitleEnabled(false);
}
}
@Override
public boolean onNavigateUp() {
// have the home button on the action bar go back
getOnBackPressedDispatcher().onBackPressed();
return true;
}
@Override
protected void onResume() {
super.onResume();
// See if we have mode data
final Intent intent = getIntent();
if (intent == null) {
Log.w(TAG, "no intent found for modes interstitial");
finish();
}
String modeId = intent.getStringExtra(EXTRA_AUTOMATIC_ZEN_RULE_ID);
if (modeId == null) {
Log.w(TAG, "no mode id included in intent: " + intent);
finish();
}
ZenMode mode = mBackend.getMode(modeId);
if (mode == null) {
Log.w(TAG, "mode not found for mode id: " + modeId);
finish();
}
setTitle(mode.getName());
TextView title = findViewById(R.id.mode_name_title);
if (title != null) {
title.setText(mode.getName());
}
ImageView img = findViewById(R.id.image);
if (img != null) {
setImage(img, mode);
}
Button button = findViewById(R.id.enable_mode_button);
if (button != null) {
setupButton(button, mode);
}
}
private void setImage(@NonNull ImageView img, @NonNull ZenMode mode) {
img.setImageDrawable(getModeDrawable(mode));
img.setClipToOutline(true);
img.setOutlineProvider(mOutlineProvider);
FrameLayout frame = findViewById(R.id.image_frame);
if (frame == null) {
return;
}
if (img.getMeasuredWidth() == 0) {
// set up to resize after the global layout occurs
img.getViewTreeObserver().addOnGlobalLayoutListener(
new ViewTreeObserver.OnGlobalLayoutListener() {
@Override
public void onGlobalLayout() {
img.getViewTreeObserver().removeOnGlobalLayoutListener(this);
sizeImageToFrame(img, frame);
}
});
} else {
// measured already, resize it now
sizeImageToFrame(img, frame);
}
}
private Drawable getModeDrawable(@NonNull ZenMode mode) {
// TODO: b/332730534 - set actual images depending on mode type (asynchronously?)
GradientDrawable placeholder = new GradientDrawable();
placeholder.setSize(40, 60); // 4x6 rectangle, slightly taller than wide
placeholder.setGradientType(LINEAR_GRADIENT);
placeholder.setOrientation(BL_TR);
placeholder.setColors(new int[]{Color.BLACK, Color.WHITE});
return placeholder;
}
@VisibleForTesting
protected void sizeImageToFrame(ImageView img, FrameLayout frame) {
// width of the space we have available = overall size of frame - relevant padding
int frameHeight =
frame.getMeasuredHeight() - frame.getPaddingTop() - frame.getPaddingBottom();
int frameWidth =
frame.getMeasuredWidth() - frame.getPaddingLeft() - frame.getPaddingRight();
int imgHeight = img.getDrawable().getIntrinsicHeight();
int imgWidth = img.getDrawable().getIntrinsicWidth();
// if any of these are 0, give up because we won't be able to do the relevant math (and
// we probably don't have the relevant data set up)
if (frameHeight == 0 || frameWidth == 0 || imgHeight == 0 || imgWidth == 0) {
Log.w(TAG, "image or frame has invalid size parameters");
return;
}
float frameHWRatio = ((float) frameHeight) / frameWidth;
float imgHWRatio = ((float) imgHeight) / imgWidth;
// fit horizontal dimension if the frame has a taller ratio (height/width) than the image;
// otherwise, fit the vertical direction
boolean fitHorizontal = frameHWRatio > imgHWRatio;
ViewGroup.LayoutParams layoutParams = img.getLayoutParams();
if (layoutParams == null) {
Log.w(TAG, "image has null LayoutParams");
return;
}
if (fitHorizontal) {
layoutParams.width = frameWidth;
float scaledHeight = imgHWRatio * frameWidth;
layoutParams.height = (int) scaledHeight;
} else {
layoutParams.height = frameHeight;
float scaledWidth = /* w/h ratio */ (1 / imgHWRatio) * frameHeight;
layoutParams.width = (int) scaledWidth;
}
img.setLayoutParams(layoutParams);
}
private void setupButton(Button button, @NonNull ZenMode mode) {
button.setText(getString(R.string.zen_mode_setup_button_label, mode.getName()));
button.setOnClickListener(enableButtonListener(mode.getId()));
}
@VisibleForTesting
View.OnClickListener enableButtonListener(String modeId) {
return unused -> {
// When clicked, we first reload mode info in case it has changed in the interim,
// then enable the mode and then send the user to the mode's configuration page.
boolean updated = enableMode(modeId);
// Don't come back to this activity after sending the user to the modes page, if
// they happen to go back. Forward the activity result in case we got here (indirectly)
// from some app that is waiting for the result.
finish();
if (updated) {
ZenSubSettingLauncher.forMode(this, modeId)
.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT).launch();
}
};
}
// Enables the given mode after first refreshing its data from the backend. Returns true if
// the update went through, and false if for some reason the mode wasn't found.
private boolean enableMode(@NonNull String modeId) {
if (mBackend == null) {
return false;
}
ZenMode modeToUpdate = mBackend.getMode(modeId);
if (modeToUpdate == null) {
// tell the user the mode isn't found, for some reason
Toast.makeText(this, R.string.zen_mode_rule_not_found_text, Toast.LENGTH_SHORT)
.show();
return false;
}
modeToUpdate.getRule().setEnabled(true);
mBackend.updateMode(modeToUpdate);
return true;
}
}

View File

@@ -16,6 +16,8 @@
package com.android.settings.notification.modes;
import static com.android.settingslib.notification.modes.ZenMode.Status.DISABLED_BY_OTHER;
import android.app.AlertDialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
@@ -25,6 +27,7 @@ import android.view.MenuItem;
import androidx.activity.ComponentActivity;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.MenuProvider;
import com.android.settings.R;
@@ -41,6 +44,7 @@ public class ZenModeFragment extends ZenModeFragmentBase {
private static final int DELETE_MODE = 2;
private ModeMenuProvider mModeMenuProvider;
private boolean mSettingsObserverRegistered = false; // for ManualDurationPreferenceController
@Override
protected int getPreferenceScreenResId() {
@@ -82,9 +86,14 @@ public class ZenModeFragment extends ZenModeFragmentBase {
@Override
public void onStart() {
super.onStart();
ZenMode mode = getMode();
// Consider redirecting to the interstitial if the mode is disabled (but not by the user).
if (maybeRedirectToInterstitial(mode)) {
return;
}
// Set title for the entire screen
ZenMode mode = getMode();
ComponentActivity activity = getActivity();
if (mode != null && activity != null) {
activity.setTitle(mode.getName());
@@ -94,14 +103,27 @@ public class ZenModeFragment extends ZenModeFragmentBase {
// allow duration preference controller to listen for settings changes
use(ManualDurationPreferenceController.class).registerSettingsObserver();
mSettingsObserverRegistered = true;
}
private boolean maybeRedirectToInterstitial(@Nullable ZenMode mode) {
if (mode == null || mode.getStatus() != DISABLED_BY_OTHER) {
return false;
}
// don't come back here from the interstitial
finish();
mContext.startActivity(SetupInterstitialActivity.getIntent(mContext, mode));
return true;
}
@Override
public void onStop() {
if (getActivity() != null) {
if (getActivity() != null && mModeMenuProvider != null) {
getActivity().removeMenuProvider(mModeMenuProvider);
}
use(ManualDurationPreferenceController.class).unregisterSettingsObserver();
if (mSettingsObserverRegistered) {
use(ManualDurationPreferenceController.class).unregisterSettingsObserver();
}
super.onStop();
}

View File

@@ -0,0 +1,248 @@
/*
* Copyright (C) 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.notification.modes;
import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import androidx.test.core.app.ActivityScenario;
import com.android.settingslib.notification.modes.TestModeBuilder;
import com.android.settingslib.notification.modes.ZenMode;
import com.android.settingslib.notification.modes.ZenModesBackend;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class SetupInterstitialActivityTest {
private static final String MODE_ID = "modeId";
@Mock
private ZenModesBackend mBackend;
@Mock
private ImageView mImage;
@Mock
private Drawable mDrawable;
@Mock
private FrameLayout mFrame;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
// set global backend instance so that when the interstitial activity launches, it'll get
// this mock backend
ZenModesBackend.setInstance(mBackend);
when(mBackend.getMode(MODE_ID)).thenReturn(new TestModeBuilder().build());
when(mImage.getDrawable()).thenReturn(mDrawable);
when(mImage.getLayoutParams()).thenReturn(new ViewGroup.LayoutParams(0, 0));
}
@Test
public void enableButton_enablesModeAndRedirectsToModePage() {
ZenMode mode = new TestModeBuilder().setId(MODE_ID).setEnabled(false).build();
when(mBackend.getMode(MODE_ID)).thenReturn(mode);
// Set up scenario with this mode information
ActivityScenario<SetupInterstitialActivity> scenario =
ActivityScenario.launch(new Intent(Intent.ACTION_MAIN)
.setClass(RuntimeEnvironment.getApplication(),
SetupInterstitialActivity.class)
.putExtra(EXTRA_AUTOMATIC_ZEN_RULE_ID, MODE_ID));
scenario.onActivity(activity -> {
View.OnClickListener listener = activity.enableButtonListener(MODE_ID);
// simulate button press even though we don't actually have a button
listener.onClick(null);
// verify that the backend got a request to enable the mode
ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
verify(mBackend).updateMode(captor.capture());
ZenMode updatedMode = captor.getValue();
assertThat(updatedMode.getId()).isEqualTo(MODE_ID);
assertThat(updatedMode.isEnabled()).isTrue();
// confirm that the next activity is the mode page
Intent openModePageIntent = shadowOf(activity).getNextStartedActivity();
assertThat(openModePageIntent.getStringExtra(EXTRA_SHOW_FRAGMENT))
.isEqualTo(ZenModeFragment.class.getName());
Bundle fragmentArgs = openModePageIntent.getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
assertThat(fragmentArgs).isNotNull();
assertThat(fragmentArgs.getString(EXTRA_AUTOMATIC_ZEN_RULE_ID)).isEqualTo(MODE_ID);
});
scenario.close();
}
@Test
public void setImageToFrame_sizeZero() {
ActivityScenario<SetupInterstitialActivity> scenario =
ActivityScenario.launch(new Intent(Intent.ACTION_MAIN)
.setClass(RuntimeEnvironment.getApplication(),
SetupInterstitialActivity.class)
.putExtra(EXTRA_AUTOMATIC_ZEN_RULE_ID, MODE_ID));
scenario.onActivity(activity -> {
// when either the image or the frame has a size 0, we do nothing
when(mDrawable.getIntrinsicWidth()).thenReturn(0);
when(mDrawable.getIntrinsicHeight()).thenReturn(25);
when(mFrame.getMeasuredWidth()).thenReturn(40);
when(mFrame.getMeasuredHeight()).thenReturn(50);
activity.sizeImageToFrame(mImage, mFrame);
verify(mImage, never()).setLayoutParams(any());
});
scenario.close();
}
@Test
public void setImageToFrame_imageLargerThanFrame() {
ActivityScenario<SetupInterstitialActivity> scenario =
ActivityScenario.launch(new Intent(Intent.ACTION_MAIN)
.setClass(RuntimeEnvironment.getApplication(),
SetupInterstitialActivity.class)
.putExtra(EXTRA_AUTOMATIC_ZEN_RULE_ID, MODE_ID));
scenario.onActivity(activity -> {
// image: 900(w)x1500(h); frame: 600(w)x500(h)
// image expected to be scaled down to match the height of the frame -> 300(w)x500(h)
when(mDrawable.getIntrinsicWidth()).thenReturn(900);
when(mDrawable.getIntrinsicHeight()).thenReturn(1500);
when(mFrame.getMeasuredWidth()).thenReturn(600);
when(mFrame.getMeasuredHeight()).thenReturn(500);
ArgumentCaptor<ViewGroup.LayoutParams> captor = ArgumentCaptor.forClass(
ViewGroup.LayoutParams.class);
activity.sizeImageToFrame(mImage, mFrame);
verify(mImage).setLayoutParams(captor.capture());
ViewGroup.LayoutParams out = captor.getValue();
assertThat(out.width).isEqualTo(300);
assertThat(out.height).isEqualTo(500);
});
scenario.close();
}
@Test
public void setImageToFrame_imageSmallerThanFrame() {
ActivityScenario<SetupInterstitialActivity> scenario =
ActivityScenario.launch(new Intent(Intent.ACTION_MAIN)
.setClass(RuntimeEnvironment.getApplication(),
SetupInterstitialActivity.class)
.putExtra(EXTRA_AUTOMATIC_ZEN_RULE_ID, MODE_ID));
scenario.onActivity(activity -> {
// image: 300(w)x200(h); frame: 900(w)x1200(h)
// image expected to be scaled up to match the width of the frame -> 900(w)x600(h)
when(mDrawable.getIntrinsicWidth()).thenReturn(300);
when(mDrawable.getIntrinsicHeight()).thenReturn(200);
when(mFrame.getMeasuredWidth()).thenReturn(900);
when(mFrame.getMeasuredHeight()).thenReturn(1200);
ArgumentCaptor<ViewGroup.LayoutParams> captor = ArgumentCaptor.forClass(
ViewGroup.LayoutParams.class);
activity.sizeImageToFrame(mImage, mFrame);
verify(mImage).setLayoutParams(captor.capture());
ViewGroup.LayoutParams out = captor.getValue();
assertThat(out.width).isEqualTo(900);
assertThat(out.height).isEqualTo(600);
});
scenario.close();
}
@Test
public void setImageToFrame_horizontalImageNarrowerThanFrame() {
ActivityScenario<SetupInterstitialActivity> scenario =
ActivityScenario.launch(new Intent(Intent.ACTION_MAIN)
.setClass(RuntimeEnvironment.getApplication(),
SetupInterstitialActivity.class)
.putExtra(EXTRA_AUTOMATIC_ZEN_RULE_ID, MODE_ID));
scenario.onActivity(activity -> {
// image: 600(w)x400(h); frame: 1000(w)x100(h)
// both image and frame are wider than tall, but frame is much narrower
// so should fit image to height of frame -> 150(w)x100(h)
when(mDrawable.getIntrinsicWidth()).thenReturn(600);
when(mDrawable.getIntrinsicHeight()).thenReturn(400);
when(mFrame.getMeasuredWidth()).thenReturn(1000);
when(mFrame.getMeasuredHeight()).thenReturn(100);
ArgumentCaptor<ViewGroup.LayoutParams> captor = ArgumentCaptor.forClass(
ViewGroup.LayoutParams.class);
activity.sizeImageToFrame(mImage, mFrame);
verify(mImage).setLayoutParams(captor.capture());
ViewGroup.LayoutParams out = captor.getValue();
assertThat(out.width).isEqualTo(150);
assertThat(out.height).isEqualTo(100);
});
scenario.close();
}
@Test
public void setImageToFrame_accountsForPadding() {
ActivityScenario<SetupInterstitialActivity> scenario =
ActivityScenario.launch(new Intent(Intent.ACTION_MAIN)
.setClass(RuntimeEnvironment.getApplication(),
SetupInterstitialActivity.class)
.putExtra(EXTRA_AUTOMATIC_ZEN_RULE_ID, MODE_ID));
scenario.onActivity(activity -> {
// image: 200(w)x300(h); frame: 1000(w)x1000(h), 50 top/bottom padding, 100 l/r padding
// effective size of frame is therefore 800(w)x900(h)
// scale image to the height of the effective frame -> 600(w)x900(h)
when(mDrawable.getIntrinsicWidth()).thenReturn(200);
when(mDrawable.getIntrinsicHeight()).thenReturn(300);
when(mFrame.getMeasuredWidth()).thenReturn(1000);
when(mFrame.getMeasuredHeight()).thenReturn(1000);
when(mFrame.getPaddingTop()).thenReturn(50);
when(mFrame.getPaddingBottom()).thenReturn(50);
when(mFrame.getPaddingLeft()).thenReturn(100);
when(mFrame.getPaddingRight()).thenReturn(100);
ArgumentCaptor<ViewGroup.LayoutParams> captor = ArgumentCaptor.forClass(
ViewGroup.LayoutParams.class);
activity.sizeImageToFrame(mImage, mFrame);
verify(mImage).setLayoutParams(captor.capture());
ViewGroup.LayoutParams out = captor.getValue();
assertThat(out.width).isEqualTo(600);
assertThat(out.height).isEqualTo(900);
});
scenario.close();
}
}

View File

@@ -0,0 +1,125 @@
/*
* Copyright (C) 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.notification.modes;
import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
import android.content.Intent;
import android.os.Bundle;
import androidx.fragment.app.testing.FragmentScenario;
import androidx.lifecycle.Lifecycle;
import com.android.settingslib.notification.modes.TestModeBuilder;
import com.android.settingslib.notification.modes.ZenMode;
import com.android.settingslib.notification.modes.ZenModesBackend;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class)
public class ZenModeFragmentTest {
private static final String MODE_ID = "modeId";
@Mock
private ZenModesBackend mBackend;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
// set up static instance so that the fragment will get a mock version of the backend
ZenModesBackend.setInstance(mBackend);
}
// Sets up the scenario's fragment by passing in arguments setting the provided mode ID.
// After running this method, users can then use scenario.onFragment(fragment -> {...}) on the
// returned scenario to test fragment behavior.
private FragmentScenario<ZenModeFragment> setUpScenarioForModeId(String modeId) {
Bundle args = new Bundle();
args.putString(EXTRA_AUTOMATIC_ZEN_RULE_ID, modeId);
return FragmentScenario.launch(
ZenModeFragment.class, /* bundle= */ args, 0, Lifecycle.State.INITIALIZED);
}
@Test
public void disabledMode_redirectsToInterstitial() {
// Mode is disabled, and not by the user
ZenMode mode = new TestModeBuilder().setId(MODE_ID).setEnabled(false, false)
.build();
when(mBackend.getMode(MODE_ID)).thenReturn(mode);
// actually set up fragment for testing
FragmentScenario scenario = setUpScenarioForModeId(MODE_ID);
scenario.moveToState(Lifecycle.State.STARTED);
scenario.onFragment(fragment -> {
// since the mode is disabled & not by the user, we should go to the next activity
Intent nextIntent = shadowOf(fragment.getActivity()).getNextStartedActivity();
assertThat(nextIntent).isNotNull();
assertThat(nextIntent.getComponent().getClassName()).isEqualTo(
SetupInterstitialActivity.class.getCanonicalName());
assertThat(nextIntent.getStringExtra(EXTRA_AUTOMATIC_ZEN_RULE_ID)).isEqualTo(MODE_ID);
});
scenario.close();
}
@Test
public void disabledMode_byUser_noRedirect() {
// Mode is disabled by the user
ZenMode mode = new TestModeBuilder().setId(MODE_ID).setEnabled(false, true)
.build();
when(mBackend.getMode(MODE_ID)).thenReturn(mode);
FragmentScenario scenario = setUpScenarioForModeId(MODE_ID);
scenario.moveToState(Lifecycle.State.STARTED);
scenario.onFragment(fragment -> {
// there shouldn't be a next started activity, because we don't redirect
Intent nextIntent = shadowOf(fragment.getActivity()).getNextStartedActivity();
assertThat(nextIntent).isNull();
});
scenario.close();
}
@Test
public void enabledMode_noRedirect() {
// enabled rule
ZenMode mode = new TestModeBuilder().setId(MODE_ID).setEnabled(true)
.build();
when(mBackend.getMode(MODE_ID)).thenReturn(mode);
FragmentScenario scenario = setUpScenarioForModeId(MODE_ID);
scenario.moveToState(Lifecycle.State.STARTED);
scenario.onFragment(fragment -> {
// there shouldn't be a next started activity, because we don't redirect
Intent nextIntent = shadowOf(fragment.getActivity()).getNextStartedActivity();
assertThat(nextIntent).isNull();
});
scenario.close();
}
}