summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2010-09-03 14:15:02 -0700
committerMichael Jurka <mikejurka@google.com>2010-09-13 15:16:10 -0700
commit5f1c509d5ad1954a7e38e77db4d5f27c7345fd39 (patch)
tree94f434edef0031fe54ae4fa2bbfee518241e982f /res
parent686e136f5a1d4e1bb3a69b9b2634fc51221a3245 (diff)
downloadandroid_packages_apps_Trebuchet-5f1c509d5ad1954a7e38e77db4d5f27c7345fd39.tar.gz
android_packages_apps_Trebuchet-5f1c509d5ad1954a7e38e77db4d5f27c7345fd39.tar.bz2
android_packages_apps_Trebuchet-5f1c509d5ad1954a7e38e77db4d5f27c7345fd39.zip
supporting swipable home screens on xlarge devices
- icons and widgets on home screens can be "dimmed" - celllayout no longer renders a dimmed version of itself, but instead its children make dimmed versions of themselves - celllayout no longer always takes up full size of workspace, in landscape mode neighboring screens (celllayouts) are visible - on xlarge devices, in landscape mode side screens are "dimmed" - moved holographic outline helper to its own file - fixed bug where mini-screens were still able to scroll left/right Change-Id: I9e85ab4147edfae1e7525c3d11d42be3fabf4f6d
Diffstat (limited to 'res')
-rw-r--r--res/layout-land/application.xml4
-rw-r--r--res/layout-port/application.xml2
-rw-r--r--res/layout-xlarge-land/workspace_screen.xml8
-rw-r--r--res/layout-xlarge-port/workspace_screen.xml8
-rw-r--r--res/values-xlarge/colors.xml1
5 files changed, 12 insertions, 11 deletions
diff --git a/res/layout-land/application.xml b/res/layout-land/application.xml
index 6de565878..846c81c1d 100644
--- a/res/layout-land/application.xml
+++ b/res/layout-land/application.xml
@@ -14,5 +14,5 @@
limitations under the License.
-->
-<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/WorkspaceIcon.Landscape" />
+<com.android.launcher2.DimmableBubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/WorkspaceIcon.Landscape" />
diff --git a/res/layout-port/application.xml b/res/layout-port/application.xml
index f904a661f..ec6697658 100644
--- a/res/layout-port/application.xml
+++ b/res/layout-port/application.xml
@@ -14,5 +14,5 @@
limitations under the License.
-->
-<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.DimmableBubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/WorkspaceIcon.Portrait" />
diff --git a/res/layout-xlarge-land/workspace_screen.xml b/res/layout-xlarge-land/workspace_screen.xml
index 15fc3b19d..f35844371 100644
--- a/res/layout-xlarge-land/workspace_screen.xml
+++ b/res/layout-xlarge-land/workspace_screen.xml
@@ -18,13 +18,13 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:hapticFeedbackEnabled="false"
launcher:cellWidth="@dimen/workspace_cell_width"
launcher:cellHeight="@dimen/workspace_cell_height"
launcher:yAxisStartPadding="40dip"
launcher:yAxisEndPadding="40dip"
- launcher:xAxisStartPadding="256dip"
- launcher:xAxisEndPadding="256dip" />
+ launcher:xAxisStartPadding="40dip"
+ launcher:xAxisEndPadding="40dip" />
diff --git a/res/layout-xlarge-port/workspace_screen.xml b/res/layout-xlarge-port/workspace_screen.xml
index eb7620ca6..7314e6046 100644
--- a/res/layout-xlarge-port/workspace_screen.xml
+++ b/res/layout-xlarge-port/workspace_screen.xml
@@ -18,13 +18,13 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:hapticFeedbackEnabled="false"
launcher:cellWidth="@dimen/workspace_cell_width"
launcher:cellHeight="@dimen/workspace_cell_height"
- launcher:yAxisStartPadding="172dip"
- launcher:yAxisEndPadding="172dip"
+ launcher:yAxisStartPadding="40dip"
+ launcher:yAxisEndPadding="40dip"
launcher:xAxisStartPadding="40dip"
launcher:xAxisEndPadding="40dip"/>
diff --git a/res/values-xlarge/colors.xml b/res/values-xlarge/colors.xml
index a6cdd06bf..d4c6fadb4 100644
--- a/res/values-xlarge/colors.xml
+++ b/res/values-xlarge/colors.xml
@@ -18,4 +18,5 @@
-->
<resources>
<color name="app_info_filter">#A50000FE</color>
+ <color name="dimmed_view_color">#FF7F7F7F</color>
</resources> \ No newline at end of file