PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix rotate device at face unlock detailed page, device will display"

Browse Source 
This reverts commit 2ca753bd06.

Reason for revert: Fix b/289173795

Change-Id: Ieaabe550bcbaad21a2373f3c5c103c68739d45dc
This commit is contained in:
Wenhui Yang
2023-07-25 18:49:31 +00:00
parent 1a073f4f6c
commit d26f18f727
3 changed files with 2 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -658,7 +658,6 @@
<activity android:name="Settings$FaceSettingsActivity" <activity android:name="Settings$FaceSettingsActivity"
android:label="@string/security_settings_face_preference_title" android:label="@string/security_settings_face_preference_title"
android:exported="true" android:exported="true"
android:configChanges="orientation|screenSize"
android:icon="@drawable/ic_face_header"> android:icon="@drawable/ic_face_header">
<intent-filter> <intent-filter>
<action android:name="android.settings.FACE_SETTINGS" /> <action android:name="android.settings.FACE_SETTINGS" />
@@ -674,7 +673,6 @@
android:label="@string/security_settings_face_preference_title" android:label="@string/security_settings_face_preference_title"
android:exported="false" android:exported="false"
android:icon="@drawable/ic_face_header" android:icon="@drawable/ic_face_header"
android:configChanges="orientation|screenSize"
android:taskAffinity="com.android.settings.root"> android:taskAffinity="com.android.settings.root">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.biometrics.face.FaceSettings" /> android:value="com.android.settings.biometrics.face.FaceSettings" />

21
src/com/android/settings/Settings.java
View File

@@ -52,26 +52,9 @@ public class Settings extends SettingsActivity {
public static class AssistGestureSettingsActivity extends SettingsActivity { /* empty */} public static class AssistGestureSettingsActivity extends SettingsActivity { /* empty */}
public static class BluetoothSettingsActivity extends SettingsActivity { /* empty */ } public static class BluetoothSettingsActivity extends SettingsActivity { /* empty */ }
public static class CreateShortcutActivity extends SettingsActivity { /* empty */ } public static class CreateShortcutActivity extends SettingsActivity { /* empty */ }
public static class FaceSettingsActivity extends SettingsActivity { public static class FaceSettingsActivity extends SettingsActivity { /* empty */ }
@Override
protected void onCreate(Bundle savedState) {
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
ThemeHelper.trySetDynamicColor(this);
super.onCreate(savedState);
}
}
/** Container for {@link FaceSettings} to use with a pre-defined task affinity. */ /** Container for {@link FaceSettings} to use with a pre-defined task affinity. */
public static class FaceSettingsInternalActivity extends SettingsActivity { public static class FaceSettingsInternalActivity extends SettingsActivity { /* empty */ }
@Override
protected void onCreate(Bundle savedState) {
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
ThemeHelper.trySetDynamicColor(this);
super.onCreate(savedState);
}
}
public static class FingerprintSettingsActivity extends SettingsActivity { /* empty */ } public static class FingerprintSettingsActivity extends SettingsActivity { /* empty */ }
public static class CombinedBiometricSettingsActivity extends SettingsActivity { /* empty */ } public static class CombinedBiometricSettingsActivity extends SettingsActivity { /* empty */ }
public static class CombinedBiometricProfileSettingsActivity extends SettingsActivity { /* empty */ } public static class CombinedBiometricProfileSettingsActivity extends SettingsActivity { /* empty */ }

70
tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsActivityTest.java
View File

@@ -1,70 +0,0 @@
/*
* Copyright (C) 2023 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.biometrics.face;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import android.content.res.Resources;
import android.os.Bundle;
import com.android.settings.Settings;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.android.controller.ActivityController;
@RunWith(RobolectricTestRunner.class)
public class FaceSettingsActivityTest {
private static final String APPLIED_SETUP_WIZARD_THEME = "SettingsPreferenceTheme.SetupWizard";
private Settings.FaceSettingsActivity mActivity;
private Resources.Theme mTheme;
@Before
public void setUp() {
FakeFeatureFactory.setupForTest();
mActivity = spy(Settings.FaceSettingsActivity.class);
}
@Test
public void verifyFaceSettingsActivity_shouldAppliedSetupWizardTheme() {
createActivity();
assertThat(isThemeApplied(APPLIED_SETUP_WIZARD_THEME)).isTrue();
}
private boolean isThemeApplied(String themeName) {
final String [] appliedThemes = mTheme.getTheme();
for (String theme : appliedThemes) {
if (theme.contains(themeName)) {
return true;
}
}
return false;
}
private void createActivity() {
ActivityController.of(mActivity).create(new Bundle());
mTheme = mActivity.getTheme();
}
}