Michael Mikhail
8cda408a2b
Merge "Add media on lock screen setting" into tm-qpr-dev am: c77ab55735
am: d06eaf6f43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19457762
Change-Id: If15ce6d0b86fb2eab04b7784e378387e2f776918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:22:40 +00:00
Oli Lan
e2815b7e11
Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
am: 03b1a52977
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I017c55ae2e7770bd52f1daca54e2aed7be05cb5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:21:18 +00:00
Michael Mikhail
d06eaf6f43
Merge "Add media on lock screen setting" into tm-qpr-dev am: c77ab55735
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19457762
Change-Id: I9bfdf646fb6191e201ce014b610cf612c037443f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:04:04 +00:00
Oli Lan
03b1a52977
Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I5a78c2328f8c68fb5bf15799a69479a82b8e7af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:03:51 +00:00
Julia Reynolds
4287420f87
Merge "Revert^2 "Improve App notification loading"" into tm-qpr-dev am: 635b3f065e
am: e8409ecf10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19583473
Change-Id: I76aa8f4112832225dc2ca62e0be229d9c476146d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 14:48:41 +00:00
Oli Lan
05031cc574
Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Icfcf27040f9402b736306cf19178feee9f2a774b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 14:46:20 +00:00
Michael Mikhail
c77ab55735
Merge "Add media on lock screen setting" into tm-qpr-dev
2022-08-22 14:46:06 +00:00
Oli Lan
b9bafa0d3d
Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev
2022-08-22 14:27:57 +00:00
Julia Reynolds
e8409ecf10
Merge "Revert^2 "Improve App notification loading"" into tm-qpr-dev am: 635b3f065e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19583473
Change-Id: I85fd316de253f7d3879962e74aece04db0f3f0f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 14:18:35 +00:00
Julia Reynolds
635b3f065e
Merge "Revert^2 "Improve App notification loading"" into tm-qpr-dev
2022-08-22 13:56:41 +00:00
Binyi Wu
34912fb2a4
Merge "Update survey triggering mechanisms"
2022-08-22 13:36:48 +00:00
Menghan Li
501d80afa4
Merge "Fix no show quick settings tutorial after device rotates"
2022-08-22 11:42:05 +00:00
wesleycwwang
27cbd5bccd
Update extra defend layout string
...
Bug: 235246949
Test: make RunSettingsRoboTests
Change-Id: I3a3afe2e47d90882bdc4e4180ea5c6b079efd828
2022-08-22 18:51:45 +08:00
Binyi Wu
d43ecab8f7
Update survey triggering mechanisms
...
Settings will send the Settings screen to a central decision-making
place instead of each page handling its own.
Bug: 236662190
Test: robotest, manual
Change-Id: Ibfbdd421c723158d8d317aa4a02d9b51f877316a
2022-08-22 17:38:23 +08:00
Bill Yi
9c441ad4fe
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia5f187a561427f4822814e50b6a490df46dc432d
2022-08-22 02:33:14 -07:00
Bill Yi
23c81a0a7f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If98f2b4da32441a1a198e663094cf2a9d0718a2c
2022-08-22 02:29:14 -07:00
Bill Yi
789b774cb2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I39edf1cef0326d044fa50b652adbddb6a7a2a437
2022-08-22 02:21:31 -07:00
Bill Yi
31ea59660b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I091646803b9c75b2bacb36c226d4f5a1a4c90535
2022-08-22 02:19:51 -07:00
Bill Yi
32ddcf7c21
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I39be64756b5d020673c662eb51e372997587ccc7
2022-08-22 02:18:18 -07:00
Jack Yu
bcf2efe31e
Add test cases for NfcSnoopLog and NfcVerboseVendorLog
...
Bug: 204397062
Test: make RunSettingsRoboTests
Change-Id: Id12e3c10dc04816d4a69692b2d922840a8e84c61
2022-08-22 09:16:30 +00:00
Bill Yi
7f6a1e9ded
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I68e8bba6d703fbe900adbb520cbd71fcbcc2635a
2022-08-22 02:15:08 -07:00
Bill Yi
6fc7e574e2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I03310212947a2e8042fcbaf9ea5b76f79eb5c283
2022-08-22 02:11:26 -07:00
Jack Yu
d270f29cc8
Show reboot dialog when users disable developer options
...
When NFC detailed logging mechanisms are enabled and users try to
disable develoepr options, show reboot request dialog to make sure
NFC logging mechanisms are also disabled.
Bug: 204397062
Test: manual
Change-Id: I531c85fd77934ad7821c480df07465a8cd8f24f9
2022-08-22 08:47:26 +00:00
Jack Yu
3d2aff896e
Add a new NFC developer setting option for NFC vendor verbose log
...
Add a new developer setting option to enable vendor verbose log.
Bug: 204397062
Test: manual
Change-Id: Ic837bbcc32979c44732e99d51e4dcf93eb201cf1
2022-08-22 08:46:59 +00:00
Jack Yu
b71de640b5
Add a new NFC developer setting option for NFCSNOOP
...
Add a new developer setting option to enable full NFCSNOOP log.
Bug: 204397062
Test: manual
Change-Id: I3fd34500e5e7093c9d77ff737987a35f6866814e
2022-08-22 08:42:20 +00:00
menghanli
057c5dc8ed
Fix no show quick settings tutorial after device rotates
...
Root cause: Render apps below the cutout area to make the fragment recreate multiple times when the device rotates. The tutorial status is not stored correctly and try to show the tutorial when activity is finishing.
Solution: Avoid showing the tutorial when the activity is finishing and store correct tutorial status after recreate.
Bug: 239578655
Test: Manual testing
Change-Id: I3ff12e23eb971f61280ebc89014b086dc348d734
2022-08-22 15:54:05 +08:00
Sayak Dutta
3feae1ce1f
[automerger skipped] Merge "Revamp SD card UX" into tm-qpr-dev am: e66ae3f9db
am: 05b7cb0225
-s ours
...
am skip reason: Merged-In I757abc6076fcc8f467d8faed9f090bcdd5774ff3 with SHA-1 9b432d54a6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19673917
Change-Id: Iece3bf00acd4a96067a024940c8328c43c84dcc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 07:00:12 +00:00
Sayak Dutta
05b7cb0225
Merge "Revamp SD card UX" into tm-qpr-dev am: e66ae3f9db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19673917
Change-Id: I589676bfca185db1bbefbe804e9512b72142676d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 06:33:54 +00:00
sayakiitg
9521748a77
Update back FooterButton visibility for navigation instead of back button
...
Bug: 201252175
Change-Id: I6c99b1173bd8ef90b89dedc49745fdb2bcf11318
(cherry picked from commit 40e436ff3b
).
Merged-In: I6c99b1173bd8ef90b89dedc49745fdb2bcf11318
2022-08-22 06:31:38 +00:00
Sayak Dutta
e66ae3f9db
Merge "Revamp SD card UX" into tm-qpr-dev
2022-08-22 06:13:30 +00:00
Wesley Wang
08345933df
Merge "Update Settings charging string" into tm-qpr-dev am: 4909c7923b
am: 7ffe4ed694
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19568529
Change-Id: Iaa3ff1fe5326ddce4752aa873424681ef34d284f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 03:02:24 +00:00
YK Hung
80bf09e5a7
Merge "Support data logging for battery usage new chart view"
2022-08-22 03:01:51 +00:00
Wesley Wang
7ffe4ed694
Merge "Update Settings charging string" into tm-qpr-dev am: 4909c7923b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19568529
Change-Id: I7a115aed0ce30980579c8b2afb6335182d78d3e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 02:44:03 +00:00
Kedar Chitnis
f4c320ae2f
Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGES
...
Bug b/214031645 has all IC reviews approved and the feature has been
merged and tested for more than 3 months. Hence removing the feature
flag.
Bug: 214031645
Test: SettingsTest, SystemUITests
Change-Id: Iccec0a6b2325f9309c25522ad3f093c6bc1f45e6
Merged-In: Iccec0a6b2325f9309c25522ad3f093c6bc1f45e6
2022-08-22 02:39:05 +00:00
Kedar Chitnis
3ff8586db8
Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGES
...
Bug b/214031645 has all IC reviews approved and the feature has been
merged and tested for more than 3 months. Hence removing the feature
flag.
Bug: 214031645
Test: SettingsTest, SystemUITests
Change-Id: Iccec0a6b2325f9309c25522ad3f093c6bc1f45e6
2022-08-22 02:35:14 +00:00
Wesley Wang
4909c7923b
Merge "Update Settings charging string" into tm-qpr-dev
2022-08-22 02:25:28 +00:00
Tiffany Nguyen
2c1decd7a0
Merge changes from topic "battery_usage_list"
...
* changes:
Align strings and UX across the different pages.
Move restricted apps page to new battery optimization page.
2022-08-19 21:04:08 +00:00
sayakiitg
efdedcdc15
Revamp SD card UX
...
Improve the SD card setup flow so that each formatting option is provided in a separate screen with clear description and illustration.Also make sure that guest users do not have any access to formatting options.
Test: Manual testing on Pixel Device
Screenshot1: https://screenshot.googleplex.com/WJwyxFkBtbSfZmN.png
Screenshot2: https://screenshot.googleplex.com/3oBcrrgRsKTxNPC.png
Bug: 201252175
Change-Id: I77df55c40fd99cabcfc6128084be035bb5b19531
Change-Id: I757abc6076fcc8f467d8faed9f090bcdd5774ff3
(cherry picked from commit 9b432d54a6
)
Merged-In: I757abc6076fcc8f467d8faed9f090bcdd5774ff3
2022-08-19 19:07:40 +00:00
TreeHugger Robot
025b194f5b
[automerger skipped] Merge "Show one SIM only for EAP-SIM when dual SIMs have the same carrier ID" into tm-qpr-dev am: 4a0bc2c34b
am: bd13405d8e
-s ours
...
am skip reason: Merged-In I56f956d20053d314f082ba185d661d8e0a0ef3cb with SHA-1 66922f4870
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19600285
Change-Id: I8742e3e1f84a1517f2c152f34f6874c3f030c108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-19 16:12:03 +00:00
TreeHugger Robot
bd13405d8e
Merge "Show one SIM only for EAP-SIM when dual SIMs have the same carrier ID" into tm-qpr-dev am: 4a0bc2c34b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19600285
Change-Id: I81eb13d2c651d25accc69f68afb634882daeca9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-19 14:39:14 +00:00
TreeHugger Robot
4a0bc2c34b
Merge "Show one SIM only for EAP-SIM when dual SIMs have the same carrier ID" into tm-qpr-dev
2022-08-19 14:22:11 +00:00
Zaiyue Xue
575972632b
Merge "Fix b/242989581: The two battery charts have the same label"
2022-08-19 11:38:41 +00:00
Wesley Wang
4dd92bf5a1
Update Settings charging string
...
- Update charging protected string
Bug: 236798712
Test: make and verify strings
Change-Id: I86e063191b42e98d8836a6dbe3b32ff3ce3bb8d0
2022-08-19 18:18:02 +08:00
Zaiyue Xue
8e11085436
Fix b/242989581: The two battery charts have the same label
...
Bug: 242989581
Fix: 242989581
Test: manual
Change-Id: I8fc6c13351b46f4e29daf2f28201d99d8087092f
2022-08-19 14:33:03 +08:00
YK Hung
f2bbdf5035
Merge "Implements the buttons layout for the extra defend" into tm-qpr-dev am: aa3262857c
am: 939f2a9eed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19633714
Change-Id: I582c5cc6df9b9454013b4435d261c336fc4e7a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-19 03:23:26 +00:00
Zaiyue Xue
65b635854f
Support data logging for battery usage new chart view
...
Bug: 242810430
Fix: 242810430
Test: presubmit
Change-Id: Ice30508bc20b5de631efee0db0160fe6ad710dbb
2022-08-19 11:05:17 +08:00
YK Hung
939f2a9eed
Merge "Implements the buttons layout for the extra defend" into tm-qpr-dev am: aa3262857c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19633714
Change-Id: I691685d2190e03c917e9cee6ef9dc94a94e97f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-19 03:04:12 +00:00
YK Hung
aa3262857c
Merge "Implements the buttons layout for the extra defend" into tm-qpr-dev
2022-08-19 02:43:57 +00:00
YK Hung
f2bc394a02
[automerger skipped] Merge "Port new version battery usage chart implementation from master to tm-qpr-dev." into tm-qpr-dev am: c586e1e427
am: 6992c28b4a
-s ours
...
am skip reason: Merged-In I9142c0d4e00dea3771777ba9aedeab07b635fa1a with SHA-1 284e049cc1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19569019
Change-Id: I22c590e6cd29aec418f9f5d9f2e0cde1759339e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-19 02:17:43 +00:00
YK Hung
6992c28b4a
Merge "Port new version battery usage chart implementation from master to tm-qpr-dev." into tm-qpr-dev am: c586e1e427
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19569019
Change-Id: I69ba753143ff1bb5fab2db8a53785540530e3c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-19 01:50:45 +00:00