summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-06-23 18:59:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-23 18:59:12 +0000
commit6828cbb7515eeaccd96f481232e252b9bc47d512 (patch)
treea9a2f94609945c9f7751d32b363787fe6a34b871 /res/layout
parent9314b7c01d932093c730dd39b9b9842d1a56efdb (diff)
parentb28c4fcf351dc9f44f69253b227880758f6b460c (diff)
downloadandroid_packages_apps_Trebuchet-6828cbb7515eeaccd96f481232e252b9bc47d512.tar.gz
android_packages_apps_Trebuchet-6828cbb7515eeaccd96f481232e252b9bc47d512.tar.bz2
android_packages_apps_Trebuchet-6828cbb7515eeaccd96f481232e252b9bc47d512.zip
Merge "Landscape grid changes for Workspace/All Apps." into ub-launcher3-dorval-polish
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/all_apps.xml4
-rw-r--r--res/layout/page_indicator.xml2
2 files changed, 2 insertions, 4 deletions
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index ff605f4bb..a3c253537 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -53,9 +53,7 @@
android:clipToPadding="false"
android:overScrollMode="never"
android:descendantFocusability="afterDescendants"
- android:focusable="true"
- android:paddingStart="@dimen/dynamic_grid_edge_margin"
- android:paddingEnd="@dimen/dynamic_grid_edge_margin" />
+ android:focusable="true" />
<!-- Fast scroller popup -->
<TextView
diff --git a/res/layout/page_indicator.xml b/res/layout/page_indicator.xml
index c5ef6e0a8..14ff2bd28 100644
--- a/res/layout/page_indicator.xml
+++ b/res/layout/page_indicator.xml
@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:theme="@style/HomeScreenElementTheme"
android:layout_width="match_parent"
- android:layout_height="@dimen/dynamic_grid_page_indicator_height">
+ android:layout_height="@dimen/dynamic_grid_page_indicator_size">
<ImageView
android:id="@+id/all_apps_handle"
android:layout_width="48dp"