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

Merge "RequestManageCredentials Material Next Spec" into sc-dev am: cf5bb13576

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

Change-Id: I6fdc631b352439be1abaa56f162b100aa50315cc
This commit is contained in:
Alex Johnston
2021-06-10 09:50:39 +00:00
committed by Automerger Merge Worker
parent 50e5f20feb cf5bb13576
commit 24f0fb0a48
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout-land/request_manage_credentials.xml
View File

@@ -108,6 +108,7 @@
<Button <Button
android:id="@+id/allow_button" android:id="@+id/allow_button"
style="@style/RequestManageCredentialsAllowButton" style="@style/RequestManageCredentialsAllowButton"
android:theme="@style/RoundedCornerButtonTheme"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/request_manage_credentials_allow" /> android:text="@string/request_manage_credentials_allow" />
@@ -123,10 +124,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/request_manage_credentials_more" android:text="@string/request_manage_credentials_more"
android:theme="@style/Theme.CollapsingToolbar.Settings" android:theme="@style/Theme.CollapsingToolbar.Settings"
app:backgroundTint="?android:attr/colorPrimary" app:backgroundTint="?android:attr/colorAccent"
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/textColorPrimary"
app:layout_anchor="@id/apps_list" app:layout_anchor="@id/apps_list"
app:layout_anchorGravity="bottom|center" /> app:layout_anchorGravity="bottom|center" />

5
res/layout/request_manage_credentials.xml
View File

@@ -52,6 +52,7 @@
<Button <Button
android:id="@+id/allow_button" android:id="@+id/allow_button"
style="@style/RequestManageCredentialsAllowButton" style="@style/RequestManageCredentialsAllowButton"
android:theme="@style/RoundedCornerButtonTheme"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/request_manage_credentials_allow"/> android:text="@string/request_manage_credentials_allow"/>
@@ -70,8 +71,8 @@
app:layout_anchorGravity="bottom|center" app:layout_anchorGravity="bottom|center"
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/textColorPrimary"
app:backgroundTint="?android:attr/colorPrimary" app:backgroundTint="?android:attr/colorAccent"
android:theme="@style/Theme.CollapsingToolbar.Settings"/> android:theme="@style/Theme.CollapsingToolbar.Settings"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

13
res/values/styles.xml
View File

@@ -800,10 +800,19 @@
<item name="android:background">?android:colorBackground</item> <item name="android:background">?android:colorBackground</item>
</style> </style>
<style name="RoundedCornerButtonTheme">
<item name="android:buttonCornerRadius">50dp</item>
<item name="android:paddingStart">20dp</item>
<item name="android:paddingEnd">20dp</item>
<item name="android:paddingTop">18dp</item>
<item name="android:paddingBottom">18dp</item>
</style>
<style name="RequestManageCredentialsAllowButton" parent="@style/ActionPrimaryButton"> <style name="RequestManageCredentialsAllowButton" parent="@style/ActionPrimaryButton">
<item name="android:fontFamily">google-sans-medium</item> <item name="android:fontFamily">google-sans-medium</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textAllCaps">false</item> <item name="android:textAllCaps">false</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style> </style>
<style name="RequestManageCredentialsDontAllowButton" <style name="RequestManageCredentialsDontAllowButton"
@@ -811,13 +820,13 @@
<item name="android:fontFamily">google-sans-medium</item> <item name="android:fontFamily">google-sans-medium</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textAllCaps">false</item> <item name="android:textAllCaps">false</item>
<item name="android:textColor">?android:attr/colorAccent</item> <item name="android:textColor">?android:attr/textColorPrimary</item>
</style> </style>
<style name="RequestManageCredentialsFab"> <style name="RequestManageCredentialsFab">
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textAllCaps">false</item> <item name="android:textAllCaps">false</item>
<item name="android:textColor">?android:attr/colorAccent</item> <item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:layout_marginBottom">12dp</item> <item name="android:layout_marginBottom">12dp</item>
</style> </style>