diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-21 17:01:26 -0700 |
---|---|---|
committer | Ed Heyl <edheyl@google.com> | 2015-07-22 11:31:04 -0700 |
commit | e612775922ec9f8cc4e5cb976bc62b3312a3de0e (patch) | |
tree | 96beaf07307486f6491f022da63ebe381765d1a8 /res/values-sw600dp | |
parent | a83129f0bc778fd1ccd799bd8cfa40270f632e1d (diff) | |
download | android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.gz android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.bz2 android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.zip |
resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
b/22609402
Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
Diffstat (limited to 'res/values-sw600dp')
-rw-r--r-- | res/values-sw600dp/config.xml | 4 | ||||
-rw-r--r-- | res/values-sw600dp/dimens.xml | 12 | ||||
-rw-r--r-- | res/values-sw600dp/styles.xml | 21 |
3 files changed, 4 insertions, 33 deletions
diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml index 15d5725d1..a7345a705 100644 --- a/res/values-sw600dp/config.xml +++ b/res/values-sw600dp/config.xml @@ -4,8 +4,4 @@ <!-- DragController --> <integer name="config_flingToDeleteMinVelocity">-1000</integer> - - <!-- Camera distance for the overscroll effect. We use a higher value here because the - workspace screens run nearly flush to the edge of the screen--> - <integer name="config_cameraDistance">14000</integer> </resources> diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index 28679be2e..2651fbb3f 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -15,14 +15,10 @@ --> <resources> - <dimen name="app_icon_size">64dp</dimen> - -<!-- AppsCustomize --> - <dimen name="apps_customize_tab_bar_height">60dp</dimen> - <dimen name="apps_customize_tab_bar_margin_top">8dp</dimen> - <dimen name="app_widget_preview_label_margin_top">8dp</dimen> - <dimen name="app_widget_preview_label_margin_left">@dimen/app_widget_preview_padding_left</dimen> - <dimen name="app_widget_preview_label_margin_right">@dimen/app_widget_preview_padding_right</dimen> +<!-- All Apps --> + <dimen name="all_apps_grid_view_start_margin">0dp</dimen> + <dimen name="all_apps_grid_section_text_size">26sp</dimen> + <dimen name="all_apps_icon_top_bottom_padding">12dp</dimen> <!-- Cling --> <dimen name="cling_migration_logo_height">400dp</dimen> diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml deleted file mode 100644 index bcbbafdbb..000000000 --- a/res/values-sw600dp/styles.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -* Copyright (C) 2012 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> -</resources> |