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

Commit 1f525aec authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9519047 from d2909c6c to tm-qpr3-release 

Change-Id: Ib1c408cee242d9995e05046dec35e0ca4e59f807
parents 41aaa2a5 d2909c6c

core/java/android/content/Intent.java

+2 −2
Original line number Diff line number Diff line
@@ -5737,7 +5737,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @hide

     */

    public static final String EXTRA_CHOOSER_CUSTOM_ACTIONS =

            "android.intent.extra.EXTRA_CHOOSER_CUSTOM_ACTIONS";

            "android.intent.extra.CHOOSER_CUSTOM_ACTIONS";



    /**

     * Optional argument to be used with {@link #ACTION_CHOOSER}.
@@ -5748,7 +5748,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @hide

     */

    public static final String EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION =

            "android.intent.extra.EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION";

            "android.intent.extra.CHOOSER_PAYLOAD_RESELECTION_ACTION";



    /**

     * An {@code ArrayList} of {@code String} annotations describing content for

core/java/android/service/chooser/ChooserAction.java

+4 −3
Original line number Diff line number Diff line
@@ -27,10 +27,9 @@ import java.util.Objects; 


/**

 * A ChooserAction is an app-defined action that can be provided to the Android Sharesheet to

 * be shown to the user when {@link android.content.Intent.ACTION_CHOOSER} is invoked.

 * be shown to the user when {@link android.content.Intent#ACTION_CHOOSER} is invoked.

 *

 * @see android.content.Intent.EXTRA_CHOOSER_CUSTOM_ACTIONS

 * @see android.content.Intent.EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION

 * @see android.content.Intent#EXTRA_CHOOSER_CUSTOM_ACTIONS

 * @hide

 */

public final class ChooserAction implements Parcelable {
@@ -88,6 +87,7 @@ public final class ChooserAction implements Parcelable { 
        return "ChooserAction {" + "label=" + mLabel + ", intent=" + mAction + "}";

    }



    @NonNull

    public static final Parcelable.Creator<ChooserAction> CREATOR =

            new Creator<ChooserAction>() {

                @Override
@@ -137,6 +137,7 @@ public final class ChooserAction implements Parcelable { 
         * object.

         * @return the built action

         */

        @NonNull

        public ChooserAction build() {

            return new ChooserAction(mIcon, mLabel, mAction);

        }

packages/SystemUI/res/layout/emergency_cryptkeeper_text.xml

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

<!--

  ~ Copyright (C) 2016 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

  -->



<com.android.systemui.statusbar.policy.EmergencyCryptkeeperText

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

        android:id="@+id/emergency_cryptkeeper_text"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:textAppearance="@style/TextAppearance.StatusBar.Clock"

        android:paddingStart="6dp"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:gravity="center_vertical|start"

        />
 
 No newline at end of file

packages/SystemUI/res/layout/status_bar.xml

+0 −7
Original line number Diff line number Diff line
@@ -149,11 +149,4 @@ 
        </FrameLayout>

    </LinearLayout>



    <ViewStub

        android:id="@+id/emergency_cryptkeeper_text"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout="@layout/emergency_cryptkeeper_text"

    />



</com.android.systemui.statusbar.phone.PhoneStatusBarView>

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+4 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ object Flags { 
        unreleasedFlag(174148361, "notification_inline_reply_animation", teamfood = true)



    val FILTER_UNSEEN_NOTIFS_ON_KEYGUARD =

        unreleasedFlag(254647461, "filter_unseen_notifs_on_keyguard", teamfood = true)

        releasedFlag(254647461, "filter_unseen_notifs_on_keyguard", teamfood = true)



    // TODO(b/263414400): Tracking Bug

    @JvmField
@@ -355,6 +355,9 @@ object Flags { 
    val MEDIA_TAP_TO_TRANSFER_DISMISS_GESTURE =

        unreleasedFlag(912, "media_ttt_dismiss_gesture", teamfood = true)



    // TODO(b/266157412): Tracking Bug

    val MEDIA_RETAIN_SESSIONS = unreleasedFlag(913, "media_retain_sessions")



    // 1000 - dock

    val SIMULATE_DOCK_THROUGH_CHARGING = releasedFlag(1000, "simulate_dock_through_charging")