diff options
| -rw-r--r-- | res/color/tab_text_color.xml | 4 | ||||
| -rw-r--r-- | res/drawable/action_bar_tab.xml | 43 | ||||
| -rw-r--r-- | res/layout/lists_fragment.xml | 2 | ||||
| -rw-r--r-- | res/values/colors.xml | 3 | ||||
| -rw-r--r-- | res/values/dimens.xml | 5 |
5 files changed, 31 insertions, 26 deletions
diff --git a/res/color/tab_text_color.xml b/res/color/tab_text_color.xml index 629341e03..5ef1fe33b 100644 --- a/res/color/tab_text_color.xml +++ b/res/color/tab_text_color.xml @@ -16,6 +16,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="#fff" android:state_selected="true"/> - <item android:color="#a3e7f0" /> + <item android:color="@color/actionbar_text_color" android:state_selected="true"/> + <item android:color="@color/actionbar_unselected_text_color" /> </selector>
\ No newline at end of file diff --git a/res/drawable/action_bar_tab.xml b/res/drawable/action_bar_tab.xml index fe961f72e..8a3ea7a7e 100644 --- a/res/drawable/action_bar_tab.xml +++ b/res/drawable/action_bar_tab.xml @@ -14,24 +14,25 @@ See the License for the specific language governing permissions and limitations under the License. --> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/tab_selected" - android:state_focused="false" - android:state_pressed="false" - android:state_selected="true" /> - <item android:drawable="@drawable/tab_selected_focused" - android:state_focused="true" - android:state_pressed="false" - android:state_selected="true" /> - <item android:drawable="@drawable/tab_unselected_focused" - android:state_focused="true" - android:state_pressed="false" - android:state_selected="false" /> - <item android:drawable="@color/tab_pressed_color" - android:state_pressed="true" /> - <item android:drawable="@drawable/tab_selected" - android:state_selected="true" /> - <item android:drawable="@color/tab_default_color" - android:state_selected="false" /> -</selector>
\ No newline at end of file +<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" + android:tint="@color/tab_pressed_color"> + <item> + <selector> + <item android:drawable="@drawable/tab_selected" + android:state_focused="false" + android:state_pressed="false" + android:state_selected="true" /> + <item android:drawable="@drawable/tab_selected_focused" + android:state_focused="true" + android:state_pressed="false" + android:state_selected="true" /> + <item android:drawable="@drawable/tab_unselected_focused" + android:state_focused="true" + android:state_pressed="false" + android:state_selected="false" /> + <item android:drawable="@drawable/tab_selected" + android:state_selected="true" /> + <item android:drawable="@color/tab_default_color" /> + </selector> + </item> +</touch-feedback>
\ No newline at end of file diff --git a/res/layout/lists_fragment.xml b/res/layout/lists_fragment.xml index d5b2bf8ac..f97b33670 100644 --- a/res/layout/lists_fragment.xml +++ b/res/layout/lists_fragment.xml @@ -36,7 +36,7 @@ <com.android.dialer.list.ViewPagerTabs android:id="@+id/lists_pager_header" android:layout_width="match_parent" - android:layout_height="?android:attr/actionBarSize" + android:layout_height="@dimen/tab_height" android:textAllCaps="true" android:orientation="horizontal" android:layout_gravity="top" diff --git a/res/values/colors.xml b/res/values/colors.xml index fa0fc3409..78e2301d2 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -92,7 +92,8 @@ <!-- Color of action bar text. Ensure this stays in sync with packages/Telephony phone_settings_actionbar_text_color--> - <color name="actionbar_text_color">#FFFFFF</color> + <color name="actionbar_text_color">#ffffff</color> + <color name="actionbar_unselected_text_color">#a6ffffff</color> <!-- Color of actions in expanded call log entries. This text color represents actions such as call back, play voicemail, etc. --> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index c9eeacfcd..1ba1603a3 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -110,8 +110,11 @@ <dimen name="search_box_text_left_margin">8dp</dimen> <!-- Size of the icon (voice search, close search) in the search box. --> <dimen name="search_box_icon_size">37dp</dimen> + <!-- Size of text in tabs. --> - <dimen name="tab_text_size">13sp</dimen> + <dimen name="tab_height">43dp</dimen> + <dimen name="tab_text_size">14sp</dimen> + <!-- Padding to the left and right of call log action buttons. --> <dimen name="call_log_action_horizontal_padding">8dp</dimen> <!-- Left-padding for the call log action buttons - ensures the buttons align with the text |