diff options
author | Winson Chung <winsonc@google.com> | 2015-07-06 17:14:51 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2015-07-06 17:46:32 -0700 |
commit | 1ae7a5018b48dba562bc18821f0f1e778192ee85 (patch) | |
tree | 8f1cf80dccd6fd709141fa0d8027f2d897ff306f /res | |
parent | 1406fd80d59351e13b7be7f0997494761ffe7508 (diff) | |
download | android_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')
-rw-r--r-- | res/layout/all_apps_container.xml | 12 | ||||
-rw-r--r-- | res/layout/all_apps_prediction_bar_icon.xml | 5 | ||||
-rw-r--r-- | res/values/dimens.xml | 6 |
3 files changed, 6 insertions, 17 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" /> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 122b831b4..589d69666 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -70,9 +70,9 @@ <dimen name="all_apps_search_bar_prediction_bar_padding">8dp</dimen> <dimen name="all_apps_icon_top_bottom_padding">8dp</dimen> <dimen name="all_apps_icon_width_gap">24dp</dimen> - <!-- The top padding should account for the general all_apps_list_top_bottom_padding --> - <dimen name="all_apps_prediction_bar_top_padding">0dp</dimen> - <dimen name="all_apps_prediction_bar_bottom_padding">16dp</dimen> + <!-- The top padding should account for the existing all_apps_list_top_bottom_padding --> + <dimen name="all_apps_prediction_icon_top_padding">8dp</dimen> + <dimen name="all_apps_prediction_icon_bottom_padding">18dp</dimen> <dimen name="all_apps_list_top_bottom_padding">8dp</dimen> <!-- Widget tray --> |