diff options
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/app_details.xml | 8 | ||||
-rw-r--r-- | res/layout/grant_permissions.xml | 31 | ||||
-rw-r--r-- | res/layout/header.xml | 15 | ||||
-rw-r--r-- | res/layout/install_confirm.xml | 5 | ||||
-rw-r--r-- | res/layout/permission_description.xml | 6 | ||||
-rw-r--r-- | res/layout/permissions_frame.xml | 4 | ||||
-rw-r--r-- | res/layout/preference_permissions.xml | 2 | ||||
-rw-r--r-- | res/layout/preference_permissions_switch.xml | 2 | ||||
-rw-r--r-- | res/layout/uninstall_confirm.xml | 3 |
9 files changed, 40 insertions, 36 deletions
diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml index 6a330c74..8f7d2cff 100644 --- a/res/layout/app_details.xml +++ b/res/layout/app_details.xml @@ -4,9 +4,9 @@ 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. @@ -32,7 +32,7 @@ installation screens android:layout_width="32dip" android:layout_height="32dip" android:layout_marginStart="8dip" - android:background="@color/transparent" + android:background="@android:color/transparent" android:layout_alignParentStart="true" android:gravity="start" android:scaleType="centerCrop"/> @@ -61,6 +61,6 @@ installation screens android:layout_width="match_parent" android:layout_height="wrap_content" /> </FrameLayout> - + </RelativeLayout> diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml index ffbd276b..ab71e20c 100644 --- a/res/layout/grant_permissions.xml +++ b/res/layout/grant_permissions.xml @@ -47,10 +47,10 @@ android:visibility="gone"> </CheckBox> - <com.android.internal.widget.ButtonBarLayout + <com.android.packageinstaller.permission.ui.ButtonBarLayout android:id="@+id/button_group" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:orientation="horizontal" android:paddingStart="2dip" android:paddingTop="16dip"> @@ -59,12 +59,13 @@ android:id="@+id/current_page_text" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="start|bottom" android:paddingTop="4dp" android:paddingBottom="4dp" android:paddingEnd="12dp" android:singleLine="true" - style="@android:style/TextAppearance.Material.Body2" - android:textColor="@color/grant_permissions_progress_color" + style="?android:attr/textAppearanceSmall" + android:textColor="?android:attr/textColorSecondary" android:visibility="invisible"> </TextView> @@ -73,14 +74,22 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_weight="1" - android:visibility="invisible" /> + android:visibility="invisible" > + </Space> - <Button - android:id="@+id/permission_deny_button" + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - style="?android:attr/buttonBarButtonStyle" - android:text="@string/grant_dialog_button_deny" /> + android:layout_gravity="end" + android:orientation="horizontal" > + + <Button + android:id="@+id/permission_deny_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="?android:attr/buttonBarButtonStyle" + android:text="@string/grant_dialog_button_deny" > + </Button> <com.android.packageinstaller.permission.ui.SecureButtonView android:id="@+id/permission_allow_button" @@ -90,7 +99,9 @@ android:layout_marginStart="8dip" android:text="@string/grant_dialog_button_allow" /> - </com.android.internal.widget.ButtonBarLayout> + </LinearLayout> + + </com.android.packageinstaller.permission.ui.ButtonBarLayout> </LinearLayout> diff --git a/res/layout/header.xml b/res/layout/header.xml index 0e000a4d..f158e442 100644 --- a/res/layout/header.xml +++ b/res/layout/header.xml @@ -17,9 +17,8 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" - android:background="@drawable/header_background" - android:gravity="center_vertical" - android:theme="@style/Theme.Header.Settings" > + android:background="?android:attr/colorPrimary" + android:gravity="center_vertical" > <ImageView android:id="@+id/icon" android:layout_width="@dimen/header_subsettings_margin_start" @@ -31,12 +30,11 @@ android:id="@+id/name" android:layout_height="wrap_content" android:layout_width="match_parent" - android:layout_toStartOf="@+id/app_settings" android:layout_marginStart="@dimen/header_subsettings_margin_start" android:layout_alignWithParentIfMissing="true" android:layout_centerVertical="true" android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@android:color/white" + android:textColor="?android:attr/textColorPrimaryInverse" android:textAlignment="viewStart" /> <ImageView @@ -52,11 +50,4 @@ android:src="@drawable/ic_info" style="?android:attr/borderlessButtonStyle" /> - <View - android:id="@+id/row_divider" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?android:attr/listDivider" /> - </RelativeLayout> - diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml index 86ea1652..8144b2b0 100644 --- a/res/layout/install_confirm.xml +++ b/res/layout/install_confirm.xml @@ -31,9 +31,10 @@ android:id="@+id/install_confirm_question" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingStart="16dip" + android:paddingEnd="16dip" android:text="@string/install_confirm_question" android:textAppearance="?android:attr/textAppearanceMedium" - style="@style/padded" android:paddingTop="4dip" /> <ImageView @@ -66,7 +67,7 @@ <HorizontalScrollView android:id="@+id/tabscontainer" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@*android:drawable/tab_unselected_holo" + android:background="@drawable/tab_container_bg" android:fillViewport="true" android:scrollbars="none"> <FrameLayout android:layout_width="match_parent" diff --git a/res/layout/permission_description.xml b/res/layout/permission_description.xml index 3f1cf434..2a00e9bf 100644 --- a/res/layout/permission_description.xml +++ b/res/layout/permission_description.xml @@ -26,15 +26,15 @@ android:layout_height="36dip" android:layout_marginTop="3dp" android:tint="?android:attr/colorAccent" - android:scaleType="fitCenter" /> + android:scaleType="fitCenter" > + </ImageView> <TextView android:id="@+id/permission_message" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toRightOf="@id/permission_icon" - android:lineSpacingMultiplier="1.024" - android:fontFamily="@*android:string/font_family_body_2_material" + android:layout_marginTop="3dp" android:paddingStart="16dip" android:paddingEnd="8dip" style="?android:attr/textAppearanceMedium"> diff --git a/res/layout/permissions_frame.xml b/res/layout/permissions_frame.xml index 8f1f2789..156af57e 100644 --- a/res/layout/permissions_frame.xml +++ b/res/layout/permissions_frame.xml @@ -30,8 +30,8 @@ android:layout_height="match_parent" android:text="@string/no_permissions" android:gravity="center" - android:textAppearance="@android:style/TextAppearance.Large" - /> + style="?android:attr/textAppearanceLarge"> + </TextView> </FrameLayout> diff --git a/res/layout/preference_permissions.xml b/res/layout/preference_permissions.xml index 67b4469c..631d56bd 100644 --- a/res/layout/preference_permissions.xml +++ b/res/layout/preference_permissions.xml @@ -37,7 +37,7 @@ android:paddingEnd="20dp" android:paddingTop="4dp" android:paddingBottom="4dp"> - <com.android.internal.widget.PreferenceImageView + <com.android.packageinstaller.permission.ui.PreferenceImageView android:id="@android:id/icon" android:layout_width="24dp" android:layout_height="24dp" diff --git a/res/layout/preference_permissions_switch.xml b/res/layout/preference_permissions_switch.xml index cf444d96..78d2a4ef 100644 --- a/res/layout/preference_permissions_switch.xml +++ b/res/layout/preference_permissions_switch.xml @@ -37,7 +37,7 @@ android:paddingEnd="20dp" android:paddingTop="4dp" android:paddingBottom="4dp"> - <com.android.internal.widget.PreferenceImageView + <com.android.packageinstaller.permission.ui.PreferenceImageView android:id="@android:id/icon" android:layout_width="36dp" android:layout_height="36dp" diff --git a/res/layout/uninstall_confirm.xml b/res/layout/uninstall_confirm.xml index f604023f..78270f60 100644 --- a/res/layout/uninstall_confirm.xml +++ b/res/layout/uninstall_confirm.xml @@ -40,9 +40,10 @@ android:id="@+id/activity_text" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingStart="16dip" + android:paddingEnd="16dip" android:textColor="?android:attr/textColorSecondary" android:textAppearance="?android:attr/textAppearanceMedium" - style="@style/padded" android:visibility="gone" /> <!-- The snippet (title & icon) about the application being uninstalled. --> |