summaryrefslogtreecommitdiffstats
path: root/res/layout-sw720dp
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2012-04-26 14:56:12 -0700
committerAdam Cohen <adamcohen@google.com>2012-04-26 15:48:08 -0700
commitd5f8c3479a630b12bfa3fbfaedf160f9a7194b00 (patch)
tree3e952ae9a43570ab3db62ede2dedc45e99715f7c /res/layout-sw720dp
parent58039d634cb36da561501ccfafc266e1d83d0b4f (diff)
downloadandroid_packages_apps_Trebuchet-d5f8c3479a630b12bfa3fbfaedf160f9a7194b00.zip
android_packages_apps_Trebuchet-d5f8c3479a630b12bfa3fbfaedf160f9a7194b00.tar.gz
android_packages_apps_Trebuchet-d5f8c3479a630b12bfa3fbfaedf160f9a7194b00.tar.bz2
Refactoring padding dimens for CellLayouts and Workspace
Change-Id: Ib354b822588717b7bb81b4dcb14c834e5b8d4892
Diffstat (limited to 'res/layout-sw720dp')
-rw-r--r--res/layout-sw720dp/workspace.xml5
-rw-r--r--res/layout-sw720dp/workspace_screen.xml33
2 files changed, 4 insertions, 34 deletions
diff --git a/res/layout-sw720dp/workspace.xml b/res/layout-sw720dp/workspace.xml
index 327afaf..5658a4b 100644
--- a/res/layout-sw720dp/workspace.xml
+++ b/res/layout-sw720dp/workspace.xml
@@ -19,7 +19,10 @@
<com.android.launcher2.Workspace
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
- android:paddingTop="@dimen/workspace_content_large_only_top_margin"
+ android:paddingLeft="@dimen/workspace_left_padding"
+ android:paddingRight="@dimen/workspace_right_padding"
+ android:paddingTop="@dimen/workspace_top_padding"
+ android:paddingBottom="@dimen/workspace_bottom_padding"
launcher:defaultScreen="2"
launcher:pageSpacing="@dimen/workspace_page_spacing">
<include android:id="@+id/cell1" layout="@layout/workspace_screen" />
diff --git a/res/layout-sw720dp/workspace_screen.xml b/res/layout-sw720dp/workspace_screen.xml
deleted file mode 100644
index 52f9def..0000000
--- a/res/layout-sw720dp/workspace_screen.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<com.android.launcher2.CellLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="@dimen/workspace_left_padding"
- android:paddingRight="@dimen/workspace_right_padding"
- android:paddingTop="@dimen/workspace_top_padding"
- android:paddingBottom="@dimen/workspace_bottom_padding"
- android:hapticFeedbackEnabled="false"
-
- launcher:cellWidth="@dimen/workspace_cell_width"
- launcher:cellHeight="@dimen/workspace_cell_height"
- launcher:widthGap="@dimen/workspace_width_gap"
- launcher:heightGap="@dimen/workspace_height_gap"
- launcher:maxGap="@dimen/workspace_max_gap" />