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

Commit 7c3912e4 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Dismiss docked stack when opening non-resizable activity" into nyc-dev

parents 8f035a3c d53f0925

core/java/android/app/ITaskStackListener.aidl

+5 −0
Original line number Diff line number Diff line
@@ -40,4 +40,9 @@ oneway interface ITaskStackListener { 
     * Called when we launched an activity that we forced to be resizable.

     */

    void onActivityForcedResizable(String packageName, int taskId);



    /**

     * Callen when we launched an activity that is dismissed the docked stack.

     */

    void onActivityDismissingDockedStack();

}

core/res/res/values/strings.xml

+0 −6
Original line number Diff line number Diff line
@@ -4018,12 +4018,6 @@ 
    <!-- Lock-to-app unlock password string -->

    <string name="lock_to_app_unlock_password">Ask for password before unpinning</string>



    <!-- Multi-Window strings -->

    <!-- Warning message when an app that got forced to be resizable gets shown in split-screen -->

    <string name="dock_forced_resizable">App may not work with split-screen.</string>

    <!-- Warning message when we try to dock a non-resizeble tasks and launch it in fullscreen instead. -->

    <string name="dock_non_resizeble_failed_to_dock_text">App does not support split-screen.</string>



    <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->

    <string name="package_installed_device_owner">Installed by your administrator</string>

    <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->

core/res/res/values/symbols.xml

+0 −2
Original line number Diff line number Diff line
@@ -613,8 +613,6 @@ 
  <java-symbol type="string" name="display_manager_overlay_display_name" />

  <java-symbol type="string" name="display_manager_overlay_display_secure_suffix" />

  <java-symbol type="string" name="display_manager_overlay_display_title" />

  <java-symbol type="string" name="dock_forced_resizable" />

  <java-symbol type="string" name="dock_non_resizeble_failed_to_dock_text" />

  <java-symbol type="string" name="double_tap_toast" />

  <java-symbol type="string" name="durationDays" />

  <java-symbol type="string" name="durationDayHours" />

packages/SystemUI/res/layout/forced_resizable_activity.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,6 +22,6 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:text="@string/forced_resizable_info_text"

        android:text="@string/dock_forced_resizable"

        android:textColor="#ffffff"/>

</FrameLayout>
 
 No newline at end of file

packages/SystemUI/res/values/strings.xml

+6 −3
Original line number Diff line number Diff line
@@ -1557,9 +1557,6 @@ 
    <!-- Accessibility action for moving down the docked stack divider [CHAR LIMIT=NONE] -->

    <string name="accessibility_action_divider_move_right">Move right</string>



    <!-- Text that gets shown on top of current activity to inform the user that the system force-resized the current activity and that things might crash/not work properly [CHAR LIMIT=NONE] -->

    <string name="forced_resizable_info_text">App may not work with multi-window</string>



    <!-- Accessibility description of a QS tile while editing positions [CHAR LIMIT=NONE] -->

    <string name="accessibility_qs_edit_tile_label">Position <xliff:g id="position" example="2">%1$d</xliff:g>, <xliff:g id="tile_name" example="Wi-Fi">%2$s</xliff:g>. Double tap to edit.</string>
@@ -1587,4 +1584,10 @@ 
    <!-- Accessibility label for window when QS editing is happening [CHAR LIMIT=NONE] -->

    <string name="accessibility_desc_quick_settings_edit">Quick settings editor.</string>



    <!-- Multi-Window strings -->

    <!-- Text that gets shown on top of current activity to inform the user that the system force-resized the current activity and that things might crash/not work properly [CHAR LIMIT=NONE] -->

    <string name="dock_forced_resizable">App may not work with split-screen.</string>

    <!-- Warning message when we try to dock a non-resizeble tasks and launch it in fullscreen instead. -->

    <string name="dock_non_resizeble_failed_to_dock_text">App does not support split-screen.</string>



</resources>