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
Bonian Chen
ae297c8f19
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: 69aa69a45d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: Ia1fdd76b65c635d05f3bd74ab4d1ce687794cbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 12:10:23 +00:00
Bonian Chen
69aa69a45d
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: If187192b7619e4b0dea0b565fbc124651b235466
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 11:42:57 +00:00
Bonian Chen
f9be4c5a5c
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991
Change-Id: I5f9c37b458f185ac261f182ae290950c2d2fe856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 11:41:24 +00:00
Bonian Chen
783314ae4f
Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev
2022-04-28 11:05:42 +00:00
PETER LIANG
4496dd6520
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: 17ddbadb74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: Ie5968648a599aaf4bfd45d2d3e8d34e66a9c30af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 08:42:30 +00:00
PETER LIANG
ec94752f9d
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: acdb3b8a60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: Ibd5b4a67660b826c0928b37bc9e6c3cd54ca9e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 08:42:08 +00:00
Calvin Pan
049aa73cb1
Add unit test for AppLocalePickerActivity
...
Bug: 223503670
Test: atest
Change-Id: I0e92be43d661dd3bff19c3274d1572ef1f4e9c46
2022-04-28 08:15:34 +00:00
PETER LIANG
17ddbadb74
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: I900480866ed1fb85fb7629223f37538c46ff11b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 07:53:30 +00:00
PETER LIANG
acdb3b8a60
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953
Change-Id: Ic8db083e3d479c6f85615c36113fa747ce10c62d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 07:51:22 +00:00
Amy Hsu
f1dfa76dba
[ScreenResolutionController] UI string update
...
Bug: b/230626771
Test: Check the string manually
Change-Id: Ibe8cde0ef743ef398edbc438ead130215f7294d0
2022-04-28 07:40:44 +00:00
PETER LIANG
27aa5f9d94
Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev
2022-04-28 06:45:11 +00:00
Kweku Adams
8ebc71d701
Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 664e3805a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: I513d7a13d671c8dc49e94ef38e4b4feb14a6c9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 05:19:40 +00:00
Stanley Wang
979ee5f856
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: f781d8a02a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: I5518011aaec7763b7d71461d722993d026a91713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 05:19:24 +00:00
Kweku Adams
664e3805a7
Merge "Make final factors configurable." into tm-dev am: 3663986909
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: I9705e9019fb5a2ef096e1c7a8a8bb6a29bbba0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:36:35 +00:00
Stanley Wang
f781d8a02a
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: I72be188119ae313ba3908dd9c10c1e5e99ce7ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:36:04 +00:00
Kweku Adams
59e93d5225
Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 4c5cbeb882
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: Ie840b13d8f234eb83978124781a4ff3796579da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:31:56 +00:00
Stanley Wang
6ef0f6fed7
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: 5e5ea25a2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: Id58665699afa3a9382bd71a3720650cca9c55537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:30:22 +00:00
Xinyi Zhou
425316caae
Delete Fast Pair Settings am: 3438e20da1 am: 14c317a689
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: Id001dbcfca557ec12118f3d9fd3d513fb1f5eb1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:30:18 +00:00
Xinyi Zhou
d318a79c25
Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: I20ade5a70e7c36297c969cb4cc6725c74cd14882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:27:59 +00:00
Kweku Adams
4c5cbeb882
Merge "Make final factors configurable." into tm-dev am: 3663986909
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486
Change-Id: I1b843304bb15bb3b719dbf906a4b96c29b58264c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:02:23 +00:00
Stanley Wang
5e5ea25a2b
Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076
Change-Id: Iff5be7799232d27c83d1a826d94c559c4d117ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:01:48 +00:00
Kweku Adams
3663986909
Merge "Make final factors configurable." into tm-dev
2022-04-28 02:59:29 +00:00
Stanley Wang
0e861f0993
Merge "Fixe the problem of invalid switch preference." into tm-dev
2022-04-28 02:59:20 +00:00