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

Commit 1307cd5c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6652334 from 52853711 to rvc-release 

Change-Id: I0318164828b33bd45fd2e92bec06191df4ef9394
parents d61a4da6 52853711

core/java/android/app/Notification.java

+23 −17
Original line number Diff line number Diff line
@@ -96,9 +96,9 @@ import com.android.internal.util.ContrastColorUtil; 


import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.reflect.Array;

import java.lang.reflect.Constructor;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.List;

import java.util.Objects;
@@ -1620,7 +1620,7 @@ public class Notification implements Parcelable 
         * of non-textual RemoteInputs do not access these remote inputs.

         */

        public RemoteInput[] getDataOnlyRemoteInputs() {

            return (RemoteInput[]) mExtras.getParcelableArray(EXTRA_DATA_ONLY_INPUTS);

            return getParcelableArrayFromBundle(mExtras, EXTRA_DATA_ONLY_INPUTS, RemoteInput.class);

        }



        /**
@@ -1802,8 +1802,8 @@ public class Notification implements Parcelable 
                checkContextualActionNullFields();



                ArrayList<RemoteInput> dataOnlyInputs = new ArrayList<>();

                RemoteInput[] previousDataInputs =

                    (RemoteInput[]) mExtras.getParcelableArray(EXTRA_DATA_ONLY_INPUTS);

                RemoteInput[] previousDataInputs = getParcelableArrayFromBundle(

                        mExtras, EXTRA_DATA_ONLY_INPUTS, RemoteInput.class);

                if (previousDataInputs != null) {

                    for (RemoteInput input : previousDataInputs) {

                        dataOnlyInputs.add(input);
@@ -5368,8 +5368,8 @@ public class Notification implements Parcelable 
                big.setViewVisibility(R.id.actions_container, View.GONE);

            }



            RemoteInputHistoryItem[] replyText = (RemoteInputHistoryItem[])

                    mN.extras.getParcelableArray(EXTRA_REMOTE_INPUT_HISTORY_ITEMS);

            RemoteInputHistoryItem[] replyText = getParcelableArrayFromBundle(

                    mN.extras, EXTRA_REMOTE_INPUT_HISTORY_ITEMS, RemoteInputHistoryItem.class);

            if (validRemoteInput && replyText != null && replyText.length > 0

                    && !TextUtils.isEmpty(replyText[0].getText())

                    && p.maxRemoteInputHistory > 0) {
@@ -8155,8 +8155,9 @@ public class Notification implements Parcelable 
            if (mBuilder.mActions.size() > 0) {

                maxRows--;

            }

            RemoteInputHistoryItem[] remoteInputHistory = (RemoteInputHistoryItem[])

                    mBuilder.mN.extras.getParcelableArray(EXTRA_REMOTE_INPUT_HISTORY_ITEMS);

            RemoteInputHistoryItem[] remoteInputHistory = getParcelableArrayFromBundle(

                    mBuilder.mN.extras, EXTRA_REMOTE_INPUT_HISTORY_ITEMS,

                    RemoteInputHistoryItem.class);

            if (remoteInputHistory != null

                    && remoteInputHistory.length > NUMBER_OF_HISTORY_ALLOWED_UNTIL_REDUCTION) {

                // Let's remove some messages to make room for the remote input history.
@@ -9579,8 +9580,8 @@ public class Notification implements Parcelable 
                mFlags = wearableBundle.getInt(KEY_FLAGS, DEFAULT_FLAGS);

                mDisplayIntent = wearableBundle.getParcelable(KEY_DISPLAY_INTENT);



                Notification[] pages = getNotificationArrayFromBundle(

                        wearableBundle, KEY_PAGES);

                Notification[] pages = getParcelableArrayFromBundle(

                        wearableBundle, KEY_PAGES, Notification.class);

                if (pages != null) {

                    Collections.addAll(mPages, pages);

                }
@@ -10838,17 +10839,22 @@ public class Notification implements Parcelable 
    }



    /**

     * Get an array of Notification objects from a parcelable array bundle field.

     * Get an array of Parcelable objects from a parcelable array bundle field.

     * Update the bundle to have a typed array so fetches in the future don't need

     * to do an array copy.

     */

    private static Notification[] getNotificationArrayFromBundle(Bundle bundle, String key) {

        Parcelable[] array = bundle.getParcelableArray(key);

        if (array instanceof Notification[] || array == null) {

            return (Notification[]) array;

    @Nullable

    private static <T extends Parcelable> T[] getParcelableArrayFromBundle(

            Bundle bundle, String key, Class<T> itemClass) {

        final Parcelable[] array = bundle.getParcelableArray(key);

        final Class<?> arrayClass = Array.newInstance(itemClass, 0).getClass();

        if (arrayClass.isInstance(array) || array == null) {

            return (T[]) array;

        }

        final T[] typedArray = (T[]) Array.newInstance(itemClass, array.length);

        for (int i = 0; i < array.length; i++) {

            typedArray[i] = (T) array[i];

        }

        Notification[] typedArray = Arrays.copyOf(array, array.length,

                Notification[].class);

        bundle.putParcelableArray(key, typedArray);

        return typedArray;

    }

packages/SettingsLib/res/drawable/ic_media_display_device.xml

+6 −10
Original line number Diff line number Diff line
@@ -15,16 +15,12 @@ 
    limitations under the License.

-->

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

        android:width="14dp"

        android:height="11dp"

        android:viewportWidth="14"

        android:viewportHeight="11"

        android:tint="?android:attr/colorControlNormal">

        android:width="18dp"

        android:height="18dp"

        android:viewportWidth="18"

        android:viewportHeight="18">

    <path

        android:pathData="M10,10v1H4v-1H1.5A1.5,1.5 0,0 1,0 8.5v-7A1.5,1.5 0,

        0 1,1.5 0h11A1.5,1.5 0,0 1,14 1.5v7a1.5,1.5 0,0 1,-1.5 1.5H10zM1.5,

        1a0.5,0.5 0,0 0,-0.5 0.5v7a0.5,0.5 0,0 0,0.5 0.5h11a0.5,0.5 0,0 0,

        0.5 -0.5v-7a0.5,0.5 0,0 0,-0.5 -0.5h-11z"

        android:fillColor="#000000"

        android:pathData="M12,14V15H6V14H3.5C3.1022,14 2.7206,13.842 2.4393,13.5607C2.158,13.2794 2,12.8978 2,12.5V5.5C2,5.1022 2.158,4.7206 2.4393,4.4393C2.7206,4.158 3.1022,4 3.5,4H14.5C14.8978,4 15.2794,4.158 15.5607,4.4393C15.842,4.7206 16,5.1022 16,5.5V12.5C16,12.8978 15.842,13.2794 15.5607,13.5607C15.2794,13.842 14.8978,14 14.5,14H12ZM3.5,5C3.3674,5 3.2402,5.0527 3.1465,5.1465C3.0527,5.2402 3,5.3674 3,5.5V12.5C3,12.6326 3.0527,12.7598 3.1465,12.8536C3.2402,12.9473 3.3674,13 3.5,13H14.5C14.6326,13 14.7598,12.9473 14.8536,12.8536C14.9473,12.7598 15,12.6326 15,12.5V5.5C15,5.3674 14.9473,5.2402 14.8536,5.1465C14.7598,5.0527 14.6326,5 14.5,5H3.5Z"

        android:fillColor="#5F6368"

        android:fillType="evenOdd"/>

</vector>
 
 No newline at end of file

packages/SettingsLib/res/values-es-rUS/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="wifi_fail_to_scan" msgid="2333336097603822490">"No se pueden buscar las redes."</string>

    <string name="wifi_security_none" msgid="7392696451280611452">"Ninguna"</string>

    <string name="wifi_remembered" msgid="3266709779723179188">"Guardada"</string>

    <string name="wifi_remembered" msgid="3266709779723179188">"Guardado"</string>

    <string name="wifi_disconnected" msgid="7054450256284661757">"Desconectado"</string>

    <string name="wifi_disabled_generic" msgid="2651916945380294607">"Inhabilitada"</string>

    <string name="wifi_disabled_network_failure" msgid="2660396183242399585">"Error de configuración IP"</string>

packages/SettingsLib/res/values-gl/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
    <string name="wifi_no_internet" msgid="1774198889176926299">"Sen acceso a Internet"</string>

    <string name="saved_network" msgid="7143698034077223645">"Gardada por <xliff:g id="NAME">%1$s</xliff:g>"</string>

    <string name="connected_via_network_scorer" msgid="7665725527352893558">"Conectouse automaticamente a través de %1$s"</string>

    <string name="connected_via_network_scorer_default" msgid="7973529709744526285">"Conectada automaticamente a través dun provedor de valoración de rede"</string>

    <string name="connected_via_network_scorer_default" msgid="7973529709744526285">"Conectada automaticamente a través dun provedor de valoración de redes"</string>

    <string name="connected_via_passpoint" msgid="7735442932429075684">"Conectado a través de %1$s"</string>

    <string name="connected_via_app" msgid="3532267661404276584">"Wifi conectada a través de <xliff:g id="NAME">%1$s</xliff:g>"</string>

    <string name="available_via_passpoint" msgid="1716000261192603682">"Dispoñible a través de %1$s"</string>

packages/SettingsLib/res/values-mn/strings.xml

+6 −6
Original line number Diff line number Diff line
@@ -211,8 +211,8 @@ 
    <string name="adb_wireless_error" msgid="721958772149779856">"Алдаа"</string>

    <string name="adb_wireless_settings" msgid="2295017847215680229">"Wireless debugging"</string>

    <string name="adb_wireless_list_empty_off" msgid="1713707973837255490">"Боломжтой төхөөрөмжүүдийг харах болох ашиглахын тулд wireless debugging-г асаана уу"</string>

    <string name="adb_pair_method_qrcode_title" msgid="6982904096137468634">"Хурдан хариу үйлдлийн кодоор төхөөрөмжийг хослуул"</string>

    <string name="adb_pair_method_qrcode_summary" msgid="7130694277228970888">"Хурдан хариу үйлдлийн кодын сканнер ашиглан шинэ төхөөрөмжүүдийг хослуулна уу"</string>

    <string name="adb_pair_method_qrcode_title" msgid="6982904096137468634">"QR кодоор төхөөрөмжийг хослуул"</string>

    <string name="adb_pair_method_qrcode_summary" msgid="7130694277228970888">"QR кодын сканнер ашиглан шинэ төхөөрөмжүүдийг хослуулна уу"</string>

    <string name="adb_pair_method_code_title" msgid="1122590300445142904">"Хослуулах кодоор төхөөрөмжийг хослуулна уу"</string>

    <string name="adb_pair_method_code_summary" msgid="6370414511333685185">"Зургаан оронтой кодыг ашиглан шинэ төхөөрөмжүүдийг хослуулна уу"</string>

    <string name="adb_paired_devices_title" msgid="5268997341526217362">"Хослуулсан төхөөрөмжүүд"</string>
@@ -226,12 +226,12 @@ 
    <string name="adb_pairing_device_dialog_pairing_code_label" msgid="3639239786669722731">"Wi‑Fi хослуулах код"</string>

    <string name="adb_pairing_device_dialog_failed_title" msgid="3426758947882091735">"Хослуулалт амжилтгүй боллоо"</string>

    <string name="adb_pairing_device_dialog_failed_msg" msgid="6611097519661997148">"Төхөөрөмжийг ижил сүлжээнд холбосон эсэхийг шалгана уу."</string>

    <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"Хурдан хариу үйлдлийн кодыг скан хийж Wi-Fi-р төхөөрөмжийг хослуулна уу"</string>

    <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"QR кодыг скан хийж Wi-Fi-р төхөөрөмжийг хослуулна уу"</string>

    <string name="adb_wireless_verifying_qrcode_text" msgid="6123192424916029207">"Төхөөрөмжийг хослуулж байна…"</string>

    <string name="adb_qrcode_pairing_device_failed_msg" msgid="6936292092592914132">"Төхөөрөмжийг хослуулж чадсангүй. Хурдан хариу үйлдлийн код буруу эсвэл төхөөрөмжийг ижил сүлжээнд холбоогүй байна."</string>

    <string name="adb_qrcode_pairing_device_failed_msg" msgid="6936292092592914132">"Төхөөрөмжийг хослуулж чадсангүй. QR код буруу эсвэл төхөөрөмжийг ижил сүлжээнд холбоогүй байна."</string>

    <string name="adb_wireless_ip_addr_preference_title" msgid="8335132107715311730">"IP хаяг ба порт"</string>

    <string name="adb_wireless_qrcode_pairing_title" msgid="1906409667944674707">"Хурдан хариу үйлдлийн кодыг скан хийх"</string>

    <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"Хурдан хариу үйлдлийн кодыг скан хийж Wi-Fi-р төхөөрөмжийг хослуулна уу"</string>

    <string name="adb_wireless_qrcode_pairing_title" msgid="1906409667944674707">"QR кодыг скан хийх"</string>

    <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"QR кодыг скан хийж Wi-Fi-р төхөөрөмжийг хослуулна уу"</string>

    <string name="adb_wireless_no_network_msg" msgid="2365795244718494658">"Wi-Fi сүлжээнд холбогдоно уу"</string>

    <string name="keywords_adb_wireless" msgid="6507505581882171240">"adb, дебаг хийх, dev"</string>

    <string name="bugreport_in_power" msgid="8664089072534638709">"Алдаа мэдээлэх товчлол"</string>