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

Merge "RequestManageCredentials dark theme" into sc-dev am: 4a4e2bae61

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

Change-Id: I3abd517eb830a52845c8a8b90340d66808b84db1
This commit is contained in:
Alex Johnston
2021-04-21 08:53:08 +00:00
committed by Automerger Merge Worker
parent 6254afcdcb 4a4e2bae61
commit a2a6b527f9
4 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -1460,7 +1460,7 @@
</activity> </activity>
<activity android:name=".security.RequestManageCredentials" <activity android:name=".security.RequestManageCredentials"
android:theme="@style/Theme.RequestManageCredentials" android:theme="@style/Theme.SubSettings"
android:exported="true"> android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.security.MANAGE_CREDENTIALS"/> <action android:name="android.security.MANAGE_CREDENTIALS"/>

6
res/layout/request_manage_credentials.xml
View File

@@ -18,7 +18,8 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:clipChildren="true">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -70,6 +71,7 @@
app:elevation="3dp" app:elevation="3dp"
app:icon="@drawable/ic_arrow_downward" app:icon="@drawable/ic_arrow_downward"
app:iconTint="?android:attr/colorAccent" app:iconTint="?android:attr/colorAccent"
app:backgroundTint="?android:attr/colorPrimary"/> app:backgroundTint="?android:attr/colorPrimary"
android:theme="@style/Theme.CollapsingToolbar.Settings"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

1
res/values/styles.xml
View File

@@ -795,6 +795,7 @@
<item name="android:paddingBottom">8dp</item> <item name="android:paddingBottom">8dp</item>
<item name="android:orientation">horizontal</item> <item name="android:orientation">horizontal</item>
<item name="android:layout_alignParentBottom">true</item> <item name="android:layout_alignParentBottom">true</item>
<item name="android:background">?android:colorBackground</item>
</style> </style>
<style name="RequestManageCredentialsAllowButton" parent="@style/ActionPrimaryButton"> <style name="RequestManageCredentialsAllowButton" parent="@style/ActionPrimaryButton">

15
res/values/themes.xml
View File

@@ -165,21 +165,6 @@
<item name="android:colorAccent">@*android:color/white</item> <item name="android:colorAccent">@*android:color/white</item>
</style> </style>
<style name="Theme.RequestManageCredentials" parent="@style/Theme.MaterialComponents.Light">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
<item name="colorAccent">@*android:color/accent_device_default_light</item>
<item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
<item name="android:windowBackground">@android:color/white</item>
<item name="android:statusBarColor">@android:color/white</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:windowLightNavigationBar">true</item>
<item name="android:navigationBarColor">@android:color/white</item>
</style>
<style name="FallbackHome" parent="@android:style/Theme.DeviceDefault.NoActionBar"> <style name="FallbackHome" parent="@android:style/Theme.DeviceDefault.NoActionBar">
<item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowBackground">@android:color/transparent</item>
<item name="android:colorBackgroundCacheHint">@null</item> <item name="android:colorBackgroundCacheHint">@null</item>