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

Commit 14846906 authored by narinder Rana's avatar narinder Rana
Browse files

Merge branch 'issue_1828_pie_test' into 'issue_1828' 

Issue 1828 pie test

See merge request !36
parents a0dae92b e1aae3b9

res/layout/contact_list_filter_item.xml

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
    </LinearLayout>



    <RadioButton

        android:buttonTint="@color/color_default_blue1"

        android:id="@+id/radioButton"

        android:clickable="false"

        android:layout_width="wrap_content"

res/values-v27/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
        <item name="android:windowLightNavigationBar">true</item>

        <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>

        <item name="android:windowLightStatusBar">true</item>

        <item name="android:windowLightNavigationBar">true</item>

    </style>



    <style name="MyOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">

res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -266,5 +266,5 @@ 
    <!-- Highlight color used in places such as ripples -->

    <color name="control_highlight_color">#1A000000</color>





    <color name="black">#000000</color>

</resources>

res/values/styles.xml

+23 −2
Original line number Diff line number Diff line
@@ -20,8 +20,20 @@ 
        <item name="actionBarStyle">@style/EditorActionBarStyle</item>

        <item name="colorButtonNormal">@color/background_primary</item>

        <item name="windowActionModeOverlay">true</item>

        <item name="android:colorAccent">@color/color_default_blue1</item>

        <item name="android:editTextStyle">@style/myEditText</item>

    </style>

    <style name="myEditText" parent="@android:style/Widget.Holo.Light.EditText">

        <item name="android:textCursorDrawable">@color/color_default_blue1</item>

        <item name="android:colorControlNormal">@color/color_default_secondary_text</item>

        <item name="colorControlNormal">@color/color_default_secondary_text</item>

        <item name="android:colorControlActivated">@color/color_default_blue1</item>

        <item name="colorControlActivated">@color/color_default_blue1</item>

        <item name="android:colorControlHighlight">@color/color_default_blue1</item>

        <item name="colorControlHighlight">@color/color_default_blue1</item>

    </style>





    <style name="Theme.QuickContact" parent="@style/PeopleTheme">

        <item name="android:windowBackground">@android:color/transparent</item>

        <item name="android:colorBackgroundCacheHint">@null</item>
@@ -47,10 +59,13 @@ 
        <item name="android:actionModeCloseDrawable">@drawable/quantum_ic_close_vd_theme_24</item>

        <item name="android:textColorPrimary">@color/primary_text_color</item>

        <item name="android:textColorSecondary">@color/secondary_text_color</item>

        <item name="toolbarNavigationButtonStyle">@style/ContactToolbarNavigationButtonStyle</item>

        <item name="android:icon">@android:color/transparent</item>

        <item name="android:listViewStyle">@style/ListViewStyle</item>

        <item name="android:windowBackground">@color/background_primary</item>

        <item name="android:colorPrimaryDark">@color/primary_color_dark</item>

        <item name="android:windowLightStatusBar" tools:targetApi="27">true</item>

        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>

        <item name="android:colorPrimary">@color/primary_color</item>

        <item name="android:colorAccent">@color/color_default_blue1</item>

        <item name="android:alertDialogTheme">@style/ContactsAlertDialogTheme</item>
@@ -96,7 +111,8 @@ 
        <!-- TODO(yaolu): Switch to use quantum_grey if in Google3 -->

        <item name="android:colorPrimaryDark">#9e9e9e</item>

        <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>



        <item name="android:windowLightStatusBar" tools:targetApi="27">true</item>

        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>



    </style>
@@ -128,11 +144,13 @@ 
        <item name="android:listViewStyle">@style/ListViewStyle</item>

        <item name="android:windowBackground">@color/background_primary</item>

        <item name="android:colorPrimaryDark">@color/primary_color_dark</item>

        <item name="android:windowLightStatusBar" tools:targetApi="27">true</item>

        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>

        <item name="colorPrimaryDark">@color/primary_color_dark</item>

        <item name="android:colorPrimary">@color/primary_color</item>

        <item name="colorPrimary">@color/primary_color</item>

        <item name="android:colorAccent">@color/color_default_blue1</item>

        <item name="colorAccent">@color/color_default_blue1</item>

        <item name="android:colorAccent">@color/color_default_blue1</item>

        <item name="android:alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>

        <item name="alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>

        <item name="list_item_height">@dimen/contact_browser_list_item_height</item>
@@ -294,6 +312,8 @@ 
    <style name="ContactListFilterTheme" parent="@style/PeopleTheme">

        <item name="android:listViewStyle">@style/ListViewStyle</item>

        <item name="android:actionButtonStyle">@style/FilterActionButtonStyle</item>

        <item name="android:colorControlNormal">@color/color_default_blue1</item>

        <item name="android:textColorSecondary">@color/color_default_blue1</item>



    </style>
@@ -479,6 +499,7 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar 
    <style name="FilterActionButtonStyle" parent="@android:Widget.ActionButton">

        <item name="android:minWidth">@dimen/contact_filter_action_button_width</item>

        <item name="android:textColor">@color/color_default_blue1</item>



    </style>



    <style name="CustomContactListFilterView" parent="ContactListFilterTheme">

src/com/android/contacts/activities/ContactEditorActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.provider.ContactsContract.QuickContact; 
import android.support.v7.widget.Toolbar;

import android.util.Log;

import android.view.View;

import android.view.WindowManager;

import android.view.inputmethod.InputMethodManager;



import com.android.contacts.AppCompatContactsActivity;
@@ -393,6 +394,7 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements 
        }



        this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);

        //this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);

        //this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color);



    }