diff options
| -rw-r--r-- | res/layout/lists_fragment.xml | 2 | ||||
| -rw-r--r-- | res/values-land/styles.xml | 22 | ||||
| -rw-r--r-- | res/values/dimens.xml | 10 | ||||
| -rw-r--r-- | res/values/styles.xml | 7 | ||||
| -rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 5 |
5 files changed, 11 insertions, 35 deletions
diff --git a/res/layout/lists_fragment.xml b/res/layout/lists_fragment.xml index d75095aaf..7e15f84c5 100644 --- a/res/layout/lists_fragment.xml +++ b/res/layout/lists_fragment.xml @@ -24,7 +24,7 @@ android:id="@+id/shortcut_card_list" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="?android:attr/actionBarSize" + android:paddingTop="@dimen/action_bar_height" android:background="@color/actionbar_background_color" android:clipToPadding="false" android:fadingEdge="none" diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml deleted file mode 100644 index 1388a17f1..000000000 --- a/res/values-land/styles.xml +++ /dev/null @@ -1,22 +0,0 @@ -<!-- - 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> - - <style name="FragmentActionBarPadding"> - <item name="android:paddingBottom">0dp</item> - </style> -</resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 78d91c247..e884566a1 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -88,12 +88,16 @@ <!-- Height of the all contacts Button in the favorites menu. --> <dimen name="favorites_menu_all_contacts_height">24dp</dimen> + <!-- Height of the actionBar - this is 8dps bigger than the platform standard to give more + room to the search box--> + <dimen name="action_bar_height">64dp</dimen> + <!-- Margin to the left and right of the search box. --> <dimen name="search_margin_horizontal">7dp</dimen> <!-- Margin above the search box. --> - <dimen name="search_top_margin">4dp</dimen> + <dimen name="search_top_margin">8dp</dimen> <!-- Margin below the search box. --> - <dimen name="search_bottom_margin">4dp</dimen> + <dimen name="search_bottom_margin">8dp</dimen> <!-- Search box text size --> <dimen name="search_text_size">13.24sp</dimen> <!-- Search box interior padding - left --> @@ -108,7 +112,7 @@ <!-- Size of the icon (voice search, close search) in the search box. --> <dimen name="search_box_icon_size">28dp</dimen> <!-- Elevation of the search box --> - <dimen name="search_box_elevation">10dp</dimen> + <dimen name="search_box_elevation">5dp</dimen> <!-- Size of text in tabs. --> <dimen name="tab_height">43dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index 659d5abca..3a4134cc6 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -72,7 +72,7 @@ <item name="call_log_voicemail_status_action_text_color">#33b5e5</item> <!-- Favorites --> <item name="favorites_padding_bottom">?android:attr/actionBarSize</item> - <item name="android:colorPrimaryDark">@color/actionbar_background_color_dark</item> + <item name="android:colorPrimaryDark">@color/actionbar_background_color_dark</item> </style> <!-- Action bar overflow menu icon. --> @@ -117,6 +117,7 @@ <item name="android:background">@color/actionbar_background_color</item> <item name="android:backgroundStacked">#ffffff</item> <item name="android:titleTextStyle">@style/DialtactsActionBarTitleText</item> + <item name="android:height">@dimen/action_bar_height</item> <!-- Empty icon --> <item name="android:icon">@android:color/transparent</item> </style> @@ -156,10 +157,6 @@ <item name="android:overScrollMode">always</item> </style> - <style name="FragmentActionBarPadding"> - <item name="android:paddingBottom">?android:attr/actionBarSize</item> - </style> - <style name="DialtactsSearchboxStyle" parent="@android:style/Widget.EditText"> <item name="android:background">@null</item> <item name="android:textColorHint">@color/searchbox_text_color</item> diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 8445ff76d..9f7e47f05 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -346,10 +346,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O final OptionsPopupMenu optionsMenu = buildOptionsMenu(optionsMenuButton); optionsMenuButton.setOnTouchListener(optionsMenu.getDragToOpenListener()); - final TypedArray styledAttributes = getTheme().obtainStyledAttributes( - new int[] { android.R.attr.actionBarSize }); - mActionBarHeight = (int) styledAttributes.getDimension(0, 0); - styledAttributes.recycle(); + mActionBarHeight = getResources().getDimensionPixelSize(R.dimen.action_bar_height); // Add the favorites fragment, and the dialpad fragment, but only if savedInstanceState // is null. Otherwise the fragment manager takes care of recreating these fragments. |