summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/apps_customize_application.xml21
-rw-r--r--res/layout/apps_empty_view.xml2
-rw-r--r--res/layout/apps_grid_row_icon_view.xml7
-rw-r--r--res/layout/apps_list_row_icon_view.xml29
-rw-r--r--res/layout/apps_list_row_view.xml33
-rw-r--r--res/layout/apps_list_view.xml7
-rw-r--r--res/layout/user_folder.xml2
-rw-r--r--res/layout/widget_cell.xml14
-rw-r--r--res/layout/widgets_list_row_view.xml86
9 files changed, 54 insertions, 147 deletions
diff --git a/res/layout/apps_customize_application.xml b/res/layout/apps_customize_application.xml
deleted file mode 100644
index c56cdf3d2..000000000
--- a/res/layout/apps_customize_application.xml
+++ /dev/null
@@ -1,21 +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.
--->
-
-<com.android.launcher3.BubbleTextView
- xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/WorkspaceIcon.AppsCustomize"
- android:id="@+id/application_icon"
- android:focusable="true" />
diff --git a/res/layout/apps_empty_view.xml b/res/layout/apps_empty_view.xml
index 8408077a2..e4c4e2e8c 100644
--- a/res/layout/apps_empty_view.xml
+++ b/res/layout/apps_empty_view.xml
@@ -18,7 +18,7 @@
android:id="@+id/empty_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
+ android:gravity="center"
android:paddingTop="24dp"
android:paddingBottom="24dp"
android:paddingRight="@dimen/apps_grid_view_start_margin"
diff --git a/res/layout/apps_grid_row_icon_view.xml b/res/layout/apps_grid_row_icon_view.xml
index 81e74b985..acb3da334 100644
--- a/res/layout/apps_grid_row_icon_view.xml
+++ b/res/layout/apps_grid_row_icon_view.xml
@@ -21,9 +21,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|center_vertical"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"
+ android:paddingTop="@dimen/apps_icon_top_bottom_padding"
+ android:paddingBottom="@dimen/apps_icon_top_bottom_padding"
android:focusable="true"
android:background="@drawable/focusable_view_bg"
- launcher:deferShadowGeneration="true" />
+ launcher:deferShadowGeneration="true"
+ launcher:iconDisplay="all_apps" />
diff --git a/res/layout/apps_list_row_icon_view.xml b/res/layout/apps_list_row_icon_view.xml
deleted file mode 100644
index 867dbdc99..000000000
--- a/res/layout/apps_list_row_icon_view.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<com.android.launcher3.BubbleTextView
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res-auto"
- style="@style/WorkspaceIcon.AppsCustomize"
- android:id="@+id/application_icon"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:focusable="true"
- android:background="@drawable/focusable_view_bg"
- launcher:iconPaddingOverride="24dp"
- launcher:textSizeOverride="16dp"
- launcher:layoutHorizontal="true"
- launcher:deferShadowGeneration="true" />
diff --git a/res/layout/apps_list_row_view.xml b/res/layout/apps_list_row_view.xml
deleted file mode 100644
index e80285b95..000000000
--- a/res/layout/apps_list_row_view.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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:layout_width="match_parent"
- android:layout_height="@dimen/apps_view_row_height"
- android:orientation="horizontal"
- android:focusable="true"
- android:background="@drawable/focusable_view_bg"
- android:descendantFocusability="afterDescendants">
- <TextView
- android:id="@+id/section"
- android:layout_width="64dp"
- android:layout_height="match_parent"
- android:paddingLeft="16dp"
- android:gravity="start|center_vertical"
- android:textColor="@color/apps_view_section_text_color"
- android:textSize="@dimen/apps_view_section_text_size"
- android:focusable="false" />
-</LinearLayout>
diff --git a/res/layout/apps_list_view.xml b/res/layout/apps_list_view.xml
index e29cac5e1..ddcb639b8 100644
--- a/res/layout/apps_list_view.xml
+++ b/res/layout/apps_list_view.xml
@@ -25,7 +25,7 @@
<FrameLayout
android:id="@+id/header"
android:layout_width="match_parent"
- android:layout_height="52dp"
+ android:layout_height="@dimen/apps_search_bar_height"
android:orientation="horizontal"
android:background="@drawable/apps_search_bg">
<LinearLayout
@@ -39,11 +39,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
+ android:layout_marginStart="4dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:contentDescription="@string/all_apps_button_label"
android:src="@drawable/ic_arrow_back_grey" />
- <EditText
+ <com.android.launcher3.AppsContainerSearchEditTextView
android:id="@+id/app_search_box"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -59,6 +60,7 @@
android:textColor="#4c4c4c"
android:textColorHint="#9c9c9c"
android:imeOptions="actionDone|flagNoExtractUi"
+ android:focusableInTouchMode="true"
android:background="@android:color/transparent" />
</LinearLayout>
<ImageView
@@ -66,6 +68,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
+ android:layout_marginEnd="6dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:contentDescription="@string/apps_view_search_bar_hint"
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index 099da32e6..ab349179c 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -19,7 +19,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:elevation="5dp"
android:orientation="vertical" >
<FrameLayout
diff --git a/res/layout/widget_cell.xml b/res/layout/widget_cell.xml
index ab23b842e..a85f0aa16 100644
--- a/res/layout/widget_cell.xml
+++ b/res/layout/widget_cell.xml
@@ -16,13 +16,13 @@
<com.android.launcher3.widget.WidgetCell
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res-auto"
- android:layout_width="@dimen/widget_preview_container_width"
- android:layout_height="@dimen/widget_cell_height"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_weight="1"
- android:layout_marginRight="@dimen/widget_row_divider"
android:orientation="vertical"
+ android:focusable="true"
android:background="@color/widgets_cell_color"
- android:focusable="true">
+ android:gravity="center_horizontal">
<LinearLayout
android:layout_width="wrap_content"
@@ -43,7 +43,6 @@
android:singleLine="true"
android:ellipsize="end"
android:fadingEdge="horizontal"
-
android:textColor="@color/widgets_view_item_text_color"
android:textSize="16sp"
android:textAlignment="viewStart"
@@ -73,9 +72,8 @@
<com.android.launcher3.widget.WidgetImageView
android:id="@+id/widget_preview"
style="@style/WidgetImageView"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:scaleType="matrix" />
-
-</com.android.launcher3.widget.WidgetCell>
+</com.android.launcher3.widget.WidgetCell> \ No newline at end of file
diff --git a/res/layout/widgets_list_row_view.xml b/res/layout/widgets_list_row_view.xml
index 12f6401e4..2cbdb5cff 100644
--- a/res/layout/widgets_list_row_view.xml
+++ b/res/layout/widgets_list_row_view.xml
@@ -15,6 +15,7 @@
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:launcher="http://schemas.android.com/apk/res-auto"
android:id="@+id/widgets_cell_list_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -23,56 +24,43 @@
android:descendantFocusability="afterDescendants">
<!-- Section info -->
- <LinearLayout
+
+ <com.android.launcher3.BubbleTextView
+ android:id="@+id/section"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
+ android:layout_height="@dimen/widget_section_height"
+ android:background="@color/widget_text_panel"
+ android:drawablePadding="@dimen/widget_section_horizontal_padding"
+ android:ellipsize="end"
android:focusable="true"
- android:descendantFocusability="afterDescendants">
- <ImageView
- android:id="@+id/section_image"
- android:layout_height="@dimen/widget_section_height"
- android:layout_width="@dimen/widget_section_icon_width"
- android:paddingLeft="@dimen/widget_section_icon_horizontal_padding"
- android:paddingRight="@dimen/widget_section_icon_horizontal_padding"
- android:paddingTop="@dimen/widget_section_icon_vertical_padding"
- android:paddingBottom="@dimen/widget_section_icon_vertical_padding"
- android:background="@color/widget_text_panel"
- />
- <TextView
- android:id="@+id/section"
- android:layout_width="match_parent"
- android:layout_height="@dimen/widget_section_height"
- android:paddingEnd="@dimen/widget_preview_label_horizontal_padding"
- android:paddingRight="@dimen/widget_preview_label_horizontal_padding"
- android:singleLine="true"
- android:ellipsize="end"
- android:gravity="start|center_vertical"
- android:textColor="@color/widgets_view_section_text_color"
- android:background="@color/widget_text_panel"
- android:textSize="20sp"
- android:focusable="false" />
- </LinearLayout>
+ android:gravity="start|center_vertical"
+ android:importantForAccessibility="no"
+ android:paddingBottom="@dimen/widget_section_vertical_padding"
+ android:paddingLeft="@dimen/widget_section_horizontal_padding"
+ android:paddingRight="@dimen/widget_section_horizontal_padding"
+ android:paddingTop="@dimen/widget_section_vertical_padding"
+ android:singleLine="true"
+ android:textColor="@color/widgets_view_section_text_color"
+ android:textSize="20sp"
+ launcher:customShadows="false"
+ launcher:deferShadowGeneration="true"
+ launcher:iconDisplay="widget_section"
+ launcher:iconSizeOverride="@dimen/widget_section_icon_size"
+ launcher:layoutHorizontal="true" />
- <!-- Widget list -->
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="end"
- android:background="@color/widgets_cell_color"
- >
- <HorizontalScrollView
- android:id="@+id/widgets_scroll_container"
- android:layout_width="match_parent"
- android:layout_height="@dimen/widget_cell_height"
- android:layout_marginLeft="@dimen/widget_row_padding"
- android:scrollbars="none" >
- <LinearLayout
- android:id="@+id/widgets_cell_list"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:background="@color/widget_text_panel"/>
- </HorizontalScrollView>
- </RelativeLayout>
+ <HorizontalScrollView
+ android:id="@+id/widgets_scroll_container"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:scrollbars="none" >
+ <LinearLayout
+ android:id="@+id/widgets_cell_list"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/widget_row_padding"
+ android:orientation="horizontal"
+ android:divider="@drawable/widgets_row_divider"
+ android:showDividers="middle"
+ android:background="@color/widgets_cell_color"/>
+ </HorizontalScrollView>
</LinearLayout>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 09:10:36 +0000