From 53bded37f25436db0a3c11fdb4560a0d2caddeac Mon Sep 17 00:00:00 2001 From: Tsung-Mao Fang Date: Thu, 25 Mar 2021 18:09:27 +0800 Subject: [PATCH 1/8] Add collapsing toolbar to Device Admin Add page Test: Built the apk and see new collapsing tool bar on this page Fix: 183689071 Change-Id: I42457fc75f2b725b39e1a1187ffa6d21f5bfe164 --- AndroidManifest.xml | 1 + .../specialaccess/deviceadmin/DeviceAdminAdd.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 71941d16162..300f795135e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1491,6 +1491,7 @@ diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java index 1fe3f177b69..0625bbbfc39 100644 --- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java +++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java @@ -71,6 +71,7 @@ import com.android.settings.users.UserDialogs; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedLockUtilsInternal; +import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity; import org.xmlpull.v1.XmlPullParserException; @@ -79,7 +80,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -public class DeviceAdminAdd extends Activity { +/** + * A confirmation screen for enabling administractor. + */ +public class DeviceAdminAdd extends CollapsingToolbarBaseActivity { static final String TAG = "DeviceAdminAdd"; static final int DIALOG_WARNING = 1; From 2ce80cdb6b70c81e8953d0a987720ae2218aeb2f Mon Sep 17 00:00:00 2001 From: "Wesley.CW Wang" Date: Thu, 25 Mar 2021 20:13:15 +0800 Subject: [PATCH 2/8] Update Battery settings main page string (1/2) - Update Battery usage preference summary string - Update Battery saver preference summary string - Update Adaptive preference column string Screenshot: https://screenshot.googleplex.com/6FVaoeHjTSFs2o6.png Bug: 183689347 Test: make RunSettingsRoboTests -j40 Change-Id: I72c5ebb5d3fd189db7c40c645b8dab4367d154ba --- res/values/strings.xml | 7 ++++++- .../fuelgauge/BatterySaverController.java | 2 +- .../BatteryManagerPreferenceController.java | 15 +++------------ .../fuelgauge/BatterySaverControllerTest.java | 3 ++- ...atteryManagerPreferenceControllerTest.java | 19 ++++--------------- 5 files changed, 16 insertions(+), 30 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 9c87e87aeb8..e4cbb114285 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5830,6 +5830,8 @@ History details View battery usage + + View usage for past 24 hours Battery usage @@ -5966,7 +5968,7 @@ Detect when apps drain battery - On / Detecting when apps drain battery + Detecting when apps drain battery Off @@ -6232,6 +6234,9 @@ Based on your routine + + Will turn on based on your routine + Based on percentage diff --git a/src/com/android/settings/fuelgauge/BatterySaverController.java b/src/com/android/settings/fuelgauge/BatterySaverController.java index fba163dd223..15070c3e8d2 100644 --- a/src/com/android/settings/fuelgauge/BatterySaverController.java +++ b/src/com/android/settings/fuelgauge/BatterySaverController.java @@ -111,7 +111,7 @@ public class BatterySaverController extends BasePreferenceController Utils.formatPercentage(percent)) : mContext.getString(R.string.battery_saver_off_summary); } else { - return mContext.getString(R.string.battery_saver_auto_routine); + return mContext.getString(R.string.battery_saver_pref_auto_routine_summary); } } diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java index 9565036bfc8..790264cf313 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java @@ -19,7 +19,6 @@ package com.android.settings.fuelgauge.batterytip; import android.app.AppOpsManager; import android.content.Context; import android.os.UserManager; -import android.provider.Settings; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; @@ -34,7 +33,6 @@ import com.android.settings.overlay.FeatureFactory; */ public class BatteryManagerPreferenceController extends BasePreferenceController { private static final String KEY_BATTERY_MANAGER = "smart_battery_manager"; - private static final int ON = 1; private PowerUsageFeatureProvider mPowerUsageFeatureProvider; private AppOpsManager mAppOpsManager; private UserManager mUserManager; @@ -56,24 +54,17 @@ public class BatteryManagerPreferenceController extends BasePreferenceController public void updateState(Preference preference) { super.updateState(preference); final int num = BatteryTipUtils.getRestrictedAppsList(mAppOpsManager, mUserManager).size(); - final String setting = mPowerUsageFeatureProvider.isSmartBatterySupported() - ? Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED - : Settings.Global.APP_AUTO_RESTRICTION_ENABLED; - final boolean featureOn = - Settings.Global.getInt(mContext.getContentResolver(), setting, ON) == ON; - updateSummary(preference, featureOn, num); + updateSummary(preference, num); } @VisibleForTesting - void updateSummary(Preference preference, boolean featureOn, int num) { + void updateSummary(Preference preference, int num) { if (num > 0) { preference.setSummary(mContext.getResources().getQuantityString( R.plurals.battery_manager_app_restricted, num, num)); - } else if (featureOn) { - preference.setSummary(R.string.battery_manager_on); } else { - preference.setSummary(R.string.battery_manager_off); + preference.setSummary(R.string.battery_manager_summary); } } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java index b3b81969b8b..52f682cd8ab 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java @@ -105,7 +105,8 @@ public class BatterySaverControllerTest { Settings.Global.AUTOMATIC_POWER_SAVE_MODE, PowerManager.POWER_SAVE_MODE_TRIGGER_DYNAMIC); - assertThat(mBatterySaverController.getSummary()).isEqualTo("Based on your routine"); + assertThat(mBatterySaverController.getSummary()). + isEqualTo("Will turn on based on your routine"); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java index 435aa8874fc..b01e3b1f66c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java @@ -63,31 +63,20 @@ public class BatteryManagerPreferenceControllerTest { } @Test - public void updateState_smartBatteryOnWithRestrictApps_showSummary() { - mController.updateSummary(mPreference, true /* smartBatteryOn */, 2); + public void updateState_smartBatteryWithRestrictApps_showSummary() { + mController.updateSummary(mPreference, 2); assertThat(mPreference.getSummary()).isEqualTo("2 apps restricted"); } @Test - public void updateState_smartBatteryOnWithoutRestriction_showSummary() { + public void updateState_smartBatteryWithoutRestriction_showSummary() { when(mFeatureFactory.powerUsageFeatureProvider.isSmartBatterySupported()).thenReturn(true); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, ON); mController.updateState(mPreference); - assertThat(mPreference.getSummary()).isEqualTo("On / Detecting when apps drain battery"); - } - - @Test - public void updateState_smartBatteryOff_showSummary() { - when(mFeatureFactory.powerUsageFeatureProvider.isSmartBatterySupported()).thenReturn(true); - Settings.Global.putInt(mContext.getContentResolver(), - Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, OFF); - - mController.updateState(mPreference); - - assertThat(mPreference.getSummary()).isEqualTo("Off"); + assertThat(mPreference.getSummary()).isEqualTo("Detecting when apps drain battery"); } } From 474093e8cc5184641e95629696fa9e8d38fbf996 Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Sun, 14 Mar 2021 05:28:00 +0800 Subject: [PATCH 3/8] Add a reverse landscape layout for UDFPS Bug: 181614043 Test: visual verified 1) Settings -> Security -> Fingerprint 2) Follow the setup flow to find sensor page and enrolling page 3) Rotate your device and see if fingerprint icon is overlapping with the title. Change-Id: Ia1202e9688f2472c8063287164f4fc8f479cdae9 --- .../udfps_enroll_enrolling_land.xml | 95 +++++++++++++++++++ .../udfps_enroll_find_sensor_land.xml | 94 ++++++++++++++++++ .../settings/biometrics/BiometricUtils.java | 11 +++ .../FingerprintEnrollEnrolling.java | 8 +- .../FingerprintEnrollFindSensor.java | 6 +- 5 files changed, 212 insertions(+), 2 deletions(-) create mode 100644 res/layout-land/udfps_enroll_enrolling_land.xml create mode 100644 res/layout-land/udfps_enroll_find_sensor_land.xml diff --git a/res/layout-land/udfps_enroll_enrolling_land.xml b/res/layout-land/udfps_enroll_enrolling_land.xml new file mode 100644 index 00000000000..7ccd396936b --- /dev/null +++ b/res/layout-land/udfps_enroll_enrolling_land.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout-land/udfps_enroll_find_sensor_land.xml b/res/layout-land/udfps_enroll_find_sensor_land.xml new file mode 100644 index 00000000000..6335afb2485 --- /dev/null +++ b/res/layout-land/udfps_enroll_find_sensor_land.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/com/android/settings/biometrics/BiometricUtils.java b/src/com/android/settings/biometrics/BiometricUtils.java index d93a321cacb..f338eb592b1 100644 --- a/src/com/android/settings/biometrics/BiometricUtils.java +++ b/src/com/android/settings/biometrics/BiometricUtils.java @@ -24,6 +24,7 @@ import android.content.Intent; import android.content.IntentSender; import android.os.storage.StorageManager; import android.util.Log; +import android.view.Surface; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -241,4 +242,14 @@ public class BiometricUtils { } return false; } + + /** + * Returns {@code true} if the screen is going into a landscape mode and the angle is equal to + * 270. + * @param context Context that we use to get the display this context is associated with + * @return True if the angle of the rotation is equal to 270. + */ + public static boolean isReverseLandscape(@NonNull Context context) { + return context.getDisplay().getRotation() == Surface.ROTATION_270; + } } diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java index 10b31e331b9..8def63d2c73 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java @@ -47,6 +47,7 @@ import androidx.appcompat.app.AlertDialog; import com.android.settings.R; import com.android.settings.biometrics.BiometricEnrollSidecar; import com.android.settings.biometrics.BiometricErrorDialog; +import com.android.settings.biometrics.BiometricUtils; import com.android.settings.biometrics.BiometricsEnrollEnrolling; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; @@ -98,6 +99,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { private boolean mCanAssumeUdfps; @Nullable private ProgressBar mProgressBar; private ObjectAnimator mProgressAnim; + private TextView mDescriptionText; private TextView mErrorText; private Interpolator mFastOutSlowInInterpolator; private Interpolator mLinearOutSlowInInterpolator; @@ -145,7 +147,11 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { mCanAssumeUdfps = props.size() == 1 && props.get(0).isAnyUdfpsType(); if (mCanAssumeUdfps) { - setContentView(R.layout.udfps_enroll_enrolling); + if (BiometricUtils.isReverseLandscape(getApplicationContext())) { + setContentView(R.layout.udfps_enroll_enrolling_land); + } else { + setContentView(R.layout.udfps_enroll_enrolling); + } setDescriptionText(R.string.security_settings_udfps_enroll_start_message); } else { setContentView(R.layout.fingerprint_enroll_enrolling); diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java index 94eb2780bee..8bc03acb4f9 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java @@ -112,7 +112,11 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase { protected int getContentView() { if (mCanAssumeUdfps) { - return R.layout.udfps_enroll_find_sensor_layout; + if (BiometricUtils.isReverseLandscape(getApplicationContext())) { + return R.layout.udfps_enroll_find_sensor_land; + } else { + return R.layout.udfps_enroll_find_sensor_layout; + } } return R.layout.fingerprint_enroll_find_sensor; } From ff727efe7b8904c07fda60f6fedd4ddeb67054d7 Mon Sep 17 00:00:00 2001 From: Tsung-Mao Fang Date: Thu, 25 Mar 2021 13:34:53 +0800 Subject: [PATCH 4/8] Follow footer preference guildance on some pages - Footer preference should have a info icon in tethering page. - Rmove an empty icon for screen attention setting. - Revise the "More details" to "Learn more" - Add more empty line between footer info and "Learn more" Test: Built apk, and check the screen Fix: 183472971 Fix: 183472858 Change-Id: I7edb71639b59efb8205c0ef6a50ab483f88aa63d --- res/values/strings.xml | 2 +- res/xml/tether_prefs.xml | 6 +++--- .../settings/display/AdaptiveSleepPreferenceController.java | 1 - src/com/android/settings/display/ScreenTimeoutSettings.java | 5 +++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index e65806bb3d6..bc4f53abce9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6612,7 +6612,7 @@ Other options are disabled by your admin - More details + Learn more Notification log Notification history diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml index 37194d9fd12..d86f4204f48 100644 --- a/res/xml/tether_prefs.xml +++ b/res/xml/tether_prefs.xml @@ -49,9 +49,9 @@ android:summary="@string/ethernet_tethering_subtext" settings:keywords="@string/keywords_hotspot_tethering" /> - + settings:searchable="false"/> diff --git a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java index e0527f9d32b..c16b95c7e11 100644 --- a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java +++ b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java @@ -60,7 +60,6 @@ public class AdaptiveSleepPreferenceController { mPreference = new RestrictedSwitchPreference(context); mPreference.setTitle(R.string.adaptive_sleep_title); mPreference.setSummary(R.string.adaptive_sleep_description); - mPreference.setIcon(R.drawable.empty_icon); mPreference.setChecked(isChecked()); mPreference.setKey(PREFERENCE_KEY); mPreference.setOnPreferenceClickListener(preference -> { diff --git a/src/com/android/settings/display/ScreenTimeoutSettings.java b/src/com/android/settings/display/ScreenTimeoutSettings.java index 3b0d333d5d2..a15a7a03f6b 100644 --- a/src/com/android/settings/display/ScreenTimeoutSettings.java +++ b/src/com/android/settings/display/ScreenTimeoutSettings.java @@ -164,7 +164,8 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements final String textMoreDetails = getResources().getString(R.string.admin_more_details); final SpannableString spannableString = new SpannableString( - textDisabledByAdmin + System.lineSeparator() + textMoreDetails); + textDisabledByAdmin + System.lineSeparator() + + System.lineSeparator() + textMoreDetails); final ClickableSpan clickableSpan = new ClickableSpan() { @Override public void onClick(@NonNull View widget) { @@ -174,7 +175,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements if (textDisabledByAdmin != null && textMoreDetails != null) { spannableString.setSpan(clickableSpan, textDisabledByAdmin.length() + 1, - textDisabledByAdmin.length() + textMoreDetails.length() + 1, + textDisabledByAdmin.length() + textMoreDetails.length() + 2, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); } From 4f1e17eba104ecda063fb714f0860bd8b876df48 Mon Sep 17 00:00:00 2001 From: Jernej Virag Date: Thu, 18 Mar 2021 18:11:31 +0000 Subject: [PATCH 5/8] Create a setting for Assist invocation via long press power button Adds a setting which allows the user to enable invoking the Assist app via long pressing the power button. The availability of setting is controlled by config_longPressOnPowerForAssistantSettingAvailable configuration value. Bug: 179175321 Bug: 182983853 Test: make RunSettingsRoboTests Change-Id: I2eb23e5b7539b2fb8e5bc85d23ca5795a08366c5 --- res/values/strings.xml | 6 + res/xml/power_menu_settings.xml | 7 + ...gPressPowerButtonPreferenceController.java | 188 ++++++++++++++++++ .../PowerMenuPreferenceController.java | 8 +- ...ssPowerButtonPreferenceControllerTest.java | 129 ++++++++++++ .../PowerMenuPreferenceControllerTest.java | 78 +++++++- 6 files changed, 412 insertions(+), 4 deletions(-) create mode 100644 src/com/android/settings/gestures/LongPressPowerButtonPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/gestures/LongPressPowerButtonPreferenceControllerTest.java diff --git a/res/values/strings.xml b/res/values/strings.xml index e65806bb3d6..87858e57aa6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12804,6 +12804,12 @@ To use, first set a screen lock + + Hold for Assistant + + + Trigger the Assistant by holding the power button + Show device controls diff --git a/res/xml/power_menu_settings.xml b/res/xml/power_menu_settings.xml index c7fba713183..bfe9c20679b 100644 --- a/res/xml/power_menu_settings.xml +++ b/res/xml/power_menu_settings.xml @@ -20,6 +20,13 @@ xmlns:settings="http://schemas.android.com/apk/res-auto" android:title="@string/power_menu_setting_name"> + + Date: Wed, 24 Mar 2021 15:23:34 +0000 Subject: [PATCH 6/8] Update BatterySettingsFeatureProvider signature. Test: no-op Bug: 181827717 Change-Id: I891452f0195e712dd775f458b16f985c63803370 --- .../fuelgauge/BatterySettingsFeatureProvider.java | 2 +- .../fuelgauge/BatterySettingsFeatureProviderImpl.java | 10 +++++++++- .../android/settings/overlay/FeatureFactoryImpl.java | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java index 73b875bb575..11f28b7895e 100644 --- a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java +++ b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java @@ -24,6 +24,6 @@ public interface BatterySettingsFeatureProvider { /** * Get replacement activity for a given activity or fragment path. */ - String getReplacingActivityName(String activity); + String getReplacingActivityName(String originalActivity); } diff --git a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java index e4106959846..218d0969560 100644 --- a/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java +++ b/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java @@ -16,13 +16,21 @@ package com.android.settings.fuelgauge; +import android.content.Context; + /** * Feature provider implementation for battery settings usage. */ public class BatterySettingsFeatureProviderImpl implements BatterySettingsFeatureProvider { + protected Context mContext; + + public BatterySettingsFeatureProviderImpl(Context context) { + mContext = context.getApplicationContext(); + } + @Override - public String getReplacingActivityName(String activity) { + public String getReplacingActivityName(String originalActivity) { return null; } } diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java index 9105c10df66..00f9a0e6b63 100644 --- a/src/com/android/settings/overlay/FeatureFactoryImpl.java +++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java @@ -138,7 +138,7 @@ public class FeatureFactoryImpl extends FeatureFactory { @Override public BatterySettingsFeatureProvider getBatterySettingsFeatureProvider(Context context) { if (mBatterySettingsFeatureProvider == null) { - mBatterySettingsFeatureProvider = new BatterySettingsFeatureProviderImpl(); + mBatterySettingsFeatureProvider = new BatterySettingsFeatureProviderImpl(context); } return mBatterySettingsFeatureProvider; } From 13f36a58dcbc0d765d18fd1f25d0219102c11e49 Mon Sep 17 00:00:00 2001 From: Sunny Shao Date: Mon, 29 Mar 2021 21:11:45 +0800 Subject: [PATCH 7/8] Fix runInstrumentableFragmentCodeInspection test case fail - Replace DialogFragment with InstrumentedDialogFragment. - Remove the redundant code in the SupportedLinksDialogFragment. Fixes: 183918543 Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.core Change-Id: I2a5eb97ec6669853f158a21695e49339aeb5808d --- .../intentpicker/ProgressDialogFragment.java | 11 ++++++++--- .../SupportedLinksDialogFragment.java | 17 ++++++++--------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/com/android/settings/applications/intentpicker/ProgressDialogFragment.java b/src/com/android/settings/applications/intentpicker/ProgressDialogFragment.java index 53a6b04e66e..f99775e27dd 100644 --- a/src/com/android/settings/applications/intentpicker/ProgressDialogFragment.java +++ b/src/com/android/settings/applications/intentpicker/ProgressDialogFragment.java @@ -34,19 +34,19 @@ import android.widget.ProgressBar; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; import androidx.lifecycle.ViewModelProviders; import com.android.settings.R; +import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.utils.ThreadUtils; import java.util.ArrayList; import java.util.Collections; import java.util.List; -/** A customized {@link DialogFragment} with a progress bar. */ -public class ProgressDialogFragment extends DialogFragment { +/** A customized {@link InstrumentedDialogFragment} with a progress bar. */ +public class ProgressDialogFragment extends InstrumentedDialogFragment { private static final String TAG = "ProgressDialogFragment"; private static final String DLG_ID = "ProgressDialog"; private static final int PROGRESS_BAR_STEPPING_TIME = 20; @@ -110,6 +110,11 @@ public class ProgressDialogFragment extends DialogFragment { } } + @Override + public int getMetricsCategory() { + return 0; + } + /** * To generate a progress alter dialog and invoke the supported links dialog. */ diff --git a/src/com/android/settings/applications/intentpicker/SupportedLinksDialogFragment.java b/src/com/android/settings/applications/intentpicker/SupportedLinksDialogFragment.java index 52511c9540c..db93df2cd96 100644 --- a/src/com/android/settings/applications/intentpicker/SupportedLinksDialogFragment.java +++ b/src/com/android/settings/applications/intentpicker/SupportedLinksDialogFragment.java @@ -26,19 +26,19 @@ import android.util.ArraySet; import android.util.Log; import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.lifecycle.ViewModelProviders; import com.android.settings.R; +import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import java.util.List; import java.util.Set; import java.util.UUID; -/** A customized {@link DialogFragment} with multiple checkboxes. */ -public class SupportedLinksDialogFragment extends DialogFragment { +/** A customized {@link InstrumentedDialogFragment} with multiple checkboxes. */ +public class SupportedLinksDialogFragment extends InstrumentedDialogFragment { private static final String TAG = "SupportedLinksDialogFrg"; private static final String DLG_ID = "SupportedLinksDialog"; @@ -54,11 +54,6 @@ public class SupportedLinksDialogFragment extends DialogFragment { mSupportedLinkWrapperList = mViewModel.getSupportedLinkWrapperList(); } - @Override - public void onDestroy() { - super.onDestroy(); - } - @Override public Dialog onCreateDialog(Bundle savedInstanceState) { final Context context = getActivity(); @@ -70,13 +65,17 @@ public class SupportedLinksDialogFragment extends DialogFragment { .setAdapter(adapter, /* listener= */ null) .setCancelable(true) .setPositiveButton(R.string.app_launch_supported_links_add, (dialog, id) -> { - // addSelectedItems(((AlertDialog) dialog).getListView()); doSelectedAction(); }) .setNegativeButton(R.string.app_launch_dialog_cancel, /* listener= */ null); return builder.create(); } + @Override + public int getMetricsCategory() { + return 0; + } + /** Display the dialog. */ public void showDialog(FragmentManager manager) { show(manager, DLG_ID); From ca048b51c5a02e14d216db613006a6b011500891 Mon Sep 17 00:00:00 2001 From: "Wesley.CW Wang" Date: Mon, 29 Mar 2021 17:47:16 +0800 Subject: [PATCH 8/8] Fix summary detector test fail Bug: 183919477 Test: make RunSettingsRoboTests -j40 Change-Id: I879c07e1c44a6e17ea9ceaca85ec4778e0131c5d --- .../fuelgauge/batterytip/detectors/SummaryDetectorTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java index 0fd3ccfa03c..5794b6c0b89 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java @@ -54,9 +54,9 @@ public class SummaryDetectorTest { } @Test - public void testDetect_notDisabled_tipVisible() { + public void testDetect_notDisabled_tipInvisible() { SummaryDetector detector = new SummaryDetector(mPolicy, AVERAGE_TIME_MS); - assertThat(detector.detect().isVisible()).isTrue(); + assertThat(detector.detect().isVisible()).isFalse(); } }