diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/account_sync_screen.xml | 40 | ||||
| -rw-r--r-- | res/layout/apn_preference_layout.xml | 19 | ||||
| -rw-r--r-- | res/layout/app_percentage_item.xml | 7 | ||||
| -rw-r--r-- | res/layout/bluetooth_discoverable.xml | 33 | ||||
| -rw-r--r-- | res/layout/choose_lock_pattern_tutorial.xml | 81 | ||||
| -rw-r--r-- | res/layout/dream_info_row.xml | 2 | ||||
| -rw-r--r-- | res/layout/installed_app_details.xml | 132 | ||||
| -rw-r--r-- | res/layout/manage_accounts_screen.xml | 5 | ||||
| -rw-r--r-- | res/layout/manage_applications_apps.xml | 1 | ||||
| -rwxr-xr-x | res/layout/manage_applications_item.xml | 92 | ||||
| -rw-r--r-- | res/layout/power_usage_details.xml | 5 | ||||
| -rw-r--r-- | res/layout/running_processes_item.xml | 129 | ||||
| -rw-r--r-- | res/layout/running_service_details.xml | 9 | ||||
| -rw-r--r-- | res/layout/running_service_details_process.xml | 4 | ||||
| -rw-r--r-- | res/layout/running_service_details_service.xml | 25 | ||||
| -rw-r--r-- | res/layout/title.xml | 75 | ||||
| -rwxr-xr-x | res/layout/two_buttons_panel.xml | 2 | ||||
| -rw-r--r-- | res/layout/weak_biometric_fallback_header.xml | 1 |
18 files changed, 264 insertions, 398 deletions
diff --git a/res/layout/account_sync_screen.xml b/res/layout/account_sync_screen.xml index 67a62b9..5358fe3 100644 --- a/res/layout/account_sync_screen.xml +++ b/res/layout/account_sync_screen.xml @@ -22,23 +22,23 @@ android:layout_height="match_parent" android:orientation="vertical"> - <include layout="@layout/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <include layout="@layout/title" /> <ImageView android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="@*android:dimen/preference_fragment_padding_side" + android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side" android:scaleType="fitXY" android:src="?android:attr/listDivider" /> - <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list" + <ListView + android:id="@android:id/list" android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" - android:drawSelectorOnTop="false" - android:scrollbarAlwaysDrawVerticalTrack="true" - /> + android:clipToPadding="false" + android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" /> <TextView android:id="@+id/sync_settings_error_info" android:layout_width="match_parent" @@ -48,32 +48,6 @@ android:drawablePadding="8dip" android:drawableStart="@drawable/ic_sync_error_holo" /> - <!-- - <LinearLayout android:id="@+id/remove_account_area" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:background="@android:drawable/bottom_bar"> - - <View - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1"/> - - <Button android:id="@+id/remove_account_button" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="2" - android:layout_marginTop="5dip" - android:text="@string/remove_account_label" /> - - <View - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1"/> - </LinearLayout> - --> - <RelativeLayout android:id="@+id/finish_button_area" android:layout_height="wrap_content" android:layout_width="match_parent" diff --git a/res/layout/apn_preference_layout.xml b/res/layout/apn_preference_layout.xml index 76c9c3d..b79b0b9 100644 --- a/res/layout/apn_preference_layout.xml +++ b/res/layout/apn_preference_layout.xml @@ -23,15 +23,14 @@ <RelativeLayout android:id="@+android:id/text_layout" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16sp" - android:layout_marginEnd="6sp" - android:layout_marginTop="6sp" - android:layout_marginBottom="6sp" + android:layout_width="0dip" + android:layout_height="match_parent" + android:paddingStart="8dip" + android:paddingEnd="8dip" + android:gravity="center_vertical" android:layout_weight="1" android:focusable="true" - android:background="@android:drawable/menuitem_background"> + android:background="?android:attr/selectableItemBackground"> <TextView android:id="@+android:id/title" @@ -39,7 +38,7 @@ android:layout_height="wrap_content" android:focusable="true" android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceLarge" /> + android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView android:id="@+android:id/summary" @@ -57,8 +56,8 @@ android:id="@+android:id/apn_radiobutton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="4dip" - android:layout_marginEnd="4dip" + android:layout_marginStart="8dip" + android:layout_marginEnd="8dip" android:layout_gravity="center_vertical" android:clickable="true" /> diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml index b5e6db7..8bdbadb 100644 --- a/res/layout/app_percentage_item.xml +++ b/res/layout/app_percentage_item.xml @@ -26,8 +26,8 @@ <ImageView android:id="@android:id/icon" - android:layout_width="48dip" - android:layout_height="48dip" + android:layout_width="@android:dimen/app_icon_size" + android:layout_height="@android:dimen/app_icon_size" android:layout_rowSpan="3" android:layout_marginEnd="8dip" android:scaleType="centerInside" @@ -37,10 +37,11 @@ android:id="@android:id/title" android:layout_width="0dip" android:layout_gravity="fill_horizontal" + android:layout_marginTop="2dip" android:singleLine="true" android:ellipsize="marquee" android:textAppearance="?android:attr/textAppearanceMedium" - android:textDirection="locale" /> + android:textAlignment="viewStart" /> <TextView android:id="@android:id/text1" diff --git a/res/layout/bluetooth_discoverable.xml b/res/layout/bluetooth_discoverable.xml deleted file mode 100644 index b3ddbb9..0000000 --- a/res/layout/bluetooth_discoverable.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2009, 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. -*/ ---> - -<ScrollView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="match_parent" - android:layout_width="match_parent"> - - <TextView - android:id="@+id/message" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingStart="20dip" - android:paddingEnd="20dip" - android:gravity="center_horizontal" - android:textAppearance="?android:attr/textAppearanceMedium" /> -</ScrollView> diff --git a/res/layout/choose_lock_pattern_tutorial.xml b/res/layout/choose_lock_pattern_tutorial.xml deleted file mode 100644 index 8514550..0000000 --- a/res/layout/choose_lock_pattern_tutorial.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_height="match_parent" - android:layout_width="match_parent" - android:gravity="center_horizontal"> - - <!-- top: instructions and buttons --> - <!-- header message --> - <ScrollView - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="5dip"> - - <!-- Top: instructions --> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:text="@string/lock_title" - android:paddingBottom="10dip" - style="?android:attr/textAppearanceLarge" - android:visibility="visible" - /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/lock_intro_message" - /> - - <!-- bottom: lock pattern --> - <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" - android:layout_width="200dip" - android:layout_height="200dip" - android:layout_marginTop="10dip" - android:layout_gravity="start"/> - - </LinearLayout> - - </ScrollView> - - <LinearLayout - style="@style/SecurityPreferenceButtonContainer" - android:orientation="horizontal"> - - <!-- left / top button: skip, or re-try --> - <Button android:id="@+id/skip_button" - style="@style/SecurityPreferenceButton" - android:text="@string/lockpattern_tutorial_cancel_label"/> - - <!-- right / bottom button: confirm or ok --> - <Button android:id="@+id/next_button" - style="@style/SecurityPreferenceButton" - android:text="@string/lockpattern_tutorial_continue_label"/> - - </LinearLayout> - -</LinearLayout> diff --git a/res/layout/dream_info_row.xml b/res/layout/dream_info_row.xml index a2f81c6..acc3a65 100644 --- a/res/layout/dream_info_row.xml +++ b/res/layout/dream_info_row.xml @@ -54,7 +54,7 @@ android:ellipsize="end" android:singleLine="true" android:textAppearance="?android:attr/textAppearanceMedium" - android:textDirection="locale" + android:textAlignment="viewStart" android:labelFor="@android:id/button2" /> <!-- Dream radio button --> diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml index 7829596..b7f8f15 100644 --- a/res/layout/installed_app_details.xml +++ b/res/layout/installed_app_details.xml @@ -19,12 +19,14 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:clipToPadding="false" + android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle"> + <LinearLayout android:id="@+id/all_details" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingEnd="6dip" android:paddingBottom="5dip" android:orientation="vertical"> @@ -33,16 +35,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:orientation="vertical" - android:paddingEnd="6dip" - android:paddingStart="6dip" - android:paddingTop="5dip" - android:paddingBottom="5dip" > + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:orientation="vertical"> <!-- Application snippet label, version and icon --> <include layout="@layout/manage_applications_item" - android:id="@+id/app_snippet"/> + android:id="@+id/app_snippet" /> <!-- Force stop and uninstall buttons --> <include @@ -58,8 +58,8 @@ <CheckBox android:id="@+id/notification_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="12dip" android:layout_gravity="start" + android:layout_marginTop="4dip" android:text="@string/app_notifications_switch_label" /> </LinearLayout> @@ -72,8 +72,9 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingStart="6dip" - android:orientation="vertical"> + android:orientation="vertical" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -87,9 +88,7 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:maxLines="1" - android:paddingTop="6dip" - android:paddingStart="6dip"/> - + android:paddingTop="6dip" /> <ImageView android:id="@+id/info_size_dots" android:src="@drawable/dotted_line_480px" @@ -105,13 +104,12 @@ <TextView android:id="@+id/total_size_text" android:paddingTop="6dip" - android:paddingEnd="6dip" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_height="wrap_content" android:layout_width="wrap_content" android:maxLines="1" /> - </LinearLayout> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -125,8 +123,7 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:maxLines="1" - android:paddingTop="6dip" - android:paddingStart="6dip"/> + android:paddingTop="6dip" /> <ImageView android:id="@+id/info_size_dots" android:src="@drawable/dotted_line_480px" @@ -143,11 +140,9 @@ android:id="@+id/application_size_text" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingTop="6dip" - android:paddingEnd="6dip" android:layout_height="wrap_content" android:layout_width="wrap_content" android:maxLines="1" /> - </LinearLayout> <LinearLayout @@ -163,8 +158,7 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:maxLines="1" - android:paddingTop="6dip" - android:paddingStart="6dip"/> + android:paddingTop="6dip" /> <ImageView android:id="@+id/info_size_dots" android:src="@drawable/dotted_line_480px" @@ -181,11 +175,9 @@ android:id="@+id/external_code_size_text" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingTop="6dip" - android:paddingEnd="6dip" android:layout_height="wrap_content" android:layout_width="wrap_content" android:maxLines="1" /> - </LinearLayout> <LinearLayout @@ -202,8 +194,7 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:maxLines="1" - android:paddingTop="6dip" - android:paddingStart="6dip"/> + android:paddingTop="6dip" /> <ImageView android:id="@+id/info_size_dots" android:src="@drawable/dotted_line_480px" @@ -220,11 +211,9 @@ android:id="@+id/data_size_text" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingTop="6dip" - android:paddingEnd="6dip" android:layout_height="wrap_content" android:layout_width="wrap_content" android:maxLines="1" /> - </LinearLayout> <LinearLayout @@ -240,8 +229,7 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:maxLines="1" - android:paddingTop="6dip" - android:paddingStart="6dip"/> + android:paddingTop="6dip" /> <ImageView android:id="@+id/info_size_dots" android:src="@drawable/dotted_line_480px" @@ -258,11 +246,9 @@ android:id="@+id/external_data_size_text" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingTop="6dip" - android:paddingEnd="6dip" android:layout_height="wrap_content" android:layout_width="wrap_content" android:maxLines="1" /> - </LinearLayout> <!-- Clear data and install location buttons --> @@ -289,6 +275,8 @@ android:orientation="horizontal" android:baselineAligned="true" android:layout_below="@id/cache_header" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingTop="-1dip"> <TextView android:text="@string/cache_size_label" @@ -297,8 +285,7 @@ android:maxLines="1" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingTop="6dip" - android:gravity="center_vertical" - android:paddingStart="6dip"/> + android:gravity="center_vertical" /> <ImageView android:src="@drawable/dotted_line_480px" android:layout_width="0dip" @@ -314,19 +301,36 @@ android:id="@+id/cache_size_text" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingTop="6dip" - android:paddingEnd="6dip" android:layout_height="wrap_content" android:layout_width="wrap_content" android:maxLines="1" /> </LinearLayout> - <Button android:id="@+id/clear_cache_button" - android:layout_alignParentEnd="true" + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" android:layout_below="@id/cache_size" - android:layout_centerHorizontal="true" - android:layout_width="200dip" - android:text="@string/clear_cache_btn_text" - android:layout_height="wrap_content" /> + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingTop="4dip" + android:orientation="horizontal"> + <View + android:layout_width="120dip" + android:layout_height="0dip" + android:layout_weight="0.4" /> + <View + android:layout_width="0dip" + android:layout_height="0dip" + android:visibility="invisible" + android:layout_weight="0.2" /> + <Button + android:id="@+id/clear_cache_button" + android:layout_width="120dip" + android:layout_height="wrap_content" + android:layout_weight="0.4" + android:text="@string/clear_cache_btn_text" /> + </LinearLayout> + </RelativeLayout> <!-- Prefered activities section --> @@ -338,22 +342,38 @@ <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_vertical"> + android:layout_gravity="center_vertical" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> <TextView android:id="@+id/auto_launch" android:textAppearance="?android:attr/textAppearanceSmall" android:layout_alignParentStart="true" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="6dip" - android:paddingEnd="6dip" - android:paddingStart="6dip" /> - <Button android:id="@+id/clear_activities_button" - android:layout_alignParentEnd="true" + android:paddingTop="6dip" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" android:layout_below="@id/auto_launch" - android:layout_centerHorizontal="true" - android:layout_width="200dip" - android:text="@string/clear_activities" - android:layout_height="wrap_content" /> + android:paddingTop="4dip" + android:orientation="horizontal"> + <View + android:layout_width="120dip" + android:layout_height="0dip" + android:layout_weight="0.4" /> + <View + android:layout_width="0dip" + android:layout_height="0dip" + android:visibility="invisible" + android:layout_weight="0.2" /> + <Button + android:id="@+id/clear_activities_button" + android:layout_width="120dip" + android:layout_height="wrap_content" + android:layout_weight="0.4" + android:text="@string/clear_activities" /> + </LinearLayout> </RelativeLayout> <!-- Screen compatibility section --> @@ -371,8 +391,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="6dip" - android:paddingEnd="6dip" - android:paddingStart="6dip" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:text="@string/screen_compatibility_text"/> <CheckBox android:id="@+id/ask_compatibility_cb" android:layout_width="wrap_content" @@ -403,8 +423,9 @@ android:textColor="#ffffb060" android:textAppearance="?android:attr/textAppearanceSmall" android:paddingTop="6dip" - android:paddingStart="6dip" android:paddingBottom="6dip" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:layout_width="match_parent" android:layout_height="wrap_content" /> <LinearLayout @@ -426,8 +447,9 @@ android:text="@string/security_settings_desc" android:textAppearance="?android:attr/textAppearanceSmall" android:paddingTop="6dip" - android:paddingStart="6dip" android:paddingBottom="6dip" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:layout_width="match_parent" android:layout_height="wrap_content" /> <LinearLayout diff --git a/res/layout/manage_accounts_screen.xml b/res/layout/manage_accounts_screen.xml index 329ebc5..26f361a 100644 --- a/res/layout/manage_accounts_screen.xml +++ b/res/layout/manage_accounts_screen.xml @@ -27,9 +27,8 @@ android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" - android:drawSelectorOnTop="false" - android:scrollbarAlwaysDrawVerticalTrack="true" - /> + android:clipToPadding="false" + android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" /> <TextView android:id="@+id/sync_settings_error_info" android:layout_width="match_parent" diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml index 394382e..8a8ba0b 100644 --- a/res/layout/manage_applications_apps.xml +++ b/res/layout/manage_applications_apps.xml @@ -30,6 +30,7 @@ android:drawSelectorOnTop="false" android:layout_width="match_parent" android:layout_height="match_parent" + android:clipToPadding="false" android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" /> <TextView android:id="@android:id/empty" android:layout_width="match_parent" diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml index 3c7944e..f471f55 100755 --- a/res/layout/manage_applications_item.xml +++ b/res/layout/manage_applications_item.xml @@ -17,68 +17,54 @@ */ --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" - android:orientation="horizontal" - android:paddingEnd="6dip" - android:paddingStart="6dip" - android:paddingTop="5dip" - android:paddingBottom="5dip" - android:gravity="center_vertical" > + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingTop="8dip" + android:paddingBottom="8dip" + android:columnCount="4"> - <ImageView android:id="@+id/app_icon" + <ImageView + android:id="@+id/app_icon" android:layout_width="@android:dimen/app_icon_size" android:layout_height="@android:dimen/app_icon_size" - android:layout_marginEnd="11dip" - android:layout_gravity="center_vertical" - android:scaleType="fitCenter" - android:contentDescription="@null"/> + android:layout_rowSpan="2" + android:layout_marginEnd="8dip" + android:scaleType="centerInside" + android:contentDescription="@null" /> + + <TextView + android:id="@+id/app_name" + android:layout_width="0dip" + android:layout_columnSpan="2" + android:layout_gravity="fill_horizontal" + android:layout_marginTop="2dip" + android:singleLine="true" + android:ellipsize="marquee" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textAlignment="viewStart" /> - <LinearLayout - android:orientation="vertical" - android:layout_width="0px" - android:layout_weight="1" - android:layout_height="wrap_content" > - <TextView android:id="@+id/app_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textStyle="bold" - android:singleLine="true" - android:ellipsize="marquee" - android:layout_marginBottom="2dip" /> - <LinearLayout - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:baselineAlignedChildIndex="0" > - <TextView android:id="@+id/app_size" - android:layout_marginTop="-4dip" - android:layout_gravity="center_vertical|start" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceSmall" /> - <TextView android:id="@+id/app_disabled" - android:layout_marginTop="-4dip" - android:layout_gravity="center_vertical|end" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:visibility="gone" - android:textAppearance="?android:attr/textAppearanceSmall" - android:text="@string/disabled" /> - </LinearLayout> - </LinearLayout> - <CheckBox android:id="@+id/app_on_sdcard" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="5dip" + android:layout_marginStart="8dip" android:layout_gravity="center_vertical" + android:layout_rowSpan="2" android:visibility="gone" android:clickable="false" android:focusable="false" /> -</LinearLayout> + + <TextView + android:id="@+id/app_size" + android:layout_width="0dip" + android:layout_gravity="fill_horizontal" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textAlignment="viewStart" /> + + <TextView + android:id="@+id/app_disabled" + android:layout_marginStart="8dip" + android:textAppearance="?android:attr/textAppearanceSmall" /> + +</GridLayout> diff --git a/res/layout/power_usage_details.xml b/res/layout/power_usage_details.xml index 001ffec..05036da 100644 --- a/res/layout/power_usage_details.xml +++ b/res/layout/power_usage_details.xml @@ -17,7 +17,10 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:clipToPadding="false" + android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle"> + <LinearLayout android:id="@+id/all_details" android:layout_width="match_parent" diff --git a/res/layout/running_processes_item.xml b/res/layout/running_processes_item.xml index 7cc2d8d..e64b594 100644 --- a/res/layout/running_processes_item.xml +++ b/res/layout/running_processes_item.xml @@ -17,79 +17,68 @@ */ --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" - android:orientation="vertical" - android:gravity="fill" > + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingTop="8dip" + android:paddingBottom="8dip" + android:columnCount="2"> + + <ImageView + android:id="@+id/icon" + android:layout_width="@android:dimen/app_icon_size" + android:layout_height="@android:dimen/app_icon_size" + android:layout_rowSpan="2" + android:layout_marginEnd="8dip" + android:scaleType="centerInside" + android:contentDescription="@null" /> <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:orientation="horizontal" - android:paddingEnd="6dip" - android:paddingStart="6dip" - android:gravity="center_vertical" > - - <ImageView android:id="@+id/icon" - android:layout_width="@android:dimen/app_icon_size" - android:layout_height="@android:dimen/app_icon_size" - android:layout_marginEnd="11dip" - android:layout_gravity="center_vertical" - android:scaleType="fitCenter" - android:contentDescription="@null" /> - - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" > - <LinearLayout - android:orientation="horizontal" - android:baselineAlignedChildIndex="0" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <TextView android:id="@+id/name" - android:layout_width="0px" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingEnd="4dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textStyle="bold" - android:singleLine="true" - android:ellipsize="marquee" - android:layout_marginBottom="2dip" /> - <TextView android:id="@+id/size" - android:layout_gravity="center_vertical|end" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> - <LinearLayout - android:orientation="horizontal" - android:baselineAlignedChildIndex="0" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <TextView android:id="@+id/description" - android:layout_gravity="center_vertical|start" - android:layout_width="0px" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingEnd="4dip" - android:singleLine="true" - android:ellipsize="marquee" - android:textAppearance="?android:attr/textAppearanceSmall" /> - <TextView android:id="@+id/uptime" - android:layout_gravity="center_vertical|end" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> - </LinearLayout> + android:layout_width="0dip" + android:layout_gravity="fill_horizontal" + android:layout_marginTop="2dip"> + + <TextView + android:id="@+id/name" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:singleLine="true" + android:ellipsize="marquee" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textAlignment="viewStart" /> + + <TextView + android:id="@+id/size" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dip" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </LinearLayout> -</LinearLayout> + + <LinearLayout + android:layout_width="0dip" + android:layout_gravity="fill_horizontal"> + + <TextView + android:id="@+id/description" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textAlignment="viewStart" /> + + <TextView + android:id="@+id/uptime" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dip" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + </LinearLayout> + +</GridLayout> diff --git a/res/layout/running_service_details.xml b/res/layout/running_service_details.xml index 98c144c..92ce07b 100644 --- a/res/layout/running_service_details.xml +++ b/res/layout/running_service_details.xml @@ -19,7 +19,10 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:clipToPadding="false" + android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle"> + <LinearLayout android:id="@+id/all_details" android:layout_width="match_parent" @@ -29,8 +32,8 @@ <!-- Summary information as per previous screen --> <include layout="@layout/running_processes_item" - android:id="@+id/snippet"/> + android:id="@+id/snippet" /> </LinearLayout> -</ScrollView> +</ScrollView> diff --git a/res/layout/running_service_details_process.xml b/res/layout/running_service_details_process.xml index caf5664..68ec482 100644 --- a/res/layout/running_service_details_process.xml +++ b/res/layout/running_service_details_process.xml @@ -29,9 +29,9 @@ <TextView android:id="@+id/comp_description" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingTop="8dp" android:paddingBottom="8dp" - android:paddingStart="14dip" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:textAppearance="?android:attr/textAppearanceMedium" /> </LinearLayout> diff --git a/res/layout/running_service_details_service.xml b/res/layout/running_service_details_service.xml index 56cd971..706d1cf 100644 --- a/res/layout/running_service_details_service.xml +++ b/res/layout/running_service_details_service.xml @@ -33,16 +33,23 @@ layout="@layout/running_processes_item" android:id="@+id/service"/> - <TextView android:id="@+id/comp_description" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:paddingStart="14dip" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:orientation="vertical"> - <include - layout="@layout/two_buttons_panel" - android:id="@+id/control_buttons_panel"/> + <TextView android:id="@+id/comp_description" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingBottom="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <include + layout="@layout/two_buttons_panel" + android:id="@+id/control_buttons_panel" /> + + </LinearLayout> </LinearLayout> diff --git a/res/layout/title.xml b/res/layout/title.xml index eb2222b..0c2084b 100644 --- a/res/layout/title.xml +++ b/res/layout/title.xml @@ -19,46 +19,45 @@ <!-- The title area at the top of the settings pane --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/title_area" - android:orientation="horizontal"> - - <ImageView android:id="@+id/provider_icon" - android:layout_width="48dip" - android:layout_height="48dip" - android:layout_margin="5dip" - android:layout_gravity="center_vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="@*android:dimen/preference_fragment_padding_side" + android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side" + android:minHeight="?android:attr/listPreferredItemHeight" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:paddingTop="8dip" + android:paddingBottom="8dip" + android:columnCount="2"> + + <ImageView + android:id="@+id/provider_icon" + android:layout_width="@android:dimen/app_icon_size" + android:layout_height="@android:dimen/app_icon_size" + android:layout_rowSpan="2" + android:layout_marginEnd="8dip" + android:scaleType="centerInside" android:contentDescription="@null" /> - <LinearLayout + <TextView + android:id="@+id/user_id" android:layout_width="0dip" - android:layout_weight="1" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <TextView - android:id="@+id/user_id" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="?android:attr/textColorTertiary" - android:textStyle="bold" - android:singleLine="true" - android:ellipsize="end" - android:gravity="center_vertical" - android:layout_marginTop="5dip"/> - - <TextView - android:id="@+id/provider_id" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColorTertiary" - android:singleLine="true" - android:ellipsize="end" - android:layout_gravity="bottom" - android:layout_marginBottom="5dip"/> - - </LinearLayout> + android:layout_gravity="fill_horizontal" + android:layout_marginTop="2dip" + android:singleLine="true" + android:ellipsize="marquee" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textAlignment="viewStart" /> + + <TextView + android:id="@+id/provider_id" + android:layout_width="0dip" + android:layout_gravity="fill_horizontal" + android:singleLine="true" + android:ellipsize="marquee" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textAlignment="viewStart" /> -</LinearLayout> +</GridLayout> diff --git a/res/layout/two_buttons_panel.xml b/res/layout/two_buttons_panel.xml index 1a5975a..2acf6f6 100755 --- a/res/layout/two_buttons_panel.xml +++ b/res/layout/two_buttons_panel.xml @@ -24,8 +24,6 @@ android:layout_height="wrap_content" android:gravity="bottom" android:paddingTop="4dip" - android:paddingStart="2dip" - android:paddingEnd="2dip" android:orientation="horizontal"> <Button android:id="@+id/left_button" diff --git a/res/layout/weak_biometric_fallback_header.xml b/res/layout/weak_biometric_fallback_header.xml index adbb613..5f9c2a2 100644 --- a/res/layout/weak_biometric_fallback_header.xml +++ b/res/layout/weak_biometric_fallback_header.xml @@ -19,6 +19,5 @@ android:padding="8dip" android:gravity="center" android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="?android:attr/textColorSecondary" android:text="@string/unlock_backup_info_summary" />
\ No newline at end of file |