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

Merge "Fix UnsupportedOperationException in Display Settings" into sc-dev am: cb1574319b am: 494701714a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639272

Change-Id: Id1fcc49b5aeb7dca593b37bd78518fe1c88264ae
This commit is contained in:
Arc Wang
2021-05-20 06:44:17 +00:00
committed by Automerger Merge Worker
parent 1500df5099 494701714a
commit 88048de0e1
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@@ -678,7 +678,8 @@
<activity android:name=".localepicker.LocalePickerWithRegionActivity"
android:excludeFromRecents="true"
android:configChanges="orientation|keyboardHidden|screenSize"
android:exported="false">
android:exported="false"
android:theme="@style/Theme.LocalePickerWithRegionActivity">
</activity>
<activity

1
res/values/styles.xml
View File

@@ -145,6 +145,7 @@
<item name="android:layout_marginStart">4dip</item>
<item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Medium</item>
<item name="android:textColorHint">?android:attr/textColorSecondary</item>
<item name="android:minHeight">@dimen/min_tap_target_size</item>
</style>

5
res/values/themes.xml
View File

@@ -32,7 +32,6 @@
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:datePickerDialogTheme">@style/PickerDialogTheme.Settings</item>
<item name="android:progressBarStyleHorizontal">@style/HorizontalProgressBarStyle</item>
<item name="android:textColorHint">?android:attr/textColorSecondary</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
@@ -93,6 +92,10 @@
<item name="android:backgroundDimEnabled">false</item>
</style>
<style name="Theme.LocalePickerWithRegionActivity" parent="Theme.Settings">
<item name="android:textColorHint">?android:attr/textColorSecondary</item>
</style>
<style name="ThemeOverlay.SwitchBar.Settings.Base" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar">
<item name="android:elevation">1dp</item>
<item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>