PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Updating launcher layouts (Bug 6955380)" into jb-mr1-dev

Browse Source
This commit is contained in:
Winson Chung
2012-09-27 16:17:39 -07:00
committed by Android (Google) Code Review
parent b1dfe25ae1 411a3001d6
commit 41ccfff36a
8 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/layout-land/launcher.xml
+2 -1
View File
@@ -80,7 +80,8 @@
android:id="@+id/voice_button_proxy"
android:layout_width="@dimen/qsb_bar_height"
android:layout_height="@dimen/app_icon_size"
android:layout_gravity="bottom|left"
android:layout_gravity="top|left"
android:layout_marginTop="64dp"
android:clickable="true"
android:onClick="onClickVoiceButton"
android:importantForAccessibility="no"
res/layout-land/search_bar.xml
+4 -3
View File
@@ -13,10 +13,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<RelativeLayout
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/qsb_bar_height"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<!-- Global search icon -->
<com.android.launcher2.HolographicImageView
style="@style/SearchButton"
@@ -44,4 +45,4 @@
android:focusable="true"
android:clickable="true"
android:contentDescription="@string/accessibility_voice_search_button" />
</RelativeLayout>
</LinearLayout>
res/values-land/dimens.xml
+2 -2
View File
@@ -16,8 +16,8 @@
<resources>
<!-- QSB -->
<dimen name="toolbar_button_vertical_padding">12dip</dimen>
<dimen name="toolbar_button_horizontal_padding">4dip</dimen>
<dimen name="toolbar_button_vertical_padding">8dip</dimen>
<dimen name="toolbar_button_horizontal_padding">0dip</dimen>
<!-- Workspace -->
<dimen name="hotseat_cell_width">64dp</dimen>
res/values-sw360dp-port/dimens.xml
+35
View File
@@ -0,0 +1,35 @@
<?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>
<!-- Workspace -->
<!-- qsb_bar_height_inset represents qsb_bar_height minus the padding
that we put on each page for allowing folders to draw out of bounds -->
<dimen name="qsb_bar_height_inset">48dp</dimen>
<dimen name="qsb_bar_height">56dp</dimen>
<dimen name="qsb_padding_left">8dp</dimen>
<dimen name="qsb_padding_right">8dp</dimen>
<dimen name="search_bar_height">48dp</dimen>
<dimen name="workspace_divider_padding_left">8dp</dimen>
<dimen name="workspace_divider_padding_right">8dp</dimen>
<dimen name="workspace_width_gap_land">0dp</dimen>
<dimen name="workspace_width_gap_port">8dp</dimen>
<dimen name="workspace_height_gap_land">0dp</dimen>
<dimen name="workspace_height_gap_port">0dp</dimen>
<dimen name="hotseat_width_gap">2dp</dimen>
</resources>
res/values-sw600dp-land/dimens.xml
+2 -1
View File
@@ -31,7 +31,8 @@
<!-- QSB -->
<dimen name="qsb_bar_height">82dp</dimen>
<dimen name="toolbar_button_horizontal_padding">20dip</dimen>
<dimen name="toolbar_button_vertical_padding">8dip</dimen>
<dimen name="toolbar_button_horizontal_padding">0dip</dimen>
<!-- Workspace -->
<dimen name="workspace_divider_padding_top">12dp</dimen>
res/values-sw720dp-port/dimens.xml
+10 -7
View File
@@ -33,10 +33,10 @@
<dimen name="scroll_zone">40dp</dimen>
<dimen name="workspace_page_spacing">24dp</dimen>
<dimen name="qsb_bar_height">72dp</dimen>
<dimen name="qsb_bar_height_inset">72dp</dimen>
<dimen name="qsb_padding_left">112dp</dimen>
<dimen name="qsb_padding_right">112dp</dimen>
<dimen name="qsb_bar_height">102dp</dimen>
<dimen name="qsb_bar_height_inset">102dp</dimen>
<dimen name="qsb_padding_left">72dp</dimen>
<dimen name="qsb_padding_right">72dp</dimen>
<!-- We offset the proxy to overlap with the voice icon -->
<dimen name="qsb_voice_proxy_padding_right">100dp</dimen>
@@ -44,11 +44,14 @@
<integer name="apps_customize_cling_focused_y">2</integer>
<!-- Divider width set to match the qsb width -->
<dimen name="workspace_divider_padding_left">112dp</dimen>
<dimen name="workspace_divider_padding_right">112dp</dimen>
<dimen name="workspace_divider_padding_left">72dp</dimen>
<dimen name="workspace_divider_padding_right">72dp</dimen>
<!-- Hotseat -->
<dimen name="hotseat_width_gap">16dp</dimen>
<dimen name="hotseat_width_gap">14dp</dimen>
<dimen name="button_bar_height">126dp</dimen>
<dimen name="button_bar_height_plus_padding">126dp</dimen>
<dimen name="button_bar_height_bottom_padding">32dp</dimen>
<!-- Cling -->
<!-- The offset for the text in the cling -->
res/values-sw720dp/config.xml
+2
View File
@@ -1,6 +1,8 @@
<resources>
<integer name="cell_count_x">8</integer>
<integer name="cell_count_y">5</integer>
<integer name="hotseat_cell_count">9</integer>
<integer name="hotseat_all_apps_index">4</integer>
<bool name="config_largeHeap">true</bool>
<bool name="is_large_screen">true</bool>
res/values-sw720dp/dimens.xml
+7 -7
View File
@@ -26,7 +26,7 @@
<dimen name="button_bar_width_left_padding">12dp</dimen>
<dimen name="button_bar_width_right_padding">12dp</dimen>
<dimen name="button_bar_height_plus_padding">82dp</dimen>
<dimen name="hotseat_width_gap">50dp</dimen>
<dimen name="hotseat_width_gap">58dp</dimen>
<!-- QSB -->
<dimen name="toolbar_button_vertical_padding">8dip</dimen>
@@ -35,8 +35,8 @@
<!-- Workspace -->
<dimen name="qsb_bar_height">60dp</dimen>
<dimen name="qsb_bar_height_inset">60dp</dimen>
<dimen name="qsb_padding_left">249dp</dimen>
<dimen name="qsb_padding_right">249dp</dimen>
<dimen name="qsb_padding_left">177dp</dimen>
<dimen name="qsb_padding_right">177dp</dimen>
<!-- We offset the proxy to overlap with the voice icon -->
<dimen name="qsb_voice_proxy_padding_right">230dp</dimen>
<!-- 44dp high for the optical bounds -->
@@ -90,8 +90,8 @@
<!-- Divider width set to match the qsb width -->
<dimen name="workspace_divider_width">0dp</dimen>
<dimen name="workspace_divider_padding_left">249dp</dimen>
<dimen name="workspace_divider_padding_right">249dp</dimen>
<dimen name="workspace_divider_padding_left">177dp</dimen>
<dimen name="workspace_divider_padding_right">177dp</dimen>
<dimen name="workspace_divider_padding_top">0dp</dimen>
<dimen name="workspace_divider_padding_bottom">0dp</dimen>
@@ -100,8 +100,8 @@
<dimen name="workspace_cell_width_port">96dp</dimen>
<dimen name="workspace_cell_height_land">96dp</dimen>
<dimen name="workspace_cell_height_port">96dp</dimen>
<dimen name="workspace_width_gap_land">46dp</dimen>
<dimen name="workspace_width_gap_land">50dp</dimen>
<dimen name="workspace_width_gap_port">0dp</dimen>
<dimen name="workspace_height_gap_land">16dp</dimen>
<dimen name="workspace_height_gap_port">48dp</dimen>
<dimen name="workspace_height_gap_port">70dp</dimen>
</resources>