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

Commit d8acf986 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge Android 13 

Bug: 242648940
Merged-In: Ia5894e6ac060975b6e1bd9b78e839e05361e3687
Change-Id: I477cf6667464823e0173ae26e81135d5ee73d3a6
parents f61ebe61 775e9cc3

Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ android_test { 
        "androidx.legacy_legacy-support-core-utils",

        "androidx.core_core",

        "androidx.fragment_fragment",

        "androidx.test.ext.junit"

        "androidx.test.ext.junit",

        "platform-compat-test-rules",

    ],

    srcs: [

        "tests/src/**/*.java",

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
    <uses-permission android:name="android.permission.READ_BLOCKED_NUMBERS"/>

    <uses-permission android:name="android.permission.WRITE_BLOCKED_NUMBERS"/>

    <uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>

    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>

    <uses-permission android:name="com.android.phone.permission.ACCESS_LAST_KNOWN_CELL_ID"/>



    <permission android:name="android.permission.BROADCAST_CALLLOG_INFO"
@@ -262,7 +263,7 @@ 
        <activity android:name=".RespondViaSmsSettings"

             android:label="@string/respond_via_sms_setting_title"

             android:configChanges="orientation|screenSize|keyboardHidden"

             android:theme="@style/Theme.Telecom.DialerSettings"

             android:theme="@style/CallSettingsWithoutDividerTheme"

             android:process=":ui"

             android:exported="true">

            <intent-filter>

TEST_MAPPING

+32 −0
Original line number Diff line number Diff line
@@ -15,6 +15,38 @@ 
          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    },

    {

      "name": "CtsTelephony2TestCases",

      "options": [

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    },

    {

      "name": "CtsTelephony3TestCases",

      "options": [

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    },

    {

      "name": "CtsSimRestrictedApisTestCases",

      "options": [

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    },

    {

      "name": "CtsTelephonyProviderTestCases",

      "options": [

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    }

  ],

  "presubmit-large": [

res/values-night/styles.xml

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

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

-->



<resources>



    <style name="Theme.Telecom.DialerSettings" parent="@android:style/Theme.Material.Light">

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

        <item name="android:tint">@color/blocked_numbers_secondary_text_color</item>

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

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

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

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

        <item name="android:actionOverflowButtonStyle">@style/TelecomDialerSettingsActionOverflowButtonStyle</item>

        <item name="android:windowContentOverlay">@null</item>

    </style>



    <style name="Theme.Telecom.BlockedNumbers" parent="@android:style/Theme.Material.Light">

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

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

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

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

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

        <item name="android:windowContentOverlay">@null</item>

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

        <item name="android:listDivider">@null</item>

    </style>



</resources>

res/values/styles.xml

+10 −16
Original line number Diff line number Diff line
@@ -28,33 +28,24 @@ 


   <style name="Theme.Telecom.DialerSettings" parent="@android:style/Theme.DeviceDefault.Light">

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

        <item name="android:tint">@color/blocked_numbers_secondary_text_color</item>

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

        <item name="android:actionOverflowButtonStyle">@style/TelecomDialerSettingsActionOverflowButtonStyle</item>

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

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

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

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

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

        <item name="android:windowContentOverlay">@null</item>

    </style>



    <style name="Theme.Telecom.BlockedNumbers" parent="@android:style/Theme.DeviceDefault.Light">

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

        <item name="android:tint">@color/blocked_numbers_secondary_text_color</item>

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

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

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

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

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

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

        <item name="android:windowContentOverlay">@null</item>

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

        <item name="android:listDivider">@null</item>

    </style>



    <style name="TelecomDialerSettingsActionBarStyle" parent="android:Widget.DeviceDefault.ActionBar">

        <item name="android:background">@color/background_color</item>

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

        <item name="android:titleTextStyle">@style/BlockedNumbersTextHead1</item>

        <item name="android:elevation">@dimen/dialer_settings_actionbar_elevation</item>

        <!-- Empty icon -->
@@ -63,33 +54,36 @@ 


    <style name="TelecomDialerSettingsActionOverflowButtonStyle"

            parent="@android:style/Widget.DeviceDefault.Light.ActionButton.Overflow">

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

        <item name="android:src">@drawable/ic_more_vert_24dp</item>

    </style>



    <style name="BlockedNumbersButton" parent="BlockedNumbersTextPrimary2">

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

    </style>



    <style name="BlockedNumbersTextHead1"

           parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">

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

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

        <item name="android:textSize">@dimen/blocked_numbers_head1_font_size</item>

        <item name="android:fontFamily">sans-serif-regular</item>

    </style>



    <style name="BlockedNumbersTextPrimary2">

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

    <style name="BlockedNumbersTextPrimary2" parent="Theme.Telecom.BlockedNumbers">

        <item name="android:textSize">@dimen/blocked_numbers_primary2_font_size</item>

        <item name="android:fontFamily">sans-serif-regular</item>

        <item name="android:lineSpacingExtra">@dimen/blocked_numbers_line_spacing</item>

        <item name="android:capitalize">sentences</item>

    </style>



    <style name="BlockedNumbersTextSecondary">

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

    <style name="BlockedNumbersTextSecondary" parent="Theme.Telecom.BlockedNumbers">

        <item name="android:textSize">@dimen/blocked_numbers_secondary_font_size</item>

        <item name="android:fontFamily">sans-serif-regular</item>

        <item name="android:lineSpacingExtra">@dimen/blocked_numbers_secondary_line_spacing</item>

        <item name="android:capitalize">sentences</item>

    </style>



    <style name="CallSettingsWithoutDividerTheme" parent="Theme.Telecom.DialerSettings">

        <item name="android:listDivider">@null</item>

    </style>



</resources>