Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 12058995 from 27b5476bbf to 24Q4-release

Browse Source 
Change-Id: Ibc103435d9ec181d39662ed471428bbea40f43e0
This commit is contained in:
Android Build Coastguard Worker
2024-07-08 23:27:56 +00:00
parent ddcb17a57e 27b5476bbf
commit b9f2e79ef3
6 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AndroidManifest.xml
View File

@@ -2799,7 +2799,9 @@
<activity android:name=".biometrics.fingerprint.FingerprintSettings" <activity android:name=".biometrics.fingerprint.FingerprintSettings"
android:exported="false" android:exported="false"
android:taskAffinity="com.android.settings.root" /> android:taskAffinity="com.android.settings.root" />
<activity android:name=".biometrics.fingerprint.FingerprintEnrollFindSensor" android:exported="false"/> <activity android:name=".biometrics.fingerprint.FingerprintEnrollFindSensor"
android:exported="false"
android:theme="@style/GlifTheme.Light"/>
<activity android:name=".biometrics.fingerprint.FingerprintEnrollEnrolling" android:exported="false"/> <activity android:name=".biometrics.fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>
<activity android:name=".biometrics.fingerprint.FingerprintEnrollFinish" android:exported="false"/> <activity android:name=".biometrics.fingerprint.FingerprintEnrollFinish" android:exported="false"/>
<activity android:name=".biometrics.fingerprint.FingerprintEnrollParentalConsent" android:exported="false"/> <activity android:name=".biometrics.fingerprint.FingerprintEnrollParentalConsent" android:exported="false"/>
@@ -2832,7 +2834,9 @@
android:theme="@style/GlifTheme.Light" android:theme="@style/GlifTheme.Light"
android:taskAffinity="com.android.settings.root" /> android:taskAffinity="com.android.settings.root" />
<activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFindSensor" android:exported="false"/> <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFindSensor"
android:exported="false"
android:theme="@style/GlifTheme.Light"/>
<activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/> <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/>
<activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFinish" android:exported="false"/> <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFinish" android:exported="false"/>
<activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollIntroduction" <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollIntroduction"

3
src/com/android/settings/inputmethod/TrackpadSettings.java
View File

@@ -56,7 +56,8 @@ public class TrackpadSettings extends DashboardFragment {
@Override @Override
protected boolean isPageSearchEnabled(Context context) { protected boolean isPageSearchEnabled(Context context) {
return FeatureFlagUtils return FeatureFlagUtils
.isEnabled(context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD); .isEnabled(context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD)
&& NewKeyboardSettingsUtils.isTouchpad();
} }
}; };
} }

3
src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java
View File

@@ -58,7 +58,8 @@ public class TrackpadTouchGestureSettings extends DashboardFragment {
return FeatureFlagUtils return FeatureFlagUtils
.isEnabled( .isEnabled(
context, context,
FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE); FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE)
&& NewKeyboardSettingsUtils.isTouchpad();
} }
}; };
} }

3
src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java
View File

@@ -31,6 +31,7 @@ public class TrackpadTouchGestureSettingsController extends BasePreferenceContro
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
boolean isFeatureOn = FeatureFlagUtils boolean isFeatureOn = FeatureFlagUtils
.isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE); .isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE);
return isFeatureOn ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
return (isFeatureOn && isTouchpad) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
} }
} }

6
tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceControllerTest.java
View File

@@ -31,10 +31,10 @@ import android.os.BatteryManager;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
@@ -76,17 +76,17 @@ public class BatteryFirstUseDatePreferenceControllerTest {
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
} }
@Ignore("b/315267179")
@Test @Test
public void getSummary_available_returnExpectedDate() { public void getSummary_available_returnExpectedDate() {
when(mFactory.batterySettingsFeatureProvider.isFirstUseDateAvailable(eq(mContext), when(mFactory.batterySettingsFeatureProvider.isFirstUseDateAvailable(eq(mContext),
anyLong())).thenReturn(true); anyLong())).thenReturn(true);
mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_FIRST_USAGE_DATE, mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_FIRST_USAGE_DATE,
1669680000L); 1669680000L);
final CharSequence expectedDate = BatteryUtils.getBatteryInfoFormattedDate(1669680000000L);
final CharSequence result = mController.getSummary(); final CharSequence result = mController.getSummary();
assertThat(result.toString()).isEqualTo("November 29, 2022"); assertThat(result).isEqualTo(expectedDate);
} }
@Test @Test

6
tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceControllerTest.java
View File

@@ -31,10 +31,10 @@ import android.os.BatteryManager;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
@@ -77,17 +77,17 @@ public class BatteryManufactureDatePreferenceControllerTest {
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
} }
@Ignore("b/315267179")
@Test @Test
public void getSummary_available_returnExpectedDate() { public void getSummary_available_returnExpectedDate() {
when(mFactory.batterySettingsFeatureProvider.isManufactureDateAvailable(eq(mContext), when(mFactory.batterySettingsFeatureProvider.isManufactureDateAvailable(eq(mContext),
anyLong())).thenReturn(true); anyLong())).thenReturn(true);
mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_MANUFACTURING_DATE, mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_MANUFACTURING_DATE,
1669680000L); 1669680000L);
final CharSequence expectedDate = BatteryUtils.getBatteryInfoFormattedDate(1669680000000L);
final CharSequence result = mController.getSummary(); final CharSequence result = mController.getSummary();
assertThat(result.toString()).isEqualTo("November 29, 2022"); assertThat(result).isEqualTo(expectedDate);
} }
@Test @Test