Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix redlines and strings in Controls dialog" into rvc-dev am: e34b132442 am: 16199946ae

Browse Source 
Change-Id: I9ac154714c783c6e5b941f786709aa8ff7c7cf9e
This commit is contained in:
Fabian Kozynski
2020-05-05 14:03:38 +00:00
committed by Automerger Merge Worker
parent 539a5558ef 16199946ae
commit bcbd24bc2d
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/AndroidManifest.xml
View File

@@ -719,7 +719,7 @@
android:finishOnCloseSystemDialogs="true" android:finishOnCloseSystemDialogs="true"
android:showForAllUsers="true" android:showForAllUsers="true"
android:clearTaskOnLaunch="true" android:clearTaskOnLaunch="true"
android:launchMode="singleTask" android:launchMode="singleInstance"
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden" android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:visibleToInstantApps="true"/> android:visibleToInstantApps="true"/>

2
packages/SystemUI/res/layout/controls_dialog.xml
View File

@@ -18,8 +18,6 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/controls_dialog_padding"
android:layout_margin="@dimen/controls_dialog_padding"
> >
<include <include

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -1310,7 +1310,7 @@
<dimen name="controls_card_margin">2dp</dimen> <dimen name="controls_card_margin">2dp</dimen>
<item name="control_card_elevation" type="dimen" format="float">15</item> <item name="control_card_elevation" type="dimen" format="float">15</item>
<dimen name="controls_dialog_padding">8dp</dimen> <dimen name="controls_dialog_padding">32dp</dimen>
<dimen name="controls_dialog_control_width">200dp</dimen> <dimen name="controls_dialog_control_width">200dp</dimen>
<!-- Screen Record --> <!-- Screen Record -->

6
packages/SystemUI/res/values/strings.xml
View File

@@ -2710,9 +2710,9 @@
<!-- Controls dialog title [CHAR LIMIT=40] --> <!-- Controls dialog title [CHAR LIMIT=40] -->
<string name="controls_dialog_title">Add to device controls</string> <string name="controls_dialog_title">Add to device controls</string>
<!-- Controls dialog add to favorites [CHAR LIMIT=40] --> <!-- Controls dialog add to favorites [CHAR LIMIT=40] -->
<string name="controls_dialog_ok">Add to favorites</string> <string name="controls_dialog_ok">Add</string>
<!-- Controls dialog message [CHAR LIMIT=NONE] --> <!-- Controls dialog message. Indicates app that suggested this control [CHAR LIMIT=NONE] -->
<string name="controls_dialog_message"><xliff:g id="app" example="System UI">%s</xliff:g> suggested this control to add to your favorites.</string> <string name="controls_dialog_message">Suggested by <xliff:g id="app" example="System UI">%s</xliff:g></string>
<!-- Controls dialog confirmation [CHAR LIMIT=30] --> <!-- Controls dialog confirmation [CHAR LIMIT=30] -->
<string name="controls_dialog_confirmation">Controls updated</string> <string name="controls_dialog_confirmation">Controls updated</string>

6
packages/SystemUI/res/values/styles.xml
View File

@@ -768,6 +768,10 @@
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
</style> </style>
<style name="Theme.ControlsRequestDialog" parent="@style/Theme.SystemUI.MediaProjectionAlertDialog"/> <!-- The attributes used for title (textAppearanceLarge) and message (textAppearanceMedium)
are already as necessary:
* Title: headline, medium 20sp
* Message: body, 16 sp -->
<style name="Theme.ControlsRequestDialog" parent="@*android:style/Theme.DeviceDefault.Dialog.Alert"/>
</resources> </resources>

1
packages/SystemUI/src/com/android/systemui/controls/management/ControlsRequestReceiver.kt
View File

@@ -70,6 +70,7 @@ class ControlsRequestReceiver : BroadcastReceiver() {
ControlsProviderService.EXTRA_CONTROL.let { ControlsProviderService.EXTRA_CONTROL.let {
putExtra(it, intent.getParcelableExtra<Control>(it)) putExtra(it, intent.getParcelableExtra<Control>(it))
} }
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
} }
activityIntent.putExtra(Intent.EXTRA_USER_ID, context.userId) activityIntent.putExtra(Intent.EXTRA_USER_ID, context.userId)