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

Commit 3e6b213e authored by Xin Li's avatar Xin Li
Browse files

Merge Android 13 QPR3 

Bug: 275386652
Merged-In: I11e6110ba0b640be8b373d9afd45f806c005b05f
Change-Id: I885fdb1d60c595314c9f3ed229dc030a75edab00
parents aa3dc53d 45918b72

AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line
@@ -2977,7 +2977,6 @@ 
        <activity android:name=".FallbackHome"

                  android:excludeFromRecents="true"

                  android:label=""

                  android:screenOrientation="nosensor"

                  android:taskAffinity="com.android.settings.FallbackHome"

                  android:exported="true"

                  android:theme="@style/FallbackHome"
@@ -3413,7 +3412,7 @@ 
                  android:label="@string/notification_channel_title"

                  android:theme="@style/Theme.Panel"

                  android:excludeFromRecents="true"

                  android:configChanges="orientation|keyboardHidden|screenSize"

                  android:configChanges="keyboardHidden|screenSize"

                  android:exported="true">

            <intent-filter android:priority="1">

                <action android:name="android.settings.CHANNEL_NOTIFICATION_SETTINGS" />

protos/network_mode_choices.proto

+25 −7
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ option java_outer_classname = "NetworkModeChoicesProto"; 
// EnabledNetworks is a list which tries to categorized the entries of popup menu

// based on carrier network types available to the end user.



// Next tag: 13

// Next tag: 15

// TODO(b/268145152): rename the ENABLED_NETWORKS for good readability.

enum EnabledNetworks {

    // No EnabledNetworks specified.

    ENABLED_NETWORKS_UNSPECIFIED = 0;
@@ -17,39 +18,56 @@ enum EnabledNetworks { 
    ENABLED_NETWORKS_UNKNOWN = 1;



    // For the case where CDMA is supported and LTE is not prioritized over

    // CDMA.

    // CDMA (LTE, 3G, 1x, global).

    ENABLED_NETWORKS_CDMA_CHOICES = 2;



    // For the case where CDMA is supported and LTE is not available.

    // CDMA (3G, 1x)

    ENABLED_NETWORKS_CDMA_NO_LTE_CHOICES = 3;



    // For the case where CDMA is supported and LTE is available.

    // CDMA (LTE, Global)

    ENABLED_NETWORKS_CDMA_ONLY_LTE_CHOICES = 4;



    // For the case where TDSCDMA is primary network type.

    // TDSCDMA (LTE, 3G, 2G)

    ENABLED_NETWORKS_TDSCDMA_CHOICES = 5;



    // For the case where GSM and LTE options are removed from the menu.

    // (3G)

    ENABLED_NETWORKS_EXCEPT_GSM_LTE_CHOICES = 6;



    // For the case where GSM and 4G options are removed from the menu.

    // For the case where GSM option are removed from the menu. The wording of LTE is '4G'.

    // (4G, 3G)

    ENABLED_NETWORKS_EXCEPT_GSM_4G_CHOICES = 7;



    // For the case where GSM is removed from the menu, and both 4G/LTE are not an

    // option.

    // For the case where GSM option are removed from the menu. The wording of LTE is 'LTE'.

    // (LTE, 3G)

    ENABLED_NETWORKS_EXCEPT_GSM_CHOICES = 8;



    // For the case where LTE is disabled.

    // (3G, 3G)

    ENABLED_NETWORKS_EXCEPT_LTE_CHOICES = 9;



    // For the case where GSM related carrier with 4G/LTE supported.

    // For the case where GSM related carrier with 4G/LTE supported. The wording of LTE is '4G'.

    // (2G, 3G, 4G)

    ENABLED_NETWORKS_4G_CHOICES = 10;



    // For the case where GSM related carrier without 4G/LTE supported.

    // For the case where GSM related carrier with 4G/LTE supported. The wording of LTE is 'LTE'.

    // (2G, 3G, LTE)

    ENABLED_NETWORKS_CHOICES = 11;



    // For the case where world mode is enabled.

    // ("Global", "LTE / CDMA", "LTE / GSM / UMTS")

    PREFERRED_NETWORK_MODE_CHOICES_WORLD_MODE = 12;



    // For the case where GSM, 3G options are removed from the menu. The wording of LTE is '4G'.

    // (4G)

    ENABLED_NETWORKS_4G_CHOICES_EXCEPT_GSM_3G = 13;



    // For the case where GSM and 3G are removed from the menu. The wording of LTE is 'LTE'.

    // (LTE)

    ENABLED_NETWORKS_CHOICES_EXCEPT_GSM_3G = 14;

}



// A request for popup menu.

res/drawable-night/accessibility_button_navigation_tablet.xml

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

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

-->

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

