diff options
| author | 2023-12-18 21:43:18 +0000 | |
|---|---|---|
| committer | 2024-01-12 18:52:33 +0000 | |
| commit | 301113eac35f2dc3efe1bca5d3465a9acdc8ff77 (patch) | |
| tree | a1b3107d2e086a16c199c6d1dc7586d5e7df6b9a | |
| parent | 5756cacd0bbc8934ed4dbde813fab2cbbbf8c69a (diff) | |
Make showing percentage texts configurable on shutdown dialog
Bug: 315235777
Test: Made a patch so the shutdown to update dialog screen would show up on each reboot, and stay there for some time.
(cherry picked from https://partner-android-review.googlesource.com/q/commit:f6fa76c6e6ec825e4da9508f8a018fc1408558ca)
Merged-In: I8a60596748fa3d1a4fbea7c115d52fba3a740c75
Change-Id: I8a60596748fa3d1a4fbea7c115d52fba3a740c75
| -rw-r--r-- | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/power/ShutdownThread.java | 7 |
3 files changed, 13 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 5be29a6d68b8..efacbfe524ff 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -6890,4 +6890,8 @@ <!-- Defines suitability of the built-in speaker route. Refer to {@link MediaRoute2Info} to see supported values. --> <integer name="config_mediaRouter_builtInSpeakerSuitability">0</integer> + + <!-- Whether to show a percentage text next to the progressbar while preparing to update the + device --> + <bool name="config_showPercentageTextDuringRebootToUpdate">true</bool> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index d12ef2b95f06..c09f94fef3b5 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -5311,4 +5311,7 @@ <!-- Android MediaRouter framework configs. --> <java-symbol type="integer" name="config_mediaRouter_builtInSpeakerSuitability" /> + + <!-- Shutdown thread config flags --> + <java-symbol type="bool" name="config_showPercentageTextDuringRebootToUpdate" /> </resources> diff --git a/services/core/java/com/android/server/power/ShutdownThread.java b/services/core/java/com/android/server/power/ShutdownThread.java index 871e98bf4ab3..4bf8a78a1f16 100644 --- a/services/core/java/com/android/server/power/ShutdownThread.java +++ b/services/core/java/com/android/server/power/ShutdownThread.java @@ -319,6 +319,11 @@ public final class ShutdownThread extends Thread { pd.setMax(100); pd.setProgress(0); pd.setIndeterminate(false); + boolean showPercent = context.getResources().getBoolean( + com.android.internal.R.bool.config_showPercentageTextDuringRebootToUpdate); + if (!showPercent) { + pd.setProgressPercentFormat(null); + } pd.setProgressNumberFormat(null); pd.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); pd.setMessage(context.getText( @@ -911,4 +916,4 @@ public final class ShutdownThread extends Thread { com.android.internal.R.string.config_defaultShutdownVibrationFile); } } -}
\ No newline at end of file +} |