diff options
| author | nebkat <nebkat@teamhacksung.org> | 2012-02-26 21:53:56 +0000 |
|---|---|---|
| committer | nebkat <nebkat@teamhacksung.org> | 2012-12-24 10:09:02 +0000 |
| commit | c6f8c8c92e73efb0aa675a89ca4eded9ebd77615 (patch) | |
| tree | 0c43ecb0d6d61a200404de1d541b03b81e607d0d /res/layout-port | |
| parent | 8ef4f37b141f5e48bb5a63fc401d6ea9fbd9a8b1 (diff) | |
| download | android_packages_apps_Trebuchet-c6f8c8c92e73efb0aa675a89ca4eded9ebd77615.tar.gz android_packages_apps_Trebuchet-c6f8c8c92e73efb0aa675a89ca4eded9ebd77615.tar.bz2 android_packages_apps_Trebuchet-c6f8c8c92e73efb0aa675a89ca4eded9ebd77615.zip | |
Hotseat: Multiple Pages
Conflicts:
res/layout-land/hotseat.xml
res/layout-port/hotseat.xml
res/values/strings.xml
res/xml/default_workspace.xml
res/xml/preferences.xml
src/com/beansoft/launcher/preference/PreferencesProvider.java
src/com/cyanogenmod/trebuchet/Hotseat.java
src/com/cyanogenmod/trebuchet/PagedView.java
src/com/cyanogenmod/trebuchet/Workspace.java
Change-Id: I958b105451160841d5d7d345164dcb2dec4f9404
Diffstat (limited to 'res/layout-port')
| -rw-r--r-- | res/layout-port/hotseat.xml | 18 | ||||
| -rw-r--r-- | res/layout-port/hotseat_page.xml | 33 |
2 files changed, 34 insertions, 17 deletions
diff --git a/res/layout-port/hotseat.xml b/res/layout-port/hotseat.xml index 0420469eb..3abd13316 100644 --- a/res/layout-port/hotseat.xml +++ b/res/layout-port/hotseat.xml @@ -17,20 +17,4 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet" launcher:cellCountX="@integer/hotseat_cell_count" - launcher:cellCountY="1"> - <com.cyanogenmod.trebuchet.CellLayout - android:id="@+id/layout" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="center" - android:paddingTop="@dimen/button_bar_height_top_padding" - android:paddingBottom="@dimen/button_bar_height_bottom_padding" - android:paddingLeft="@dimen/button_bar_width_left_padding" - android:paddingRight="@dimen/button_bar_width_right_padding" - - launcher:cellWidth="@dimen/hotseat_cell_width" - launcher:cellHeight="@dimen/hotseat_cell_height" - launcher:widthGap="@dimen/hotseat_width_gap" - launcher:heightGap="@dimen/hotseat_height_gap" - launcher:maxGap="@dimen/workspace_max_gap" /> -</com.cyanogenmod.trebuchet.Hotseat> + launcher:cellCountY="1" /> diff --git a/res/layout-port/hotseat_page.xml b/res/layout-port/hotseat_page.xml new file mode 100644 index 000000000..9c1e87c11 --- /dev/null +++ b/res/layout-port/hotseat_page.xml @@ -0,0 +1,33 @@ +<?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.cyanogenmod.trebuchet.CellLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet" + + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="center" + android:paddingTop="@dimen/button_bar_height_top_padding" + android:paddingBottom="@dimen/button_bar_height_bottom_padding" + android:paddingLeft="@dimen/button_bar_width_left_padding" + android:paddingRight="@dimen/button_bar_width_right_padding" + + launcher:cellWidth="@dimen/hotseat_cell_width" + launcher:cellHeight="@dimen/hotseat_cell_height" + launcher:widthGap="@dimen/hotseat_width_gap" + launcher:heightGap="@dimen/hotseat_height_gap" + launcher:maxGap="@dimen/workspace_max_gap" /> |