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

Merge "Change error and none messages" into rvc-dev am: 695deeae89

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872618

Change-Id: I3b8eb57970a1756f166ed267876bf73bbc5085fd
This commit is contained in:
Fabian Kozynski
2020-06-16 13:46:25 +00:00
committed by Automerger Merge Worker
parent ebdc01a8f3 695deeae89
commit 43b15b0f68
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/controls_management_list_margin" android:layout_marginTop="@dimen/controls_management_list_margin"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_marginStart="@dimen/controls_management_status_side_margin"
android:layout_marginEnd="@dimen/controls_management_status_side_margin"
android:gravity="center_horizontal" android:gravity="center_horizontal"
/> />

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

@@ -1325,8 +1325,8 @@
<dimen name="controls_management_editing_list_margin">48dp</dimen> <dimen name="controls_management_editing_list_margin">48dp</dimen>
<dimen name="controls_management_editing_divider_margin">24dp</dimen> <dimen name="controls_management_editing_divider_margin">24dp</dimen>
<dimen name="controls_management_apps_extra_side_margin">8dp</dimen> <dimen name="controls_management_apps_extra_side_margin">8dp</dimen>
<dimen name="controls_management_apps_top_margin"></dimen>
<dimen name="controls_management_zone_top_margin">32dp</dimen> <dimen name="controls_management_zone_top_margin">32dp</dimen>
<dimen name="controls_management_status_side_margin">16dp</dimen>
<dimen name="controls_management_page_indicator_height">24dp</dimen> <dimen name="controls_management_page_indicator_height">24dp</dimen>
<dimen name="controls_management_checkbox_size">25dp</dimen> <dimen name="controls_management_checkbox_size">25dp</dimen>
<dimen name="controls_title_size">24sp</dimen> <dimen name="controls_title_size">24sp</dimen>

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

@@ -2741,8 +2741,10 @@
<!-- Controls management favorites screen, See other apps with changes made [CHAR LIMIT=NONE] --> <!-- Controls management favorites screen, See other apps with changes made [CHAR LIMIT=NONE] -->
<string name="controls_favorite_toast_no_changes">Changes not saved</string> <string name="controls_favorite_toast_no_changes">Changes not saved</string>
<!-- Controls management controls screen error on load message [CHAR LIMIT=60] --> <!-- Controls management controls screen error on load message [CHAR LIMIT=NONE] -->
<string name="controls_favorite_load_error">The list of all controls could not be loaded.</string> <string name="controls_favorite_load_error">Controls could not be loaded. Check the <xliff:g id="app" example="System UI">%s</xliff:g> app to make sure that the app settings haven\u2019t changed.</string>
<!-- Controls management controls screen no controls found on load message [CHAR LIMIT=NONE] -->
<string name="controls_favorite_load_none">Compatible controls unavailable</string>
<!-- Controls management controls screen header for Other zone [CHAR LIMIT=60] --> <!-- Controls management controls screen header for Other zone [CHAR LIMIT=60] -->
<string name="controls_favorite_other_zone_header">Other</string> <string name="controls_favorite_other_zone_header">Other</string>

13
packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt
View File

@@ -79,6 +79,7 @@ class ControlsFavoritingActivity @Inject constructor(
private lateinit var structurePager: ViewPager2 private lateinit var structurePager: ViewPager2
private lateinit var statusText: TextView private lateinit var statusText: TextView
private lateinit var titleView: TextView private lateinit var titleView: TextView
private lateinit var subtitleView: TextView
private lateinit var pageIndicator: ManagementPageIndicator private lateinit var pageIndicator: ManagementPageIndicator
private var mTooltipManager: TooltipManager? = null private var mTooltipManager: TooltipManager? = null
private lateinit var doneButton: View private lateinit var doneButton: View
@@ -165,7 +166,12 @@ class ControlsFavoritingActivity @Inject constructor(
structurePager.adapter = StructureAdapter(listOfStructures) structurePager.adapter = StructureAdapter(listOfStructures)
structurePager.setCurrentItem(structureIndex) structurePager.setCurrentItem(structureIndex)
if (error) { if (error) {
statusText.text = resources.getText(R.string.controls_favorite_load_error) statusText.text = resources.getString(R.string.controls_favorite_load_error,
appName ?: "")
subtitleView.visibility = View.GONE
} else if (listOfStructures.isEmpty()) {
statusText.text = resources.getString(R.string.controls_favorite_load_none)
subtitleView.visibility = View.GONE
} else { } else {
statusText.visibility = View.GONE statusText.visibility = View.GONE
} }
@@ -266,8 +272,9 @@ class ControlsFavoritingActivity @Inject constructor(
titleView = requireViewById<TextView>(R.id.title).apply { titleView = requireViewById<TextView>(R.id.title).apply {
text = title text = title
} }
requireViewById<TextView>(R.id.subtitle).text = subtitleView = requireViewById<TextView>(R.id.subtitle).apply {
resources.getText(R.string.controls_favorite_subtitle) text = resources.getText(R.string.controls_favorite_subtitle)
}
structurePager = requireViewById<ViewPager2>(R.id.structure_pager) structurePager = requireViewById<ViewPager2>(R.id.structure_pager)
structurePager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() { structurePager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
override fun onPageSelected(position: Int) { override fun onPageSelected(position: Int) {