Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28ded60d authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Adding "Speed Dial" title to dialer favorites list and moving "All Contacts" affordance."

parents 765734c1 9a066575

res/drawable/background_favorites_menu.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2014 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

  -->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_pressed="false">

        <shape android:shape="rectangle" >

            <solid android:color="@color/background_dialer_list_items" />

        </shape>

    </item>

    <item android:state_pressed="true">

        <shape android:shape="rectangle" >

            <solid android:color="@color/favorites_menu_pressed_color" />

        </shape>

    </item>

</selector>
 
 No newline at end of file

res/layout/phone_favorites_menu.xml

0 → 100644
+58 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2014 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

  -->



<!-- The phone favorites menu appears on the main dialer screen above the favorite callers area,

     and provides access to the All Contacts list. -->

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

                android:id="@+id/phone_favorites_menu"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:paddingLeft="@dimen/favorites_menu_margin"

                android:paddingRight="@dimen/favorites_menu_margin"

                android:paddingTop="@dimen/favorites_menu_margin"

                android:paddingBottom="@dimen/favorites_menu_margin"

                android:background="@drawable/background_favorites_menu"

                android:addStatesFromChildren="true"

        >

    <TextView

            android:layout_width="wrap_content"

            android:layout_height="@dimen/favorites_menu_speed_dial_height"

            android:fontFamily="@string/favorites_menu_speed_dial_font_family"

            android:text="@string/favorites_menu_speed_dial"

            android:textSize="@dimen/favorites_menu_speed_dial_text_size"

            android:textColor="@color/speed_dial_text_color"

            android:layout_alignParentLeft="true"

            android:layout_centerVertical="true"

            android:gravity="center"

        />

    <TextView

            android:id="@+id/all_contacts_button"

            android:fontFamily="@string/favorites_menu_all_contacts_font_family"

            android:layout_width="wrap_content"

            android:layout_height="@dimen/favorites_menu_all_contacts_height"

            android:paddingLeft="@dimen/favorites_menu_padding"

            android:paddingRight="@dimen/favorites_menu_padding"

            android:text="@string/favorites_menu_all_contacts"

            android:textSize="@dimen/favorites_menu_all_contacts_text_size"

            android:background="@color/all_contacts_button_color"

            android:textColor="@color/all_contacts_button_text_color"

            android:layout_alignParentRight="true"

            android:layout_centerVertical="true"

            android:gravity="center"

            android:focusable="true"

        />

</RelativeLayout>
 
 No newline at end of file

res/values/colors.xml

+13 −0
Original line number Diff line number Diff line
@@ -70,4 +70,17 @@ 


    <!-- Text color for no favorites message -->

    <color name="nofavorite_text_color">#777777</color>



    <!-- Text color for the "speed dial" label in the favorites menu. -->

    <color name="speed_dial_text_color">#555555</color>



    <!-- Background color for the "All Contacts" button in the favorites menu. -->

    <color name="all_contacts_button_color">#999999</color>



    <!-- Background color for the favorites menu when pressed. -->

    <color name="favorites_menu_pressed_color">#d6d6d6</color>



    <!-- Text color for the "All Contacts" button above the favorite callers -->

    <color name="all_contacts_button_text_color">#ffffff</color>



</resources>

res/values/dimens.xml

+13 −0
Original line number Diff line number Diff line
@@ -83,4 +83,17 @@ 
    <!-- Padding for the tooltip -->

    <dimen name="dismiss_button_padding_start">20dip</dimen>

    <dimen name="dismiss_button_padding_end">28dip</dimen>



    <!-- Margin around the favorites menu. -->

    <dimen name="favorites_menu_margin">6dp</dimen>

    <!-- Padding within the favorites menu. -->

    <dimen name="favorites_menu_padding">4dp</dimen>

    <!-- Text size for the "speed dial" text in the favorites menu. -->

    <dimen name="favorites_menu_speed_dial_text_size">18sp</dimen>

    <!-- Height of the speed dial TextView in the favorites menu. -->

    <dimen name="favorites_menu_speed_dial_height">24dp</dimen>

    <!-- Text size for the "All Contacts" text in the favorites menu. -->

    <dimen name="favorites_menu_all_contacts_text_size">12sp</dimen>

    <!-- Height of the all contacts Button in the favorites menu. -->

    <dimen name="favorites_menu_all_contacts_height">24dp</dimen>

</resources>

res/values/strings.xml

+18 −0
Original line number Diff line number Diff line
@@ -725,4 +725,22 @@ 


    <!-- Content description for dismiss button on badge. [CHAR LIMIT=NONE] -->

    <string name="description_dismiss">Dismiss</string>



    <!-- Header text displayed on the main dialer screen above the list of favorite phone numbers.

         [CHAR LIMIT=21] -->

    <string name="favorites_menu_speed_dial">Speed Dial</string>



    <!-- Button text for the "all contacts" button displayed on the main dialer screen above the

         list of favorite phone numbers.  Navigates the user to the "All Contacts" list.

         This text represents the same action as the text in string "menu_allContacts".

         [CHAR LIMIT=21] -->

    <string name="favorites_menu_all_contacts">ALL CONTACTS</string>



    <!-- The font-family to use for the "speed dial" label on the favorites menu.

         Do not translate. -->

    <string name="favorites_menu_speed_dial_font_family">sans-serif-light</string>



    <!-- The font-family to use for the "all contacts" label on the favorites menu.

         Do not translate. -->

    <string name="favorites_menu_all_contacts_font_family">sans-serif</string>

</resources>