summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-01-10 23:25:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-01-10 23:25:26 +0000
commitb5d047ca14698fff562a12f1ef012134b1a5a7ee (patch)
treebd512fa951caa15245ccc772091dde394d2da39a /res
parentb60778114f286356bab963c0a5190fbef3e04bd4 (diff)
parent07b6929cd94e6d55fb660f85baf1df840de48f46 (diff)
downloadandroid_packages_apps_Trebuchet-b5d047ca14698fff562a12f1ef012134b1a5a7ee.tar.gz
android_packages_apps_Trebuchet-b5d047ca14698fff562a12f1ef012134b1a5a7ee.tar.bz2
android_packages_apps_Trebuchet-b5d047ca14698fff562a12f1ef012134b1a5a7ee.zip
Merge "Removing layout handling in DeviceProfile and moving it to individual views" into ub-launcher3-master
Diffstat (limited to 'res')
-rw-r--r--res/layout-land/launcher.xml4
-rw-r--r--res/layout-port/launcher.xml3
-rw-r--r--res/layout-sw720dp/launcher.xml3
-rw-r--r--res/values/config.xml4
4 files changed, 3 insertions, 11 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 3422a9849..9bd3c672b 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -63,9 +63,7 @@
<include layout="@layout/hotseat"
android:id="@+id/hotseat"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="right"
- launcher:layout_ignoreInsets="true" />
+ android:layout_height="match_parent" />
<include
android:id="@+id/drop_target_bar"
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 53743e804..b678398f9 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -57,8 +57,7 @@
<include layout="@layout/hotseat"
android:id="@+id/hotseat"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- launcher:layout_ignoreInsets="true" />
+ android:layout_height="match_parent" />
<!-- Keep these behind the workspace so that they are not visible when
we go into AllApps -->
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 047577ba7..7e6c659ad 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -56,8 +56,7 @@
<include layout="@layout/hotseat"
android:id="@+id/hotseat"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- launcher:layout_ignoreInsets="true" />
+ android:layout_height="match_parent" />
<include
android:id="@+id/drop_target_bar"
diff --git a/res/values/config.xml b/res/values/config.xml
index 0ff0d758b..f48d47406 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -47,10 +47,6 @@
<!-- Out of 100, the percent to shrink the workspace during spring loaded mode. -->
<integer name="config_workspaceSpringLoadShrinkPercentage">90</integer>
- <!-- This constant stores the ratio of the all apps button drawable which
- is used for internal (baked-in) padding -->
- <integer name="config_allAppsButtonPaddingPercent">17</integer>
-
<!-- The duration of the animation from search hint to text entry -->
<integer name="config_searchHintAnimationDuration">50</integer>