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

Commit 7f6a2cff authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-17.1' into v1-q

parents 575a4b9a 01e82244

res/drawable-night/quantum_launchscreen_contacts.xml

0 → 100755
+27 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- Copyright (C) 2017 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.

-->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android"

    android:opacity="opaque">

  <item android:drawable="@color/background_material_dark" />

  <item

      android:id="@+id/launchscreens_product_logo"

      android:bottom="@dimen/launchscreens_product_logo_bottom">

    <bitmap

        android:gravity="center"

        android:src="@drawable/product_logo_contacts_color_144" />

  </item>

</layer-list>

res/drawable-sw600dp-night/quantum_launchscreen_contacts.xml

0 → 100755
+27 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- Copyright (C) 2017 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.

-->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android"

    android:opacity="opaque">

    <item android:drawable="@color/background_material_dark" />

    <item

        android:id="@+id/launchscreens_product_logo"

        android:bottom="@dimen/launchscreens_product_logo_bottom">

        <bitmap

            android:gravity="center"

            android:src="@drawable/product_logo_contacts_color_192" />

    </item>

</layer-list>

res/values-v27/styles.xml

+0 −10
Original line number Original line Diff line number Diff line
@@ -54,16 +54,6 @@ 
        <item name="android:windowLightNavigationBar">true</item>

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

    </style>

    </style>





    <style name="LaunchScreenTheme" parent="Theme.AppCompat.Light.DarkActionBar">

        <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:navigationBarColor">@color/navigation_bar_bg</item>

        <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>

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

    </style>



    <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">

    <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">

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

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

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

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

res/values/styles.xml

+3 −4
Original line number Original line Diff line number Diff line
@@ -89,11 +89,10 @@ 
        <item name="android:popupMenuStyle">@style/PopupMenuStyle</item>

        <item name="android:popupMenuStyle">@style/PopupMenuStyle</item>

    </style>

    </style>





    <style name="LaunchScreenTheme" parent="Theme.AppCompat.Light.DarkActionBar">

    <style name="LaunchScreenTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">

        <item name="android:windowBackground">@drawable/quantum_launchscreen_contacts</item>

        <item name="android:windowBackground">@drawable/quantum_launchscreen_contacts</item>

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

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

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

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

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

    </style>

    </style>





    <style name="PeopleActivityTheme" parent="@style/PeopleThemeAppCompat">

    <style name="PeopleActivityTheme" parent="@style/PeopleThemeAppCompat">