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

Commit e03864d2 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 !37
parents 14846906 ddd17792

res/drawable/ic_work_profile.xml

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
        android:width="16dp"

        android:height="16dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

        android:viewportHeight="24.0"

    >

    <path

        android:pathData="M20,6h-4V4c0,-1.11 -0.89,-2 -2,-2h-4C8.89,2 8,2.89 8,4v2H4C2.89,6 2.01,6.89 2.01,8L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2V8C22,6.89 21.11,6 20,6zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2s2,0.9 2,2S13.1,15 12,15zM14,6h-4V4h4V6z"

        android:fillColor="#7F7F7F"/>

res/layout/account_selector_list_item_condensed.xml

+2 −0
Original line number Diff line number Diff line
@@ -52,5 +52,7 @@ 
            android:textColor="?android:attr/textColorSecondary"

            android:singleLine="true"

            android:ellipsize="end"/>





    </LinearLayout>

</LinearLayout>

res/values/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ 


 <!--   <color name="primary_color_dark">#1c3aa9</color>

    <color name="primary_color">#2a56c6</color>-->

 <color name="primary_color_dark">@lineageos.platform:color/color_default_primary</color>

    <color name="primary_color">@lineageos.platform:color/color_default_primary_dark</color>

 <color name="primary_color_dark">@lineageos.platform:color/color_default_foreground</color>

    <color name="primary_color">@lineageos.platform:color/color_default_foreground</color>



    <color name="group_primary_color_dark">#546E7A</color>

    <color name="group_primary_color">#607D8B</color>

res/values/styles.xml

+5 −3
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ 
    </style>



    <style name="PeopleTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">

        <item name="android:navigationBarColor">@android:color/black</item>



        <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>

        <!-- Style for the overflow button in the actionbar. -->

        <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflowQP</item>
@@ -109,10 +111,9 @@ 
        <item name="android:windowBackground">@drawable/quantum_launchscreen_contacts</item>

        <!-- Ensure the status bar color matches the background (grey 500) -->

        <!-- TODO(yaolu): Switch to use quantum_grey if in Google3 -->

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

        <item name="android:colorPrimaryDark">@color/primary_color_dark</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>

        <item name="android:navigationBarColor">@android:color/black</item>



    </style>
@@ -127,6 +128,7 @@ 
    </style>



    <style name="PeopleThemeAppCompat" parent="ThemeOverlay.AppCompat.Dark.ActionBar">

        <item name="android:navigationBarColor">@android:color/black</item>

        <!--Theme.AppCompat.Light.DarkActionBar-->

        <!-- Styles that require AppCompat compatibility, remember to update both sets -->

        <item name="android:actionBarStyle">@style/ContactsActionBarStyleAppCompat</item>

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

+10 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.graphics.Color; 
import android.graphics.PorterDuff;

import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

import android.provider.ContactsContract.QuickContact;

import android.support.v7.widget.Toolbar;
@@ -50,6 +51,7 @@ import java.io.FileNotFoundException; 
import java.util.ArrayList;



import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;

import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;



/**

 * Contact editor with only the most important fields displayed initially.
@@ -393,10 +395,17 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements 
            DynamicShortcuts.reportShortcutUsed(this, DynamicShortcuts.SHORTCUT_ADD_CONTACT);

        }



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

        //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);



        if(Build.VERSION.SDK_INT >= 27) {

            this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS |

                    View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR |

                    View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);

        }





    }



    @Override