diff options
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/all_apps.xml | 9 | ||||
-rw-r--r-- | res/layout/all_apps_button.xml | 4 | ||||
-rw-r--r-- | res/layout/all_apps_empty_search.xml | 3 | ||||
-rw-r--r-- | res/layout/all_apps_icon.xml | 9 | ||||
-rw-r--r-- | res/layout/app_icon.xml | 4 | ||||
-rw-r--r-- | res/layout/deep_shortcut.xml | 24 | ||||
-rw-r--r-- | res/layout/folder_application.xml | 9 | ||||
-rw-r--r-- | res/layout/folder_icon.xml | 3 | ||||
-rw-r--r-- | res/layout/notification_main.xml | 12 | ||||
-rw-r--r-- | res/layout/qsb_default_view.xml | 6 | ||||
-rw-r--r-- | res/layout/user_folder.xml | 10 | ||||
-rw-r--r-- | res/layout/user_folder_icon_normalized.xml | 10 |
12 files changed, 59 insertions, 44 deletions
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml index 5f5b38b46..d6bdac2f0 100644 --- a/res/layout/all_apps.xml +++ b/res/layout/all_apps.xml @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - launcher:revealBackground="@drawable/quantum_panel_shape"> + launcher:revealBackground="@drawable/round_rect_primary"> <View android:id="@+id/reveal_view" @@ -54,8 +54,7 @@ android:descendantFocusability="afterDescendants" android:focusable="true" android:paddingStart="@dimen/container_fastscroll_thumb_max_width" - android:paddingEnd="@dimen/container_fastscroll_thumb_max_width" - android:theme="@style/AllAppsOverscroll" /> + android:paddingEnd="@dimen/container_fastscroll_thumb_max_width" /> <!-- Fast scroller popup --> <TextView @@ -87,7 +86,7 @@ android:maxLines="1" android:scrollHorizontally="true" android:singleLine="true" - android:textColor="#4c4c4c" + android:textColor="?android:attr/textColorSecondary" android:hint="@string/all_apps_search_bar_hint" android:textColorHint="@drawable/all_apps_search_hint" android:textSize="16sp" /> @@ -95,11 +94,11 @@ </com.android.launcher3.allapps.AllAppsRecyclerViewContainerView> <View + style="@style/AllAppsNavBarProtection" android:id="@+id/nav_bar_bg" android:layout_width="match_parent" android:layout_height="0dp" android:layout_gravity="bottom" - android:background="@color/all_apps_navbar_color" android:focusable="false" android:visibility="invisible" /> </com.android.launcher3.allapps.AllAppsContainerView>
\ No newline at end of file diff --git a/res/layout/all_apps_button.xml b/res/layout/all_apps_button.xml index 68cc10932..4bc780a70 100644 --- a/res/layout/all_apps_button.xml +++ b/res/layout/all_apps_button.xml @@ -14,6 +14,4 @@ limitations under the License. --> -<TextView xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/Icon" - android:focusable="true" /> +<TextView style="@style/BaseIcon" /> diff --git a/res/layout/all_apps_empty_search.xml b/res/layout/all_apps_empty_search.xml index e1635d638..463adac0c 100644 --- a/res/layout/all_apps_empty_search.xml +++ b/res/layout/all_apps_empty_search.xml @@ -25,7 +25,6 @@ android:paddingRight="16dp" android:fontFamily="sans-serif-medium" android:textSize="14sp" - android:textColor="#212121" - android:alpha="0.56" + android:textColor="?android:attr/textColorTertiary" android:focusable="false" /> diff --git a/res/layout/all_apps_icon.xml b/res/layout/all_apps_icon.xml index 3d4bef70c..1e83041d5 100644 --- a/res/layout/all_apps_icon.xml +++ b/res/layout/all_apps_icon.xml @@ -16,12 +16,13 @@ <com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto" - style="@style/Icon.AllApps" + style="@style/BaseIcon" android:id="@+id/icon" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center" - android:focusable="true" launcher:iconDisplay="all_apps" - launcher:centerVertically="true" /> + launcher:centerVertically="true" + android:paddingLeft="4dp" + android:paddingRight="4dp" + android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding" /> diff --git a/res/layout/app_icon.xml b/res/layout/app_icon.xml index 831cee5b0..fa6eb8910 100644 --- a/res/layout/app_icon.xml +++ b/res/layout/app_icon.xml @@ -14,6 +14,4 @@ limitations under the License. --> -<com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/Icon" - android:focusable="true" /> +<com.android.launcher3.BubbleTextView style="@style/BaseIcon.Workspace" /> diff --git a/res/layout/deep_shortcut.xml b/res/layout/deep_shortcut.xml index 1f67682b8..6c1d4da91 100644 --- a/res/layout/deep_shortcut.xml +++ b/res/layout/deep_shortcut.xml @@ -16,18 +16,28 @@ <com.android.launcher3.shortcuts.DeepShortcutView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res-auto" android:layout_width="@dimen/bg_pill_width" android:layout_height="@dimen/bg_pill_height" android:elevation="@dimen/deep_shortcuts_elevation" - android:background="@drawable/bg_white_pill"> + android:background="@drawable/bg_white_pill" > -<com.android.launcher3.shortcuts.DeepShortcutTextView + <com.android.launcher3.shortcuts.DeepShortcutTextView + style="@style/BaseIcon" android:id="@+id/deep_shortcut" - style="@style/Icon.DeepShortcut" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:focusable="true" - android:background="@drawable/bg_pill_focused" /> + android:background="@drawable/bg_pill_focused" + android:gravity="start|center_vertical" + android:textAlignment="viewStart" + android:paddingStart="@dimen/bg_pill_height" + android:paddingEnd="@dimen/deep_shortcut_padding_end" + android:drawableEnd="@drawable/deep_shortcuts_drag_handle" + android:drawablePadding="@dimen/deep_shortcut_drawable_padding" + android:textSize="14sp" + android:fontFamily="sans-serif" + launcher:layoutHorizontal="true" + launcher:iconDisplay="shortcut_popup" + launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size" + android:elevation="@dimen/deep_shortcuts_elevation" /> <View android:id="@+id/popup_item_icon" diff --git a/res/layout/folder_application.xml b/res/layout/folder_application.xml index 4d003313e..de861a0ad 100644 --- a/res/layout/folder_application.xml +++ b/res/layout/folder_application.xml @@ -14,6 +14,9 @@ limitations under the License. --> -<com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/Icon.Folder" - android:focusable="true" /> +<com.android.launcher3.BubbleTextView + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res-auto" + style="@style/BaseIcon" + android:includeFontPadding="false" + launcher:iconDisplay="folder" /> diff --git a/res/layout/folder_icon.xml b/res/layout/folder_icon.xml index 9eb8c9a67..ccc6b01ea 100644 --- a/res/layout/folder_icon.xml +++ b/res/layout/folder_icon.xml @@ -21,8 +21,9 @@ android:orientation="vertical" android:focusable="true" > <com.android.launcher3.BubbleTextView - style="@style/Icon" + style="@style/BaseIcon.Workspace" android:id="@+id/folder_icon_name" + android:focusable="false" android:layout_gravity="top" android:layout_width="match_parent" android:layout_height="match_parent" /> diff --git a/res/layout/notification_main.xml b/res/layout/notification_main.xml index efb74b0f7..84827f114 100644 --- a/res/layout/notification_main.xml +++ b/res/layout/notification_main.xml @@ -21,7 +21,6 @@ android:layout_height="match_parent" android:orientation="horizontal" android:focusable="true" - android:background="@drawable/bg_pill_focused" android:elevation="@dimen/notification_elevation" > <View @@ -39,13 +38,20 @@ android:gravity="center_vertical"> <TextView android:id="@+id/title" - style="@style/Icon.DeepNotification" + android:textAlignment="viewStart" + android:fontFamily="sans-serif" + android:textSize="14sp" + android:textColor="?android:attr/textColorSecondary" android:layout_width="match_parent" android:layout_height="wrap_content" /> <TextView android:id="@+id/text" - style="@style/Icon.DeepNotification.SubText" + android:paddingEnd="4dp" + android:textSize="12sp" + android:textAlignment="viewStart" + android:fontFamily="sans-serif" + android:textColor="?android:attr/textColorTertiary" android:layout_width="match_parent" android:layout_height="wrap_content" /> </LinearLayout> diff --git a/res/layout/qsb_default_view.xml b/res/layout/qsb_default_view.xml index 82bdea5e8..3075f803f 100644 --- a/res/layout/qsb_default_view.xml +++ b/res/layout/qsb_default_view.xml @@ -23,7 +23,7 @@ android:layout_height="48dp" android:layout_margin="16dp" android:layout_gravity="center_vertical" - android:background="@drawable/quantum_panel_shape" + android:background="@drawable/round_rect_primary" android:elevation="2dp" android:orientation="horizontal"> @@ -35,7 +35,7 @@ android:gravity="center_vertical" android:paddingStart="16dp" android:text="@string/abandoned_search" - android:textColor="@color/quantum_panel_text_color" + android:textColor="?android:attr/textColorSecondary" android:textAppearance="?android:textAppearanceMedium" android:clickable="true" android:background="?android:attr/selectableItemBackground" /> @@ -46,7 +46,7 @@ android:visibility="gone" android:layout_height="match_parent" android:src="@drawable/ic_setting" - android:tint="@color/quantum_panel_text_color" + android:tint="?android:attr/textColorSecondary" android:contentDescription="@string/gadget_setup_text" android:padding="8dp" android:background="?android:attr/selectableItemBackground" /> diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index da2a861d8..cde654096 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -18,7 +18,7 @@ xmlns:launcher="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/quantum_panel" + android:background="@drawable/round_rect_primary" android:elevation="5dp" android:orientation="vertical" > @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_weight="1" - android:background="#00000000" + android:background="@android:color/transparent" android:fontFamily="sans-serif-condensed" android:gravity="center_horizontal" android:hint="@string/folder_hint_text" @@ -54,10 +54,10 @@ android:paddingBottom="@dimen/folder_label_padding_bottom" android:paddingTop="@dimen/folder_label_padding_top" android:singleLine="true" - android:textColor="#ff777777" + android:textColor="?android:attr/textColorTertiary" android:includeFontPadding="false" - android:textColorHighlight="#ffCCCCCC" - android:textColorHint="#ff808080" + android:textColorHighlight="?android:attr/colorControlHighlight" + android:textColorHint="?android:attr/textColorHint" android:textSize="@dimen/folder_label_text_size" /> <com.android.launcher3.pageindicators.PageIndicatorDots diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml index a8af20149..2063f3216 100644 --- a/res/layout/user_folder_icon_normalized.xml +++ b/res/layout/user_folder_icon_normalized.xml @@ -18,7 +18,7 @@ xmlns:launcher="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/quantum_panel" + android:background="@drawable/round_rect_primary" android:elevation="5dp" android:orientation="vertical" > @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_weight="1" - android:background="#00000000" + android:background="@android:color/transparent" android:fontFamily="sans-serif-condensed" android:textStyle="bold" android:gravity="center_horizontal" @@ -55,9 +55,9 @@ android:paddingBottom="@dimen/folder_label_padding_bottom" android:paddingTop="@dimen/folder_label_padding_top" android:singleLine="true" - android:textColor="#EE777777" - android:textColorHighlight="#ffCCCCCC" - android:textColorHint="#ff808080" + android:textColor="?android:attr/textColorTertiary" + android:textColorHighlight="?android:attr/colorControlHighlight" + android:textColorHint="?android:attr/textColorHint" android:textSize="@dimen/folder_label_text_size" /> <com.android.launcher3.pageindicators.PageIndicatorDots |