summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-07-06 17:14:51 -0700
committerWinson Chung <winsonc@google.com>2015-07-06 17:46:32 -0700
commit1ae7a5018b48dba562bc18821f0f1e778192ee85 (patch)
tree8f1cf80dccd6fd709141fa0d8027f2d897ff306f /res/layout
parent1406fd80d59351e13b7be7f0997494761ffe7508 (diff)
downloadandroid_packages_apps_Trebuchet-1ae7a5018b48dba562bc18821f0f1e778192ee85.tar.gz
android_packages_apps_Trebuchet-1ae7a5018b48dba562bc18821f0f1e778192ee85.tar.bz2
android_packages_apps_Trebuchet-1ae7a5018b48dba562bc18821f0f1e778192ee85.zip
Moving prediction icons back into recycler view.
- Fixes two accessibility issues with the prediction bar being separate from the rest of the list of icons related to scrolling and switch access. Bug: 21725276 Change-Id: Ibc48e5028cace9a77000e6646b951f021910465d
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/all_apps_container.xml12
-rw-r--r--res/layout/all_apps_prediction_bar_icon.xml5
2 files changed, 3 insertions, 14 deletions
diff --git a/res/layout/all_apps_container.xml b/res/layout/all_apps_container.xml
index 0221a568b..626edafab 100644
--- a/res/layout/all_apps_container.xml
+++ b/res/layout/all_apps_container.xml
@@ -35,16 +35,4 @@
android:focusable="true"
android:descendantFocusability="afterDescendants" />
- <LinearLayout
- android:id="@+id/prediction_bar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/all_apps_prediction_bar_top_padding"
- android:paddingBottom="@dimen/all_apps_prediction_bar_bottom_padding"
- android:orientation="horizontal"
- android:focusable="true"
- android:descendantFocusability="afterDescendants"
- android:visibility="invisible" >
- </LinearLayout>
-
</com.android.launcher3.allapps.AllAppsRecyclerViewContainerView> \ No newline at end of file
diff --git a/res/layout/all_apps_prediction_bar_icon.xml b/res/layout/all_apps_prediction_bar_icon.xml
index 5f63f6bdb..341d8ef4f 100644
--- a/res/layout/all_apps_prediction_bar_icon.xml
+++ b/res/layout/all_apps_prediction_bar_icon.xml
@@ -18,10 +18,11 @@
xmlns:launcher="http://schemas.android.com/apk/res-auto"
style="@style/Icon.AllApps"
android:id="@+id/icon"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:layout_weight="1"
+ android:paddingTop="@dimen/all_apps_prediction_icon_top_padding"
+ android:paddingBottom="@dimen/all_apps_prediction_icon_bottom_padding"
android:focusable="true"
android:background="@drawable/focusable_view_bg"
launcher:iconDisplay="all_apps" />