Chaohui Wang
e54e855b1b
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd am: bda9049621
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070
Change-Id: Ib087add327143c0d12541e55ee586b01908af3a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:43:48 +00:00
Chaohui Wang
bda9049621
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070
Change-Id: I860b9d924cf2da922f3154008a194fe2ad0e3288
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:26:34 +00:00
Julia Reynolds
8380ae2717
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec am: e0d4b99626
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961
Change-Id: Id08cbd0e1c333c35296b9048ed871073c6286fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:29:27 +00:00
TreeHugger Robot
01b9111333
Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29 am: 964aeabd9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824
Change-Id: If2951fb77c4ff4d4f59c4b1d3e07bd1045b45373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:29:04 +00:00
Calvin Pan
e32850726b
Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f am: 4f56ab0898
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006
Change-Id: I1b9830f7419f947c6e9a060349d617342a8dce37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:28:55 +00:00
Betty Chang
e4f6fcba02
Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5 am: 268fb81908
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166
Change-Id: I1adec36e8839fb509b3bb6cde5d4953917ecea7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:28:05 +00:00
TreeHugger Robot
1b4d1b14e9
Merge "Remove loading spinner from Premium SMS access" into tm-dev am: 611db9e8be am: 4d5385e6e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903584
Change-Id: I269e4ed15a723fccd8dc95f184dec25c2dcb2415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:27:45 +00:00
YK Hung
2c3560fbbb
Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev am: 55fcb02aca am: 2e7695458f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030883
Change-Id: Ic9c2f1f9b03b554b8e876a59eb347a1f5be87bb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:27:34 +00:00
Prabal Singh
f52e82eb8c
Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e am: 7642301f28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601
Change-Id: I7e08a7863af94ea3db2138797f18747e046b40ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 18:01:38 +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
Chaohui Wang
71e03076cd
Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev
2022-04-29 08:26:24 +00: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
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
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
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
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
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
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
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
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
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
Xinyi Zhou
e2db47e9ab
Delete Fast Pair Settings am: 3438e20da1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: I76dc3c719352bfd0441a03adef1407b147cee9df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 02:54:55 +00:00
Xinyi Zhou
14c317a689
Delete Fast Pair Settings am: 3438e20da1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: Iefb16d41b1901b275f4a5019e78326de8d2e917d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 02:53:51 +00:00
Xinyi Zhou
3438e20da1
Delete Fast Pair Settings
...
Fast Pair will not be launched in T.
Test: -m
Fix: 228614515
Fix: 229356812
Change-Id: I173453e84f0d1b525ea4796ed875f53f30c20d96
2022-04-27 12:29:59 -07:00
Kweku Adams
d7189cc7ce
Make final factors configurable.
...
1. Add configuration support for the ongoing rewards (that are normally
less than 1 ARC).
2. Fix key/configuration of instant rewards
3. Fix UI string issue
Bug: 158300259
Bug: 189850067
Bug: 191876714
Bug: 191877052
Test: Use UI to change factors. Check Settings via adb and TARE dumpsys
Change-Id: I571e188faa6915ea74826b725c9883a825ab152a
2022-04-27 17:57:01 +00:00