Commit Graph

42089 Commits

Author SHA1 Message Date
Calvin Pan
492fdaf058 Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f am: 38fac79ee6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006

Change-Id: Ia51d0a83cddabc8ba6916aebc8305fa03478f01b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 21:07:24 +00:00
Betty Chang
3ea06f174e Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5 am: ec17c47421
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166

Change-Id: I9fbbf6adfe050182ebbe2d1888d3ee7778b9fa4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 21:05:44 +00:00
TreeHugger Robot
4942694f50 Merge "Remove loading spinner from Premium SMS access" into tm-dev am: 611db9e8be am: 70e4a209c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903584

Change-Id: I28d03b0fbe4652b6aa768b77354b8c698bdb3c70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:24:44 +00:00
YK Hung
6ff7a106b1 Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev am: 55fcb02aca am: fc95a8f973
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030883

Change-Id: Ie8099f28d548199f7860fd6d83525dce532bc054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:17:46 +00:00
Prabal Singh
158164e219 Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e am: 89e0eda197
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601

Change-Id: I8ad9c1b8e092818f6ae120cd87e54dd598615047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:04:06 +00:00
Calvin Pan
38fac79ee6 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: I0314d4cf0c8d2232da05fd6b8eb9f417d718ecbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 17:13:57 +00:00
Betty Chang
ec17c47421 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: I27aae2227a69fbe547a974e2d8a1054f1d87108d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 17:12:59 +00:00
TreeHugger Robot
70e4a209c8 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: I8145b6fae18d039c59cb7ad542d8623d94b4e3c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 17:12:25 +00:00
YK Hung
fc95a8f973 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: Ife069490f25bb4b7fbabf49992537711b21d5266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 17:12:15 +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
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
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
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
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
cb72c82a18 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: Ibf8b08764cba09c5d72130fd4ecad37960ea2062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 12:10:11 +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
783314ae4f Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev 2022-04-28 11:05:42 +00:00
PETER LIANG
0109d6100e 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: If9b7ad6fcce1288eb5c39d1d6150df0e52a3696e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 08:40:23 +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
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
5262325601 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: I20dad61683ad461bf3c16e15e3a49a54822cc7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 03:30:50 +00:00
Stanley Wang
602b1f3d9d 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: Ia927700b1a9e593e6b04e10338fedfb9ce188bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 03:29:14 +00:00
Xinyi Zhou
4be70892e9 Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: I44ecf5ea109b9a002a178f42d609a7fbf7bfcf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 03:27:55 +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
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
Bonian Chen
a725b0c3da Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e am: dbbab09d11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673

Change-Id: Id2c1fa8af2948da18269e729f32613bb33b23c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:35:17 +00:00
Lais Andrade
109b181126 Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: 9066672c7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337

Change-Id: I2495f0494ac54bf8b7e034a919e63870c2460b0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:35:05 +00:00
Bonian Chen
dbbab09d11 Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673

Change-Id: Idde5263cb84e0e7facb17bc9e6ff00e33d43673f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 16:43:39 +00:00
Lais Andrade
9066672c7d Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337

Change-Id: Id95a6ec5976aa397bac923a92601ea709b8fd8bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 16:43:29 +00:00
Bonian Chen
b92156c03e Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev 2022-04-27 15:57:30 +00:00
Lais Andrade
9c8d1e94fb Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev 2022-04-27 13:54:13 +00:00
Alex Johnston
8229b0fbf7 Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503 am: d45cab5850
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005

Change-Id: I0e601bf1e59337f17f9e025d4842842b118948e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 10:48:32 +00:00
Weng Su
342e16a4c1 Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b am: 6428d536c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025

Change-Id: I1b11216110c58e862e2f2d909f7cea393932c88b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 10:48:09 +00:00
Alex Johnston
d45cab5850 Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005

Change-Id: Ib3be129b788d2a02850ef0f29887063e3037600f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 10:46:56 +00:00
Weng Su
6428d536c6 Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025

Change-Id: I0bc8a5110999c1144b6441c158f20b57abba7ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 10:26:34 +00:00
Alex Johnston
7828dda503 Merge "Fix USB tethering grey out behaviour" into tm-dev 2022-04-27 10:21:50 +00:00
Weng Su
b6629ab55b Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev 2022-04-27 09:33:26 +00:00
Stanley Wang
10c9cf6cd5 Fixe the problem of invalid switch preference.
The source of this problem is that onBindViewHolder is called
after the user add the OnMainSwitchChangeListener. Then
preference gets a new MainSwitchBar in onBindViewHolder and
causes the listener to fail.

Bug: 223325900
Test: Manually test and observe the UI
Change-Id: I6e58c4cf035811bb8805e76bebb5fbb86c7a79da
2022-04-27 17:17:21 +08:00
Stanley Wang
ff185afde7 Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47 am: 6a58c2faf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767

Change-Id: Id255444e533e231df91699b6f33b2d97a31c2e56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 07:40:07 +00:00
Peter_Liang
fcce62aa77 Logging for the feature "Text and reading options" in Android T.
Logging for the status of five features “Font size”, “Display size”, “Bold Text”, “High contrast text”, and “Reset” in the “Display size and text” page.

Bug: 222661478
Test: manual test
Change-Id: I33060fca860e02ddac7716275e8682e70fbaff1f
2022-04-27 15:25:30 +08:00
Stanley Wang
6a58c2faf1 Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767

Change-Id: I0189eb7313984ec4989c6febde3b0e977ddb7ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 07:22:28 +00:00