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

Commit a23d0b32 authored by Vadim Caen's avatar Vadim Caen
Browse files

Change text and color of single app disable sub text 

Bug: 400877402
Test: MediaProjectionCompatChangeTest
Flag: com.android.systemui.media_projection_grey_error_text
Change-Id: Ib231de472da74baa44e4c2adec1f8cd857077f25
parent db608e9e

packages/SystemUI/aconfig/systemui.aconfig

+11 −0
Original line number Diff line number Diff line
@@ -2148,3 +2148,14 @@ flag { 
    description: "Enables return animations for status bar chips"

    bug: "202516970"

}



flag {

    name: "media_projection_grey_error_text"

    namespace: "systemui"

    description: "Set the error text color to grey when app sharing is hidden by the requesting app"

    bug: "390624334"

    metadata {

       purpose: PURPOSE_BUGFIX

    }

}

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1476,6 +1476,8 @@ 
    <string name="media_projection_entry_app_permission_dialog_continue_entire_screen">Share screen</string>

    <!-- 1P/3P apps disabled the single app projection option. [CHAR LIMIT=NONE] -->

    <string name="media_projection_entry_app_permission_dialog_single_app_disabled"><xliff:g id="app_name" example="Meet">%1$s</xliff:g> has disabled this option</string>

    <!-- Explanation that the app requesting the projection does not support single app sharing[CHAR LIMIT=70] -->

    <string name="media_projection_entry_app_permission_dialog_single_app_not_supported">Not supported by the app</string>

    <!-- Title of the activity that allows users to select an app to share to a 1P/3P app [CHAR LIMIT=70] -->

    <string name="media_projection_entry_share_app_selector_title">Choose app to share</string>

packages/SystemUI/src/com/android/systemui/mediaprojection/permission/BaseMediaProjectionPermissionViewBinder.kt

+7 −0
Original line number Diff line number Diff line
@@ -150,6 +150,13 @@ private class OptionsAdapter(context: Context, private val options: List<ScreenS 
            titleTextView.isEnabled = true

        } else {

            errorTextView.visibility = View.VISIBLE

            if (com.android.systemui.Flags.mediaProjectionGreyErrorText()) {

                errorTextView.isEnabled = false

                errorTextView.setTextColor(context.getColorStateList(R.color.menu_item_text))

                errorTextView.setText(

                    R.string.media_projection_entry_app_permission_dialog_single_app_not_supported

                )

            }

            titleTextView.isEnabled = false

        }

        return view