Chaohui Wang
c39fe57d8c
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: Id00a5e8d2342d20bc071e3128d6a140f48ef2c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:26:56 +00:00
Tom Hsu
4c85dde8b3
Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev am: 1d0f85a3d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030882
Change-Id: I042005a4ca30b0f660ad053d84e2b977e2b2a628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:26:48 +00:00
Arc Wang
1398e58cbf
Merge "Prevent side channel package installation enumeration" into tm-dev am: a3c7f8482a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944167
Change-Id: Ie9d9ed73dbd4eafdbfb77957d8ceb27e37e52640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 23:25:54 +00:00
Julia Reynolds
58f0b1d55d
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: I589aa8107d165479d380a23b18a4fbe74bdc5a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:51:50 +00:00
TreeHugger Robot
fbffb07088
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: Ic0fb3fbcf3229c65ceb99fcfbceaeb3a2665b94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:51:20 +00:00
Calvin Pan
215b87861a
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: Ib73ac117460a8229b9904c414b1a9cd99c6d0651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:51:11 +00:00
Betty Chang
4779a03d38
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: I7a0697dc1f8cc801d702cf33c385097c42816e35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:50:08 +00:00
TreeHugger Robot
05eb3510d4
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: I67831e6261c7722db40d6e24915f42495287b61e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:49:36 +00:00
YK Hung
8cda726e7f
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: I6a5042db0114e9d2da8748fb6a30a8f6aafae6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:49:27 +00:00
Bill Yi
de605396bf
[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: Iabd5e1550f5d74ebcf69a39d82f8db2d8a2a4c69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-29 16:49:17 +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
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
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
13ce7c8eaf
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: Ie1a4b549c089febb2bed325aace1b328b7adbf83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 20:42:55 +00: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
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
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
tom hsu
b899bd3690
[Panlingual] Avoid activity restart during rotation
...
Bug: 230680942
Test: local
Change-Id: Ib64509fb73fb363ad4dd5c2163659346295f581d
2022-04-28 21:32:33 +08:00
Bonian Chen
99de1117bd
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: I13f44ec1ec46b9646d07eaa33bce6e4286186d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 11:41:48 +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
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
d6e516f32f
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: I5b815a53018b3bed3ccde46087714e50930f9e56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 07:51:32 +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
d3a367c5a9
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: Ia6bda19a95508ea7ac5fc2a128b94a51247fd227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:37:44 +00:00
Stanley Wang
26fbf21152
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: I6c6f796ae15ba0dee9440d0830ed692acc7517d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 03:36:36 +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
87259241de
Delete Fast Pair Settings am: 3438e20da1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888
Change-Id: I456d514b3b7b3db14bbf6fcbfedf89f73128df6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-28 02:53:55 +00:00
Bill Yi
9ee24ae348
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-04-28 00:36:49 +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
b5852f6685
Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304
Change-Id: I01488a3ba0637820cccddaf245971110bb0ee6d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:42:57 +00:00
Yuri Lin
48f463d840
Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009
Change-Id: Idbc80220c6bb562cb64211df806f48db2cf4c13f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:42:48 +00:00
Bonian Chen
c406279030
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: If5d73a84e45719786462f0c178b0177035e332c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:42:39 +00:00
Lais Andrade
c09c49fcf2
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: I107d9d6220d4102ee7d592cf2a4f2f307d881302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:42:28 +00:00
TreeHugger Robot
f468355b99
Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068
Change-Id: I74b59fa059f6c1cf93def1d90c1d46c7d8478596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 16:42:03 +00:00
Bonian Chen
43cf210f90
Merge "[Settings] Fix flaky presubmit failure" into tm-dev
2022-04-27 16:23:09 +00:00
Yuri Lin
29c62e7873
Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev
2022-04-27 16:08:55 +00:00
Bonian Chen
68981a3004
[Settings] Fix flaky presubmit failure
...
Bug: 229689535
Test: unit test
Change-Id: Iabea21aa5d7dd9e489b7b5839c8fcc32c9ba979c
2022-04-27 15:58:06 +00:00