    android:width="412dp"

    android:height="300dp"

    android:viewportWidth="412"

    android:viewportHeight="300">

  <path

      android:pathData="M28,0L384,0A28,28 0,0 1,412 28L412,272A28,28 0,0 1,384 300L28,300A28,28 0,0 1,0 272L0,28A28,28 0,0 1,28 0z"

      android:fillColor="#000000"/>

  <group>

    <clip-path

        android:pathData="M62.23,50.19L349.77,50.19A16,16 0,0 1,365.77 66.19L365.77,236.14A16,16 0,0 1,349.77 252.14L62.23,252.14A16,16 0,0 1,46.23 236.14L46.23,66.19A16,16 0,0 1,62.23 50.19z"/>

    <path

        android:pathData="M46.23,204.14h320v48h-320z"

        android:fillColor="#3D4043"/>

    <path

        android:pathData="M268.93,214.14C270.43,214.14 271.63,215.34 271.63,216.84C271.63,218.34 270.43,219.54 268.93,219.54C267.43,219.54 266.23,218.34 266.23,216.84C266.23,215.34 267.43,214.14 268.93,214.14ZM273.03,223.64V241.24H270.23V233.14H267.53V241.24H264.83V223.64C262.13,223.44 259.23,222.94 256.73,222.24L257.43,219.54C260.93,220.44 265.13,220.94 268.93,220.94C272.73,220.94 276.93,220.54 280.43,219.54L281.13,222.24C278.63,222.94 275.73,223.44 273.03,223.64Z"

        android:fillColor="#ffffff"/>

    <path

        android:pathData="M206.23,238.04C211.42,238.04 215.63,233.83 215.63,228.64C215.63,223.45 211.42,219.24 206.23,219.24C201.04,219.24 196.83,223.45 196.83,228.64C196.83,233.83 201.04,238.04 206.23,238.04Z"

        android:fillColor="#808589"/>

    <path

        android:pathData="M131.33,228.64L147.33,237.84V219.34L131.33,228.64Z"

        android:fillColor="#808589"/>

  </group>

  <path

      android:pathData="M62.23,51.69L349.77,51.69A14.5,14.5 0,0 1,364.27 66.19L364.27,236.14A14.5,14.5 0,0 1,349.77 250.64L62.23,250.64A14.5,14.5 0,0 1,47.73 236.14L47.73,66.19A14.5,14.5 0,0 1,62.23 51.69z"

      android:strokeWidth="3"

      android:fillColor="#00000000"

      android:strokeColor="#80868B"/>

  <path

      android:pathData="M311.45,50.35C311.45,48.98 312.56,47.87 313.92,47.87L322.84,47.87C324.2,47.87 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"

      android:fillColor="#80868B"/>

  <path

      android:pathData="M263.59,50.35C263.59,48.98 264.7,47.87 266.06,47.87L287.85,47.87C289.22,47.87 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"

      android:fillColor="#80868B"/>

  <path

