diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/launcher.xml | 4 | ||||
| -rw-r--r-- | res/layout-land/qsb.xml (renamed from res/layout-land/search_bar.xml) | 0 | ||||
| -rw-r--r-- | res/layout-port/launcher.xml | 4 | ||||
| -rw-r--r-- | res/layout-port/qsb.xml (renamed from res/layout-port/search_bar.xml) | 1 | ||||
| -rw-r--r-- | res/layout-sw720dp/launcher.xml | 4 | ||||
| -rw-r--r-- | res/layout-sw720dp/qsb.xml (renamed from res/layout-sw720dp/search_bar.xml) | 3 | ||||
| -rw-r--r-- | res/layout/search_drop_target_bar.xml (renamed from res/layout/qsb_bar.xml) | 3 | ||||
| -rw-r--r-- | res/values-land/styles.xml | 4 | ||||
| -rw-r--r-- | res/values-sw720dp/styles.xml | 5 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 |
10 files changed, 9 insertions, 23 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index abb19f4bb..2880c18bf 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -45,8 +45,8 @@ android:layout_gravity="end" /> <include - android:id="@+id/qsb_bar" - layout="@layout/qsb_bar" /> + android:id="@+id/search_drop_target_bar" + layout="@layout/search_drop_target_bar" /> <include layout="@layout/overview_panel" android:id="@+id/overview_panel" diff --git a/res/layout-land/search_bar.xml b/res/layout-land/qsb.xml index d56e380d0..d56e380d0 100644 --- a/res/layout-land/search_bar.xml +++ b/res/layout-land/qsb.xml diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 74005348c..574b73e46 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -57,8 +57,8 @@ android:layout_gravity="center_horizontal" /> <include - android:id="@+id/qsb_bar" - layout="@layout/qsb_bar" /> + android:id="@+id/search_drop_target_bar" + layout="@layout/search_drop_target_bar" /> <!-- The Workspace cling must appear under the AppsCustomizePagedView below to ensure that it is still visible during the transition to AllApps and doesn't overlay on diff --git a/res/layout-port/search_bar.xml b/res/layout-port/qsb.xml index e993f7847..4c9963dfb 100644 --- a/res/layout-port/search_bar.xml +++ b/res/layout-port/qsb.xml @@ -16,7 +16,6 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - style="@style/SearchDropTargetBar" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/search_frame"> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 7dac2718c..64b0fa0d6 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -45,8 +45,8 @@ android:layout_height="match_parent" /> <include - android:id="@+id/qsb_bar" - layout="@layout/qsb_bar" /> + android:id="@+id/search_drop_target_bar" + layout="@layout/search_drop_target_bar" /> <include layout="@layout/overview_panel" android:id="@+id/overview_panel" diff --git a/res/layout-sw720dp/search_bar.xml b/res/layout-sw720dp/qsb.xml index 3276f3f17..4c9963dfb 100644 --- a/res/layout-sw720dp/search_bar.xml +++ b/res/layout-sw720dp/qsb.xml @@ -16,7 +16,8 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - style="@style/SearchDropTargetBar" + android:layout_width="match_parent" + android:layout_height="match_parent" android:background="@drawable/search_frame"> <!-- Global search icon --> <com.android.launcher3.HolographicLinearLayout diff --git a/res/layout/qsb_bar.xml b/res/layout/search_drop_target_bar.xml index 030acf6be..2d51b93ab 100644 --- a/res/layout/qsb_bar.xml +++ b/res/layout/search_drop_target_bar.xml @@ -15,14 +15,13 @@ --> <com.android.launcher3.SearchDropTargetBar xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/QSBBar" + android:orientation="horizontal" android:focusable="false" android:layout_width="match_parent" android:layout_height="match_parent"> <!-- Drag specific targets container --> <LinearLayout - style="@style/SearchDropTargetBar" android:id="@+id/drag_target_bar" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml index fa3801d60..87a744455 100644 --- a/res/values-land/styles.xml +++ b/res/values-land/styles.xml @@ -19,10 +19,6 @@ <resources> <!-- Search Bar --> - <style name="QSBBar"> - </style> - <style name="SearchDropTargetBar"> - </style> <style name="SearchButton"> </style> <style name="DropTargetButtonContainer"> diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml index b3afae399..507af1d16 100644 --- a/res/values-sw720dp/styles.xml +++ b/res/values-sw720dp/styles.xml @@ -58,11 +58,6 @@ <item name="android:maxWidth">240dp</item> </style> - <!-- QSB Search / Drop Target bar --> - <style name="QSBBar"> - </style> - <style name="SearchDropTargetBar"> - </style> <style name="SearchButton"> </style> <style name="DropTargetButtonContainer"> diff --git a/res/values/styles.xml b/res/values/styles.xml index c9834f8b5..c18dccbab 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -91,10 +91,6 @@ <item name="android:shadowRadius">4.0</item> <item name="android:shadowColor">#FF000000</item> </style> - - <style name="QSBBar"> - <item name="android:orientation">horizontal</item> - </style> <style name="SearchDropTargetBar"> </style> <style name="SearchButton"> |