TreeHugger Robot
0ba8fffbcc
Merge "Fix the issue that no data is returned when there is no full charge data in the database."
2022-12-01 09:04:22 +00:00
Kuan Wang
362def5275
Fix the issue that no data is returned when there is no full charge data
...
in the database.
Test: make RunSettingsRoboTests + manual
Bug: 260938983
Bug: 253553141
Change-Id: Ie12f239ce83a6ac2cd95c1663cd82e2974a7eaf3
2022-12-01 14:39:03 +08:00
TreeHugger Robot
d5387cd1f1
[automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-dev am: 7aade1aced
-s ours am: 0d5b1df946
-s ours
...
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20581119
Change-Id: Ic6c1822298765f77de0a57ec7c78bdc40df69898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:39:09 +00:00
Arc Wang
287a6255cd
[automerger skipped] Settings 2-pane deep link vulnerabilities am: 434c8934c4
-s ours am: 866f356291
-s ours
...
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20581119
Change-Id: Ieacadc5d2458a4515f96635282a965a3c3f239b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:39:00 +00:00
TreeHugger Robot
0d5b1df946
[automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-dev am: 7aade1aced
-s ours
...
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20581119
Change-Id: I02b4b73e94d0770fb75a0e694f4c6cfbd9667d98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:11:54 +00:00
Arc Wang
866f356291
[automerger skipped] Settings 2-pane deep link vulnerabilities am: 434c8934c4
-s ours
...
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20581119
Change-Id: I6b91ab2869aa64cac8629fd5c1f014262cb3015e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 03:11:52 +00:00
TreeHugger Robot
7aade1aced
Merge "Settings 2-pane deep link vulnerabilities" into tm-dev
2022-12-01 02:31:14 +00:00
Zekan Qian
f8728be7e5
Merge "Use SpaIntent util in Settings."
2022-12-01 00:25:30 +00:00
Bonian Chen
c5bd302514
Merge "[Settings] Remove some warning message"
2022-11-30 23:38:54 +00:00
Dmitry Dementyev
d8c388a284
Merge "Show account name as a single line string."
2022-11-30 22:50:43 +00:00
Joshua Mccloskey
b79c8c6eb4
Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro.""
2022-11-30 16:58:45 +00:00
Tetiana Meronyk
7eadcb9b20
Merge "Remove system user from displaying in Storage Settings in HSUM"
2022-11-30 12:51:22 +00:00
Zekan Qian
0ce8a8993e
Use SpaIntent util in Settings.
...
Bug: 244122804
Test: unit-test
Change-Id: I5b2d02d102c87620331d4e91e654e848f5a8df6a
2022-11-30 20:43:09 +08:00
Jackson Michael Moreira Miranda
2122313bb5
Merge "Changing the process to create a new user"
2022-11-30 12:05:30 +00:00
Arc Wang
21fb769f9e
[automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b97498
-s ours am: 7c1b458844
-s ours am: b7b0658ebd
-s ours am: 9a21435d4e
-s ours am: 69b16997a7
-s ours
...
am skip reason: skipped by user arcwang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20533028
Change-Id: Ibae0f1ed7599f096084fafe8e400073bed4fe6c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 11:06:04 +00:00
Arc Wang
69b16997a7
[automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b97498
-s ours am: 7c1b458844
-s ours am: b7b0658ebd
-s ours am: 9a21435d4e
-s ours
...
am skip reason: skipped by user arcwang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20533028
Change-Id: I6554d137907046d0678201c97e70f1798a79353d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 10:36:33 +00:00
Nikhil Kumar
511daeb1f9
Merge "Hide remove user option for main user in multi user settings"
2022-11-30 10:29:49 +00:00
Arc Wang
9a21435d4e
[automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b97498
-s ours am: 7c1b458844
-s ours am: b7b0658ebd
-s ours
...
am skip reason: skipped by user arcwang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20533028
Change-Id: I99994909674e5ac279c3b59508b74c99aac07d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 09:57:46 +00:00
Arc Wang
a2ca625704
[automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b97498
-s ours am: 7c1b458844
-s ours am: 91e7a2f091
-s ours
...
am skip reason: skipped by user arcwang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20533028
Change-Id: If7d33bdb1deb280ec22aeaa847992629e5d4d29e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 09:57:12 +00:00
Arc Wang
b7b0658ebd
[automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b97498
-s ours am: 7c1b458844
-s ours
...
am skip reason: skipped by user arcwang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20533028
Change-Id: I3aac14cfd7983d08532721f61a339cc91fb249fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 09:30:44 +00:00
Arc Wang
91e7a2f091
[automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b97498
-s ours am: 7c1b458844
-s ours
...
am skip reason: skipped by user arcwang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20533028
Change-Id: I25b48493e34b4a8b6d339fa94f757181285af884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 09:30:22 +00:00
Arc Wang
7c1b458844
[automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b97498
-s ours
...
am skip reason: skipped by user arcwang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20533028
Change-Id: I30fbaf04797eb75d3d544870af8613436ea85726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 08:48:47 +00:00
Chaohui Wang
c2a42f2162
Update for AppListItem
...
Bug: 260660819
Test: Manually with Settings
Change-Id: I67b8ff2d8e280c18e191c63ca891a8d7d3706aed
2022-11-30 16:02:22 +08:00
Bonian Chen
5ced0af08b
[Settings] Remove some warning message
...
Replace startActivity by startActivityAsUser(UserHandle.SYSTEM)
to reduce some warning log created for SIM detection.
Bug: 260806431
Test: local, auto test
Change-Id: Ib571bf9db922ec27d2229e8a283768c12ba61430
2022-11-30 07:39:16 +00:00
Chaohui Wang
fb8200aef8
Merge "Add ResetAppPreferences to AllAppListPage"
2022-11-30 06:55:46 +00:00
Arc Wang
434c8934c4
Settings 2-pane deep link vulnerabilities
...
Settings app must not start an deep link Activity if
1. The deep link Activity is not exported.
or
2. Calling package does not have the permission to
start the deep link Activity.
Bug: 250589026
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsHomepageActivityTest
Change-Id: I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f
Merged-In: I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f
2022-11-30 06:09:43 +00:00
Chaohui Wang
8b49b96569
Merge "Fix R for BatteryInfo"
2022-11-30 06:01:55 +00:00
TreeHugger Robot
6f6a93fc5c
Merge "Add page id enum for storage settings"
2022-11-30 05:59:07 +00:00
Chaohui Wang
4003c679f1
Fix R for BatteryInfo
...
Bug: 260441791
Test: Make Settings
Change-Id: I4d330b5724a85fdd41f4415199143b4e64589151
2022-11-30 11:43:52 +08:00
TreeHugger Robot
7dcf42bd08
Merge "Apply new metric to picture in picture detail page"
2022-11-30 02:51:04 +00:00
Florian Mayer
a250c3926f
Merge "Rename ACTION_MEMTAG_SETTINGS"
2022-11-30 01:26:43 +00:00
Treehugger Robot
389af164d6
[automerger skipped] Merge "Only one channel is reserved for WifiP2pSettings" am: 4444a35bcf
am: 71a123db03
am: a7efff1ddb
-s ours
...
am skip reason: Merged-In I999b108bc3e3c22519398a55b503078c1069cef1 with SHA-1 b6c2ed6759
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2309227
Change-Id: I8117b61a9051c10c9b08d9d863d5300a5b80b315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 01:11:15 +00:00
TreeHugger Robot
8f34efe5cb
Merge "Add more details for translators."
2022-11-30 00:40:07 +00:00
Treehugger Robot
a7efff1ddb
Merge "Only one channel is reserved for WifiP2pSettings" am: 4444a35bcf
am: 71a123db03
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2309227
Change-Id: I5483d044093d711f6f521fc9cdd738dc9638c0fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 00:38:11 +00:00
Joshua Mccloskey
391a34f7d5
Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."
...
This reverts commit 3ca9965a96
.
Reason for revert: b/259709482
Change-Id: I1fcc8b3ecd42859af591a7b250edfedbbdf204e4
2022-11-30 00:30:53 +00:00
Treehugger Robot
71a123db03
Merge "Only one channel is reserved for WifiP2pSettings" am: 4444a35bcf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2309227
Change-Id: Ib9f5b095b2a69139ace91d319e9e649ac8948ed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 00:09:36 +00:00
Treehugger Robot
4444a35bcf
Merge "Only one channel is reserved for WifiP2pSettings"
2022-11-29 23:44:22 +00:00
Tyler Freeman
ea4109f048
Merge "feat(non linear font scaling): support up to 200% font scaling."
2022-11-29 23:43:32 +00:00
YK Hung
c95c5b1550
Merge "Replace the getBatteryLevel() method from SettingsLib API"
2022-11-29 23:29:47 +00:00
Florian Mayer
1d0681649d
Add more details for translators.
...
Bug: 245624194
Change-Id: Ib37852579124235f7fe11c108ff98569a3286536
2022-11-29 22:37:10 +00:00
TreeHugger Robot
60a724fefa
Merge "2/ Define pattern view size by UX deck"
2022-11-29 16:24:53 +00:00
ykhung
e77b5bbecb
Replace the getBatteryLevel() method from SettingsLib API
...
Bug: 260524172
Test: presubmit
Change-Id: Icb56abd3dc258dde142a956124dc12bbfd9ae889
2022-11-30 00:22:19 +08:00
Mill Chen
0eaf7226cc
Apply new metric to picture in picture detail page
...
- Apply SettingsEnums.SETTINGS_MANAGE_PICTURE_IN_PICTURE_DETAIL
Bug: 260059322
Test: make build
Change-Id: I6f1cb9742ec824525460abfbc0ac23d4b50ebfd6
2022-11-29 16:43:36 +08:00
Kuan Wang
20f6b1faaa
Merge "Populate new fields foreground_service_usage_time_in_ms, foreground_usage_consume_power, foreground_service_usage_consume_power, background_usage_consume_power and cached_usage_consume_power into database and pass them to UI."
2022-11-29 06:52:08 +00:00
Arc Wang
c3ccc6a20d
Merge "Fix flickering before transition animation of app search"
2022-11-29 06:01:39 +00:00
Arc Wang
fef9b97498
Settings 2-pane deep link vulnerabilities
...
Settings app must not start an deep link Activity if
1. The deep link Activity is not exported.
or
2. Calling package does not have the permission to
start the deep link Activity.
Bug: 250589026
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsHomepageActivityTest
Change-Id: I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f
Merged-In: I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f
2022-11-29 05:58:43 +00:00
Chaohui Wang
1b9e346fa9
Merge "Reduce flaky of AppStoragePreferenceTest"
2022-11-29 04:10:00 +00:00
Arc Wang
fbb154b1ef
Add page id enum for storage settings
...
- Add SettingsEnums.SETTINGS_STORAGE_PROFILE_SELECTOR
Bug: 260051818
Test: compilation
Change-Id: Ic68edc9754d6e18fb58fc5708fb4eb9c2b71ec9f
2022-11-29 12:05:13 +08:00
Arc Wang
3b80540e37
Fix flickering before transition animation of app search
...
ApplicationState.Session must be aware of ManageApplications
lifecycle to correctly activate/deactivate.
Bug: 245877468
Test: manual visual
Settings -> Apps -> All apps -> search -> click search item
Change-Id: Ia4e6da0c4e43dcd53f6b4ea3e2fa6ffec059b880
2022-11-29 04:03:30 +00:00
Kuan Wang
53a761f55b
Populate new fields foreground_service_usage_time_in_ms,
...
foreground_usage_consume_power, foreground_service_usage_consume_power,
background_usage_consume_power and cached_usage_consume_power into
database and pass them to UI.
Test: make RunSettingsRoboTests + manual
Bug: 256123455
Bug: 258124768
Change-Id: Ic46032f67eff5898f9d4182c517bbebe478eca01
2022-11-29 11:42:26 +08:00