      android:pathData="M268.93,259.69C251.31,259.69 236.93,245.3 236.93,227.69C236.93,210.07 251.31,195.69 268.93,195.69C286.55,195.69 300.93,210.07 300.93,227.69C300.93,245.3 286.55,259.69 268.93,259.69ZM268.93,198.38C252.84,198.38 239.72,211.51 239.72,227.6C239.72,243.69 252.84,256.81 268.93,256.81C285.02,256.81 298.14,243.69 298.14,227.6C298.14,211.51 285.02,198.38 268.93,198.38Z"

      android:fillColor="#729CEE"/>

</vector>
 
 No newline at end of file

res/drawable-night/accessibility_button_preview_base_tablet.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="412dp"

    android:height="300dp"

    android:viewportWidth="412"

    android:viewportHeight="300">

  <path

      android:fillColor="#FF000000"

      android:pathData="M384.18,300H27.82C12.53,300 0,287.17 0,271.52V28.48C0,12.83 12.53,0 27.82,0H384.29c15.18,0 27.71,12.83 27.71,28.48v243.15c0,15.54 -12.53,28.37 -27.82,28.37Z"/>

  <path

      android:pathData="M368.24,143.47L368.24,60.55c0,-5.67 -4.59,-10.26 -10.26,-10.26L54.02,50.29c-5.67,0 -10.26,4.59 -10.26,10.26L43.76,242.76c0,5.67 4.59,10.26 10.26,10.26L357.98,253.02c5.67,0 10.26,-4.59 10.26,-10.26v-99.29ZM365.88,243.14c0,4.15 -3.75,7.52 -7.9,7.52L54.02,250.66c-4.15,0 -7.9,-3.37 -7.9,-7.52L46.12,60.55c0,-4.15 3.75,-7.9 7.9,-7.9L357.98,52.65c4.15,0 7.9,3.75 7.9,7.9L365.88,243.14Z"

      android:fillColor="#80868b"/>

  <path

      android:pathData="M319.83,50.29c-0,-1.28 -1.04,-2.31 -2.31,-2.31h-23.11c-1.28,0 -2.31,1.03 -2.31,2.31h27.74Z"

      android:fillColor="#80868b"/>

  <path

      android:pathData="M344.42,50.29c-0,-1.28 -1.03,-2.31 -2.31,-2.31h-9.25c-1.28,0 -2.31,1.03 -2.31,2.31h13.87Z"

      android:fillColor="#80868b"/>

</vector>

res/drawable-night/accessibility_button_preview_large_floating_menu_tablet.xml

0 → 100644
+12 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="412dp"

    android:height="300dp"

    android:viewportWidth="412"

    android:viewportHeight="300">

  <path

      android:pathData="M365.76,226.17h-27.68c-14.95,0 -27.07,-12.18 -27.07,-27.07s12.18,-27.07 27.07,-27.07h27.68v1.76h-27.68c-14.01,0 -25.37,11.37 -25.37,25.37s11.37,25.37 25.37,25.37h27.68v1.62Z"

      android:fillColor="#80868b"/>

  <path

      android:pathData="M337.95,178.94c-11.16,0 -20.16,9.07 -20.16,20.16 0,11.16 9.07,20.16 20.16,20.16s20.16,-9.07 20.16,-20.16c0.07,-11.16 -8.93,-20.16 -20.16,-20.16ZM337.95,188.62c1.15,0 2.1,0.95 2.1,2.1 0,1.15 -0.95,2.1 -2.1,2.1s-2.1,-0.95 -2.1,-2.1c0,-1.15 1.02,-2.1 2.1,-2.1ZM341.2,196.06v13.74h-2.1v-6.36h-2.1v6.36h-2.17v-13.74c-2.1,-0.2 -4.4,-0.54 -6.36,-1.01l0.54,-2.1c2.77,0.68 6.02,1.01 9,1.01s6.23,-0.34 9,-1.01l0.54,2.1c-1.96,0.47 -4.26,0.81 -6.36,1.01Z"

      android:fillColor="#d9dbdf"/>

</vector>