summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-04-04 16:35:22 -0700
committerSunny Goyal <sunnygoyal@google.com>2016-04-04 16:35:47 -0700
commit13178ac822c2f378fe93b09c1c192523b4df06c0 (patch)
tree2e8350ea2fda418833b22165f69ec081e0d45445 /res
parent19c5c5765d38656b298465f33256fd5c5b0978b5 (diff)
downloadandroid_packages_apps_Trebuchet-13178ac822c2f378fe93b09c1c192523b4df06c0.tar.gz
android_packages_apps_Trebuchet-13178ac822c2f378fe93b09c1c192523b4df06c0.tar.bz2
android_packages_apps_Trebuchet-13178ac822c2f378fe93b09c1c192523b4df06c0.zip
Adding an upper bound to all-apps width on larger devices
Change-Id: I16a0d8fb7c5023045d0a6b9e8089e0ab6a476d6d
Diffstat (limited to 'res')
-rw-r--r--res/values-sw600dp-land/dimens.xml3
-rw-r--r--res/values-sw768dp-port/dimens.xml20
-rw-r--r--res/values/dimens.xml1
3 files changed, 24 insertions, 0 deletions
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index f9ca01bee..be16c8925 100644
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -18,4 +18,7 @@
<!-- QSB -->
<dimen name="toolbar_button_vertical_padding">12dip</dimen>
<dimen name="toolbar_button_horizontal_padding">20dip</dimen>
+
+<!-- Container -->
+ <dimen name="container_max_width">736dp</dimen>
</resources>
diff --git a/res/values-sw768dp-port/dimens.xml b/res/values-sw768dp-port/dimens.xml
new file mode 100644
index 000000000..6fb2bf69a
--- /dev/null
+++ b/res/values-sw768dp-port/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+<!-- Container -->
+ <dimen name="container_max_width">736dp</dimen>
+</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7d8f6f6cf..281de08ae 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -69,6 +69,7 @@
<item name="container_margin" format="fraction" type="fraction">0%</item>
<dimen name="container_min_margin">8dp</dimen>
+ <dimen name="container_max_width">0dp</dimen>
<!-- All Apps -->
<dimen name="all_apps_button_scale_down">0dp</dimen>