diff options
| author | Winson Chung <winsonc@google.com> | 2012-06-06 16:17:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-06 16:17:04 -0700 |
| commit | 478244409e15594ceaa7426a6a23cc805db0b1fc (patch) | |
| tree | 078917028e2c0fa70394e9444733a1c6d4c253cc /res | |
| parent | 5766032503a4ace048e69d6540a46134a858cbb9 (diff) | |
| parent | bfeac0681b63091731c853fdafa3206642449a9d (diff) | |
| download | android_packages_apps_Trebuchet-478244409e15594ceaa7426a6a23cc805db0b1fc.tar.gz android_packages_apps_Trebuchet-478244409e15594ceaa7426a6a23cc805db0b1fc.tar.bz2 android_packages_apps_Trebuchet-478244409e15594ceaa7426a6a23cc805db0b1fc.zip | |
Merge "Synchronizing on the new-apps list before modifying it. (Bug 6621553)" into jb-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-port/search_bar.xml | 2 | ||||
| -rw-r--r-- | res/values-land/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values-port/styles.xml | 6 | ||||
| -rw-r--r-- | res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 2 |
5 files changed, 2 insertions, 12 deletions
diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml index 0ccbe026d..85da2f155 100644 --- a/res/layout-port/search_bar.xml +++ b/res/layout-port/search_bar.xml @@ -32,6 +32,7 @@ android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_toLeftOf="@+id/voice_button_container" + android:paddingLeft="8dp" android:onClick="onClickSearchButton" android:focusable="true" android:clickable="true" @@ -54,6 +55,7 @@ android:layout_gravity="center_vertical" android:layout_alignParentRight="true" android:layout_alignParentTop="true" + android:paddingRight="8dp" android:gravity="right" android:onClick="onClickVoiceButton" android:focusable="true" diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index eeeed610d..e94d78064 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -18,8 +18,6 @@ <!-- QSB --> <dimen name="toolbar_button_vertical_padding">12dip</dimen> <dimen name="toolbar_button_horizontal_padding">4dip</dimen> - <dimen name="search_bar_padding_left">0dp</dimen> - <dimen name="search_bar_padding_right">0dp</dimen> <!-- Workspace --> <dimen name="hotseat_cell_width">64dp</dimen> diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml index 386653ec2..ab6a1eb92 100644 --- a/res/values-port/styles.xml +++ b/res/values-port/styles.xml @@ -18,12 +18,6 @@ --> <resources> -<!-- QSB --> - <style name="SearchButton.Voice"> - <item name="android:paddingLeft">8dp</item> - <item name="android:paddingRight">8dp</item> - </style> - <!-- AppsCustomize --> <style name="TabIndicator.AppsCustomize"> <item name="android:maxWidth">130dp</item> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 7cc89602f..274c72f2a 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -30,8 +30,6 @@ <dimen name="qsb_bar_height">40dp</dimen> <dimen name="qsb_padding_left">0dp</dimen> <dimen name="qsb_padding_right">0dp</dimen> - <dimen name="search_bar_padding_left">8dp</dimen> - <dimen name="search_bar_padding_right">8dp</dimen> <dimen name="search_bar_height">40dp</dimen> <dimen name="workspace_max_gap">16dp</dimen> <dimen name="folder_cell_width">74dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index 08c98c9f2..ee91d7349 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -123,8 +123,6 @@ <item name="android:orientation">horizontal</item> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">match_parent</item> - <item name="android:paddingLeft">@dimen/search_bar_padding_left</item> - <item name="android:paddingRight">@dimen/search_bar_padding_right</item> </style> <style name="SearchButton"> <item name="android:layout_gravity">center_vertical</item> |