Bill Yi
f7c06375b1
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8
2p: 737ee1e1a7
am: fa29c0c3bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062875
Change-Id: I11013b1af35da8dfc6794f1fd656df9ea46d2243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 17:12:04 +00:00
Julia Reynolds
e0d4b99626
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961
Change-Id: I805115970058ccaa97e4538955393c12bf5bb39d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:40:21 +00:00
TreeHugger Robot
964aeabd9e
Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824
Change-Id: Iaefe2c50673077f1aac0e77f03e27451911a2885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:39:55 +00:00
Calvin Pan
4f56ab0898
Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006
Change-Id: Ib72a28d7fbf8c7120ed9d1e3076ca5386de51fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:39:46 +00:00
Betty Chang
268fb81908
Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166
Change-Id: If9e1fa315a2c26369cc8d50292a53527d4027526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:37:56 +00:00
TreeHugger Robot
4d5385e6e3
Merge "Remove loading spinner from Premium SMS access" into tm-dev am: 611db9e8be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903584
Change-Id: I172b47e725fd08cd8f3af954611c0599b8e3a97d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:37:29 +00:00
YK Hung
2e7695458f
Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev am: 55fcb02aca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030883
Change-Id: I2573026d8cd8dd2dc8c0f9e8ff2842240a7f66a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:37:20 +00:00
Bill Yi
20df862686
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8
2p: 737ee1e1a7
am: fa29c0c3bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062875
Change-Id: I8b0e95cf44bb643eeae2578a8c8e799c35940888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:37:09 +00:00
Bonian Chen
5ef52de6b2
Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev
2022-04-29 16:00:31 +00:00
Bonian Chen
7bdf717410
Merge "[Settings] Rename title of SIM UI when changed" into tm-dev
2022-04-29 15:59:32 +00:00
TreeHugger Robot
38989c9c6a
Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev
2022-04-29 15:16:44 +00:00
Jan Tomljanovic
297028ea69
Merge "Update the SafetyCenter icon" into tm-dev
2022-04-29 13:38:38 +00:00
TreeHugger Robot
30bba3bbdb
Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev
2022-04-29 09:51:21 +00:00
TreeHugger Robot
5d31a69d65
Merge "Remove tab symbol for app pinning strings" into tm-dev
2022-04-29 09:43:23 +00:00
Bonian Chen
ba943c9b94
[Settings] Rename title of SIM UI when changed
...
Title of subscription page should align with the SIM card.
Bug: 230308627
Test: local
Change-Id: Iab9ba25ac8c3faf7d37f97c8f3f3488cbaa2e228
2022-04-29 09:10:47 +00:00
Chaohui Wang
71e03076cd
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev
2022-04-29 08:26:24 +00:00
Tsung-Mao Fang
a95b12f921
Remove tab symbol for app pinning strings
...
The pinning description can't align together
in certain device.
To mitigate the alignment problem, we try to
remove the \t character now.
Test: visual
Fix: 222617691
Change-Id: I35974caf9d6fa316a6e4a0a5200ccab6a80f915b
2022-04-29 07:41:33 +00:00
Tom Hsu
1d0f85a3d6
Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev
2022-04-29 07:14:14 +00:00
Arc Wang
a3c7f8482a
Merge "Prevent side channel package installation enumeration" into tm-dev
2022-04-29 07:12:06 +00:00
Bonian Chen
0f68faf996
[Settings] Avoid from crash UI when querying data usage
...
Screen update been requested while querying data usage and response not
yet available.
This change tried to avoid from updating the UI in this case.
Bug: 210664126
Test: local
Change-Id: Id055fbd441936a9842b4acc978a894a855165bb7
2022-04-29 14:28:19 +08:00
Julia Reynolds
312de956ec
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev
2022-04-29 05:11:26 +00:00
TreeHugger Robot
fc6cb73d29
Merge "Hide running time information for "Android System" entry" into tm-dev
2022-04-29 04:32:41 +00:00
Calvin Pan
8ad2642b5f
Merge "Add unit test for AppLocalePickerActivity" into tm-dev
2022-04-29 03:56:56 +00:00
Betty Chang
7711207ba5
Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev
2022-04-29 03:33:55 +00:00
Amy Hsu
19b9978591
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev
2022-04-29 03:25:34 +00:00
ykhung
1c3cb4505c
Hide running time information for "Android System" entry
...
Hide the running time information for "Android System" entry, since this
entry will combine multiple system components together. It will provide
incorrect running time information. The getRealUid() method maps many
UIDs to Process.SYSTEM_UID(1000), which results in combining all of
those UIDs into one "Android System" entry. This is the expected behavior.
Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I0aece0f1e86c36e55a2b5a966b4da9fdea14c748
2022-04-29 02:40:07 +00:00
TreeHugger Robot
611db9e8be
Merge "Remove loading spinner from Premium SMS access" into tm-dev
2022-04-29 02:30:14 +00:00
YK Hung
55fcb02aca
Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev
2022-04-29 01:14:33 +00:00
TreeHugger Robot
0a2b1de3a5
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2022-04-28 22:57:53 +00:00
Prabal Singh
7642301f28
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: I0e90fc35f7916ae920ce08a2da996d69e01cf80f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:51:44 +00:00
Prabal Singh
89e0eda197
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: Ibfa6243c7bb5757515ed2388f2acec1547c023d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:41:46 +00:00
Weng Su
5e3d75a6f9
Show restricted message in Wi-Fi Direct summary
...
- See the result screenshot in b/203168953#comment9
Bug: 203168953
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiP2PPreferenceControllerTest
Change-Id: I87ad6d7554fbb4aa86d4617438fa359c67544812
2022-04-29 03:41:56 +08:00
Bill Yi
fa29c0c3bc
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8
2p: 737ee1e1a7
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062875
Bug: 205460459
Change-Id: Ic315f239b7f44fccb3ffdf859a920c7bbdda7602
2022-04-28 18:52:14 +00:00
Bill Yi
737ee1e1a7
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062875
Bug: 205460459
Change-Id: I51afb40dfedcc3495b937de9d81e15c82a3bf90b
2022-04-28 18:51:58 +00:00
Bill Yi
bf87406634
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062875
Bug: 205460459
Change-Id: Ia2ea434fb2d27315227d57f23eb63bae7ecb821a
2022-04-28 18:51:57 +00:00
Bill Yi
b81da264a8
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: I93c43875f9bc7b4cb45bb663c70410fa3fcaeead
2022-04-28 18:48:59 +00:00
Bill Yi
aedbfeb8b8
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: I5bb2a5d970bbdff0ea715cef8f0fca7bd052a670
2022-04-28 18:46:21 +00:00
Bill Yi
42c15dc26c
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: Ie80b96d07d3e8bd2c55b86e0af83bdb6a418b3fc
2022-04-28 18:43:59 +00:00
Bill Yi
ac6b0bdef6
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: I669099ad00ba7d90013836e3d456d530ae725b2f
2022-04-28 18:39:25 +00:00
Weng Su
4e34e65228
Show restricted message in Wi-Fi hotspot summary
...
- Refine WifiTetherPreferenceController
- See the result screenshot in b/203168953#comment8
Bug: 203168953
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
Change-Id: If094178eb0cd9ccf20ff3899dc4b087b45c66f6b
2022-04-28 18:28:49 +00:00
Bill Yi
392df50da0
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: I67386b7749b6575747c0507e3841fa404c6a69f4
2022-04-28 18:23:10 +00:00
ykhung
c12b9500e6
Refine the BatteryUsageStats close() method invoke timing
...
Refine invoke batteryUsageStats.close() timing to 1) avoid closing it before the UI is ready to ignore showing the battery usage app list data for AOSP version, and 2) avoid close the BatteryUsageStats which is passed from caller components in the BatteryInfo with unexpected behavior.
Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I0f75580ac68d72b41fa9a7f43aa6ea694f0992ff
2022-04-28 17:16:04 +00:00
Prabal Singh
9a8f44227e
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev
2022-04-28 17:12:28 +00:00
Jan Tomljanovic
c15fb9ed81
Update the SafetyCenter icon
...
Test: manual
Bug: 230731934
Change-Id: I11a82348b77b5e162e9dfaf5bfa91642db709f6f
2022-04-28 17:09:05 +01:00
Chaohui Wang
ddedb31f6e
Fix flicker for Mobile data & Wi-Fi page
...
Both "Mobile data usage" & "Non-carrier data usage".
By,
1. Add header in onCreate() instead of onViewCreated()
2. Keep the space for Spinner, and preload initial cycles
3. Keep the space for 3 usage summaries
Bug: 191730864
Test: manual
Change-Id: I8c309c5f51ce6290383a2d10f75e41d0f207d61a
2022-04-28 23:00:57 +08:00
Prabal Singh
3e2d7f4581
Remove extra argument WorkPolicyUtil constructor
...
Only constructor is required for WorkPolicyInfo constructor. The other
dependencies can be derives
Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I7f35e5ed344d452190b333aad7fa823a010d17b3
2022-04-28 15:21:18 +01:00
tom hsu
b899bd3690
[Panlingual] Avoid activity restart during rotation
...
Bug: 230680942
Test: local
Change-Id: Ib64509fb73fb363ad4dd5c2163659346295f581d
2022-04-28 21:32:33 +08:00
Edgar Wang
963f1a0051
Revert "Update data_usage_bytes_editor spinner background"
...
This reverts commit 18f8850521
.
Reason for revert: the sysmptom fixed in SettingsSpinner side now.
Test: visual verify on the latest build
Change-Id: I683172a72597deaeb40b8facb6bd0a6cce2b9231
2022-04-28 20:46:00 +08:00
Automerger Merge Worker
7e2bf6724a
Merge "Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f
am: f9be4c5a5c" into tm-d1-dev-plus-aosp
2022-04-28 12:10:27 +00:00
Bonian Chen
aba0d1654d
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f
am: f9be4c5a5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: Ib66781f14b6ce6652bac2471399b621255f3524c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 12:10:24 +00:00