From b9049f75887b834e687cb6eda07dee800b2acee2 Mon Sep 17 00:00:00 2001 From: MiltonWu Date: Thu, 4 Jul 2024 17:45:24 +0800 Subject: [PATCH 1/3] Fix FP enroll page content overlapped by buttons (Setup)FingerprintEnrollFindSensor apply the same theme with FingerprintEnrollIntroduction to set clipToPadding/clipChildren to true. Fix: 338955329 Test: Set largest display/text size, Check (Setup)FingerprintEnrollFindSensor UI on SFPS/UDFPS devices with Light/Dark theme Flag: EXEMPT bug fix Change-Id: I61d74134cea932bd9f6bdc944ed905a8282deeeb --- AndroidManifest.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b28da4f77ce..678f81f3dec 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2799,7 +2799,9 @@ - + @@ -2832,7 +2834,9 @@ android:theme="@style/GlifTheme.Light" android:taskAffinity="com.android.settings.root" /> - + Date: Thu, 4 Jul 2024 07:01:42 +0000 Subject: [PATCH 2/3] [Touchpad Setting] Hide Touchpad page when there's no connected one The option for entering page already has complete check condition. Update the same check logic to isSeachable in setting page to hide page when there's no touchpad connected. Also apply check on trackpadTouchGesture. Test: verify on device Bug: 346497646 Flag: EXEMPT bugfix Change-Id: I1730c7bd1fd2615dc1725ec0cc32293254e5b54a --- src/com/android/settings/inputmethod/TrackpadSettings.java | 3 ++- .../settings/inputmethod/TrackpadTouchGestureSettings.java | 3 ++- .../inputmethod/TrackpadTouchGestureSettingsController.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/inputmethod/TrackpadSettings.java b/src/com/android/settings/inputmethod/TrackpadSettings.java index 49559333bfe..dca418a154d 100644 --- a/src/com/android/settings/inputmethod/TrackpadSettings.java +++ b/src/com/android/settings/inputmethod/TrackpadSettings.java @@ -56,7 +56,8 @@ public class TrackpadSettings extends DashboardFragment { @Override protected boolean isPageSearchEnabled(Context context) { return FeatureFlagUtils - .isEnabled(context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD); + .isEnabled(context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD) + && NewKeyboardSettingsUtils.isTouchpad(); } }; } diff --git a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java index 9a4b90f4044..a6af3f651ba 100644 --- a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java +++ b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java @@ -58,7 +58,8 @@ public class TrackpadTouchGestureSettings extends DashboardFragment { return FeatureFlagUtils .isEnabled( context, - FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE); + FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE) + && NewKeyboardSettingsUtils.isTouchpad(); } }; } diff --git a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java index 8f04aee1404..79497276aba 100644 --- a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java +++ b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java @@ -31,6 +31,7 @@ public class TrackpadTouchGestureSettingsController extends BasePreferenceContro public int getAvailabilityStatus() { boolean isFeatureOn = FeatureFlagUtils .isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE); - return isFeatureOn ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; + boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad(); + return (isFeatureOn && isTouchpad) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; } } From e24c5f37d244f729723f591c12a9f4ea9e2fd542 Mon Sep 17 00:00:00 2001 From: Yiling Chuang Date: Mon, 8 Jul 2024 07:39:24 +0000 Subject: [PATCH 3/3] Fix test failures in deviceinfo Fixes: 315267179 Flag: EXEMPT bugfix Test: atest SettingsRoboTests Change-Id: I9858374fe101ee5908e16104ed7b4ca6af0308cd --- .../BatteryFirstUseDatePreferenceControllerTest.java | 6 +++--- .../BatteryManufactureDatePreferenceControllerTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceControllerTest.java index 7c1650d215a..952af67c384 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceControllerTest.java @@ -31,10 +31,10 @@ import android.os.BatteryManager; import androidx.test.core.app.ApplicationProvider; +import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.testutils.FakeFeatureFactory; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -76,17 +76,17 @@ public class BatteryFirstUseDatePreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); } - @Ignore("b/315267179") @Test public void getSummary_available_returnExpectedDate() { when(mFactory.batterySettingsFeatureProvider.isFirstUseDateAvailable(eq(mContext), anyLong())).thenReturn(true); mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_FIRST_USAGE_DATE, 1669680000L); + final CharSequence expectedDate = BatteryUtils.getBatteryInfoFormattedDate(1669680000000L); final CharSequence result = mController.getSummary(); - assertThat(result.toString()).isEqualTo("November 29, 2022"); + assertThat(result).isEqualTo(expectedDate); } @Test diff --git a/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceControllerTest.java index e50aa1c497a..6e3b1aa3092 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceControllerTest.java @@ -31,10 +31,10 @@ import android.os.BatteryManager; import androidx.test.core.app.ApplicationProvider; +import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.testutils.FakeFeatureFactory; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -77,17 +77,17 @@ public class BatteryManufactureDatePreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); } - @Ignore("b/315267179") @Test public void getSummary_available_returnExpectedDate() { when(mFactory.batterySettingsFeatureProvider.isManufactureDateAvailable(eq(mContext), anyLong())).thenReturn(true); mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_MANUFACTURING_DATE, 1669680000L); + final CharSequence expectedDate = BatteryUtils.getBatteryInfoFormattedDate(1669680000000L); final CharSequence result = mController.getSummary(); - assertThat(result.toString()).isEqualTo("November 29, 2022"); + assertThat(result).isEqualTo(expectedDate); } @Test