diff options
author | Steve Kondik <shade@chemlab.org> | 2012-11-05 12:14:58 -0800 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2012-11-05 12:14:58 -0800 |
commit | f5baac88b85efa794ae7909f784538f379dd36f2 (patch) | |
tree | c55b82edcaae558d71fc12f856bb93d9ae8ce8dc /res | |
parent | 5bf25aecb90bd49ca3a8affea877e570b75baed6 (diff) | |
parent | 4124016ae5c8174aa53433894b896604ffa52c67 (diff) | |
download | android_packages_apps_Trebuchet-f5baac88b85efa794ae7909f784538f379dd36f2.tar.gz android_packages_apps_Trebuchet-f5baac88b85efa794ae7909f784538f379dd36f2.tar.bz2 android_packages_apps_Trebuchet-f5baac88b85efa794ae7909f784538f379dd36f2.zip |
Merge branch 'master' of https://android.googlesource.com/platform/packages/apps/Launcher2 into aosp
Conflicts:
res/layout-land/drop_target_bar.xml
src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java
src/com/cyanogenmod/trebuchet/Launcher.java
src/com/cyanogenmod/trebuchet/LauncherModel.java
Change-Id: I5aa702e333da27645b0d765b233f4d8a89991cb9
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/drop_target_bar.xml | 37 | ||||
-rw-r--r-- | res/layout/drop_target_bar.xml (renamed from res/layout-port/drop_target_bar.xml) | 0 | ||||
-rw-r--r-- | res/values-sw600dp-land/dimens.xml | 1 | ||||
-rw-r--r-- | res/values-sw600dp/config.xml | 3 | ||||
-rw-r--r-- | res/values-sw720dp/config.xml | 1 |
5 files changed, 3 insertions, 39 deletions
diff --git a/res/layout-land/drop_target_bar.xml b/res/layout-land/drop_target_bar.xml deleted file mode 100644 index f3fb4001a..000000000 --- a/res/layout-land/drop_target_bar.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - <FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/DropTargetButtonContainer" - android:layout_weight="1"> - <!-- Delete target --> - <com.cyanogenmod.trebuchet.DeleteDropTarget - style="@style/DropTargetButton" - android:id="@+id/delete_target_text" - android:drawableTop="@drawable/remove_target_selector" /> - </FrameLayout> - <FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/DropTargetButtonContainer" - android:layout_weight="1"> - <!-- Info target --> - <com.cyanogenmod.trebuchet.InfoDropTarget - style="@style/DropTargetButton" - android:id="@+id/info_target_text" - android:drawableTop="@drawable/info_target_selector" /> - </FrameLayout> -</merge>
\ No newline at end of file diff --git a/res/layout-port/drop_target_bar.xml b/res/layout/drop_target_bar.xml index dbd1a295d..dbd1a295d 100644 --- a/res/layout-port/drop_target_bar.xml +++ b/res/layout/drop_target_bar.xml diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml index 109372950..4bf751939 100644 --- a/res/values-sw600dp-land/dimens.xml +++ b/res/values-sw600dp-land/dimens.xml @@ -31,6 +31,7 @@ <!-- QSB --> <dimen name="qsb_bar_height">82dp</dimen> + <dimen name="toolbar_button_horizontal_padding">20dip</dimen> <!-- Workspace --> <dimen name="workspace_divider_padding_top">12dp</dimen> diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml index 02789deb8..b67b9c1c0 100644 --- a/res/values-sw600dp/config.xml +++ b/res/values-sw600dp/config.xml @@ -1,9 +1,10 @@ <resources> + <bool name="allow_rotation">true</bool> + <integer name="cell_count_x">6</integer> <integer name="cell_count_y">6</integer> <integer name="hotseat_cell_count">7</integer> <integer name="hotseat_all_apps_index">3</integer> - <!-- DragController --> <integer name="config_flingToDeleteMinVelocity">-1000</integer> diff --git a/res/values-sw720dp/config.xml b/res/values-sw720dp/config.xml index 97a6e9f68..cdca8050e 100644 --- a/res/values-sw720dp/config.xml +++ b/res/values-sw720dp/config.xml @@ -1,7 +1,6 @@ <resources> <bool name="config_largeHeap">true</bool> <bool name="is_large_screen">true</bool> - <bool name="allow_rotation">true</bool> <!-- AllApps/Customize/AppsCustomize --> <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. --> |