Ale Nijamkin
c184a471bf
Merge "Brings back "Control from locked device" setting." into tm-qpr-dev am: d81ae0a645
am: 2a557b75fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20590947
Change-Id: Iefe3c423fae6c6eb720b1b816af196736089067f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:27:05 +00:00
Kuan Wang
bc4548b29e
Add BugReportContentProvider to support new battery usage architecture.
...
Test: make RunSettingsRoboTests + manually
Bug: 256123932
Change-Id: I8cc48f5c66e5cbd958bdd73ff8e7d6e555bd9c3b
2022-12-02 02:53:13 +00:00
Wesley Wang
7c9f11071c
[automerger skipped] Merge "Clean up useless defender dialog code" into tm-qpr-dev am: 2d30eaa3bd
am: 0c5e243f35
-s ours
...
am skip reason: Merged-In If3cbe4072c891f1af6b5aa4fb624e4e486c78ad6 with SHA-1 a725bac68c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20516820
Change-Id: I01228ca8f4306593acc6ad9b3797a2146ad45b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 02:09:35 +00:00
Wesley Wang
ed516cc492
[automerger skipped] Merge "Add dock defender battery tips" into tm-qpr-dev am: f218f350c4
am: eb565adf5d
-s ours
...
am skip reason: Merged-In Ib6c09df056744142f42f5e2a13252b58e54c7534 with SHA-1 8d11d9ceea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20489769
Change-Id: I873fa1567197f977c938bc47d0d8c3f716df0429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 02:09:26 +00:00
Bill Yi
a9b782d3f1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: ba89f20949
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20594782
Change-Id: Ic68ef1864d3acd846e028118ff06c6f96cfaed49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 01:57:54 +00:00
Bill Yi
2597fd1b82
Merge changes from topic "tc_change_22113013_19"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e56e42bc2a
Import translations. DO NOT MERGE ANYWHERE
2022-12-02 01:32:31 +00:00
Bill Yi
ba89f20949
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-02 01:32:31 +00:00
David Gutierrez
d7f49bf0db
Replaced Location and Location Service Page IDs with their appropriate page IDs.
...
Test: none
Bug: 260070770
Bug: 260051255
Change-Id: I96e7e4d5306d468dd32a9affac28bd8c3f90bb75
2022-12-01 19:38:10 +00:00
Bonian Chen
e15c2c2a5b
Merge "[Settings] Code refactor"
2022-12-01 16:29:14 +00:00
TreeHugger Robot
2e671a0247
Merge "Fix flaky fingerprintUdfpsOverlayEnrollment_PlaysAllAnimationsAssetsCorrectly"
2022-12-01 13:08:05 +00:00
Edgar Wang
aa9e26b73c
Merge "Avoid media transcode can be bypass guard of developer options"
2022-12-01 11:30:04 +00:00
Chaohui Wang
449987dce2
Merge "Clean up AllAppListModel.filter"
2022-12-01 10:21:21 +00:00
Vania Januar
912284de8e
Merge "Add a stylus controller to Bluetooth Device Details."
2022-12-01 10:16:31 +00:00
lbill
b19aeb63b6
Fix flaky fingerprintUdfpsOverlayEnrollment_PlaysAllAnimationsAssetsCorrectly
...
We should return the corresponding getStageThresholdSteps() for udfps test,
otherwise the test can simulate last stage only and make the test fail.
Bug: 228100413
Bug: 260659253
Test: make RunSettingsRoboTests ROBOTEST_FILTER= \
"com.android.settings.biometrics.fingerprint .FingerprintEnrollEnrollingTest"
Change-Id: I4c712c84f357f275e5a169d16d2ed382fa4494ef
2022-12-01 09:18:10 +00:00
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
Ale Nijamkin
2a557b75fe
Merge "Brings back "Control from locked device" setting." into tm-qpr-dev am: d81ae0a645
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20590947
Change-Id: I0c201a2a1fd594d81162c9e84fe5c775e602e5a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-01 01:26:37 +00:00
Ale Nijamkin
d81ae0a645
Merge "Brings back "Control from locked device" setting." into tm-qpr-dev
2022-12-01 00:50:42 +00:00
Chaohui Wang
33beb69e33
Clean up AllAppListModel.filter
...
Since it is same as default.
Bug: 260660819
Test: Make Settings
Change-Id: I7eab8843f44a3457805512bab0d8cb02e9427ca4
2022-12-01 00:40:39 +00:00
Zekan Qian
f8728be7e5
Merge "Use SpaIntent util in Settings."
2022-12-01 00:25:30 +00:00
Bonian Chen
bfacd938f6
[Settings] Code refactor
...
Create PreferenceController for each of the Preference presented on
screen, which allows SettingsFragment better control the behavior of
Preference.
Bug: 260540995
Test: auto and local test
Change-Id: Iadd9c10fb353d6304d61e65687a505c71a53179a
2022-11-30 23:42:35 +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
Bill Yi
24d1b2812e
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e56e42bc2a
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20594782
Change-Id: I425993e2f32f2d167dacf0484d2ba3d2042bd4f4
2022-11-30 22:05:22 +00:00
Wesley Wang
0c5e243f35
Merge "Clean up useless defender dialog code" into tm-qpr-dev am: 2d30eaa3bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20516820
Change-Id: Icd0d4853960504be5e6c358ab76af84bae752df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 17:21:44 +00:00
Wesley Wang
eb565adf5d
Merge "Add dock defender battery tips" into tm-qpr-dev am: f218f350c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20489769
Change-Id: I5944ee42fe0e6da8a3e3a815ec3cebbabb79b155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 17:21:36 +00:00
Joshua Mccloskey
b79c8c6eb4
Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro.""
2022-11-30 16:58:45 +00:00
Vania Januar
2df165a58a
Add a stylus controller to Bluetooth Device Details.
...
Feature is currently flagged behing SETTINGS_SHOW_STYLUS_PREFERENCES.
Bug: 251201006
Test: SettingsRoboTests StylusDevicesControllerTest
DD: go/stylus-connected-devices-doc
Change-Id: I438b7fe5ca1c94f9dfb506c8918d0e6cb005ca33
2022-11-30 16:06:14 +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
Wesley Wang
2d30eaa3bd
Merge "Clean up useless defender dialog code" into tm-qpr-dev
2022-11-30 11:57:01 +00:00
Wesley Wang
f218f350c4
Merge "Add dock defender battery tips" into tm-qpr-dev
2022-11-30 11:57:01 +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
Bill Yi
e56e42bc2a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7a6e52a2a16c90121e2450fc20f051af9de37493
2022-11-30 01:18:36 -08: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