Commit Graph

109018 Commits

Author SHA1 Message Date
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
wesleycwwang
27cbd5bccd Update extra defend layout string
Bug: 235246949
Test: make RunSettingsRoboTests
Change-Id: I3a3afe2e47d90882bdc4e4180ea5c6b079efd828
2022-08-22 18:51:45 +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
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
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
Wesley Wang
4909c7923b Merge "Update Settings charging string" into tm-qpr-dev 2022-08-22 02:25:28 +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
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
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
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
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
YK Hung
c586e1e427 Merge "Port new version battery usage chart implementation from master to tm-qpr-dev." into tm-qpr-dev 2022-08-19 01:30:51 +00:00
Joshua Mccloskey
4006c7e9e8 Merge "Added basic SecuritySettingsPref test" into tm-qpr-dev am: b87ada7c93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19658607

Change-Id: I70ee59c235d23d1de53ca3eebba4c34e847d332a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 00:55:10 +00:00
Joshua Mccloskey
b87ada7c93 Merge "Added basic SecuritySettingsPref test" into tm-qpr-dev 2022-08-19 00:37:16 +00:00
TreeHugger Robot
79eeb70843 [automerger skipped] Merge "Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID" into tm-qpr-dev am: e48008d287 -s ours
am skip reason: Merged-In I350fe637f506134770ccf316e47c0e225661bb6a with SHA-1 911573f2e1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19600176

Change-Id: I6adf2ec2e277abc1c4bdb61fae99654dbe807603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-18 20:46:53 +00:00
Weng Su
e76784f08c [automerger skipped] Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID am: dc4ad09291 -s ours
am skip reason: Merged-In I350fe637f506134770ccf316e47c0e225661bb6a with SHA-1 911573f2e1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19600176

Change-Id: I46b761771bd105053cb9b3683d59893911224215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-18 20:46:48 +00:00
TreeHugger Robot
e48008d287 Merge "Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID" into tm-qpr-dev 2022-08-18 20:30:20 +00:00
Joshua McCloskey
739ca9cc97 Added basic SecuritySettingsPref test
Test: atest SecuritySettingsTest
Bug: 234309000
Change-Id: I0d54ff17601ed6646c92472f03990a1dd3e4dc4d
2022-08-18 17:36:36 +00:00
Michael Mikhail
56e5b3da96 Add media on lock screen setting
Add a new setting that controls whether media on lock screen is enabled,
disregarding the notifications status. The new setting is available
under media and privacy settings.

Bug: 229915240
Test: atest MediaControlsLockScreenPreferenceControllerTest
Change-Id: I054f36efd635dc0535551d3058f9faf92196349d
2022-08-18 11:57:13 +00:00
Pajace Chen
f3496399dd Implements the buttons layout for the extra defend
Bug: 235246949
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.widget.CardPreferenceTest
Test: manual test
Change-Id: I1dc4ab31adf85c684a4c09bd6c9bcfb54b52dc3c
2022-08-18 10:16:05 +00:00
Kuan Wang
4db5c6ba57 Port new version battery usage chart implementation from master to tm-qpr-dev.
This cl is a merge of the following 36 cls:
ag/19250259	Duplicate BatteryChartPreferenceController and BatteryChartView into new files for better diff review purpose
ag/19279660	Use Mockito 4.6.1 API for BatteryChartPreferenceControllerV2Test
ag/19267975	Add class BatteryLevelData used to parcel the battery timestamps and levels. It behaves as an interface between UI and data.
ag/19289086	Refactor BatteryChartView X-axis labels. Instead of only timestamps, also support any string[] labels.
ag/19238586	Add interpolation for the history data since last full charge loaded from database.
ag/19331746	Return raw history map in function getHistoryMapSinceLastFullCharge.
ag/19308838	In BatteryChartViewV2, use levels.length-1 to replace mTrapezoidCount. So the chartview could show any number of slots as the given levels length-1.
ag/19332266	Add class BatteryDiffData used to parcel battery usage data
ag/19331467	Refactor Battery Chart View State Controll
ag/19358207	Add DataProcessor to process raw history map for UI.
ag/19332276	Add battery chart view model.
ag/19394744	Update trapezoid validation in battery chart view.
ag/19379730	Support daily and hourly battery chartview.
ag/19428426	Improve X axis labels in battery chart (1)
ag/19446215	Improve X axis labels in battery chart (2)
ag/19394745	Add the async task to compute diff usage data and load labels and icons.
ag/19447624	Support showing app usage list for two battery charts
ag/19500907	Updates battery usage messages from last 24hr to last full charge. (Part1: V2 files)
ag/19505324	Update the selected period message in battery chart
ag/19500905	Updates battery usage messages from last 24hr to last full charge. (Part2: non-V2 files)
ag/19510363	Update usage data for EBS app usage list and App usage detail from 24 hours to last full charge.
ag/19523184	Update usage data for EBS app usage list and App usage detail from 24 hours to last full charge.
ag/19534864	Add margin between battery daily and hourly charts
ag/19491093	Always do interpolation for battery level data in daily chart.
ag/19565630	Avoid NullPointerException when batteryLevelData is null.
ag/19561239	Fix b/241872474 Battery usage page will crash when selecting the last hour chart bar, going to app detail page, and going back
ag/19565633	Fix b/241885070: Unexpected texts moving when going back to battery usage page
ag/19534850	New way to draw battery chart axis labels
ag/19561240	Switch Battery Usage Chart from V1 to V2.
ag/19561338	Switch Battery Usage Chart from V1 to V2.
ag/19600174	Fix b/242254055 Battery usage initial screen improvements (long data loading time)
ag/19600284	Fix b/242252080: Add padding space on the top of the battery chart
ag/19647338	Consider usage map valid even if [all][all] is null.
ag/19634227	Use new content uri everytime to avoid cache
ag/19600177	Fix b/242009481: Refine the battery usage chart timestamp label rule
ag/19647337	Fix b/242809981 Charge battery to 100% when battery usage page opened, the chart will refresh, but the app list isn't refreshed in that case.

Test: manual
Bug: 239491373
Bug: 236101166
Bug: 236101687
Fix: 236101166
Change-Id: I7de8d9dcee14627da10752534991f1ec9f616020
Merged-In: I9142c0d4e00dea3771777ba9aedeab07b635fa1a
2022-08-18 10:53:41 +08:00
Joe Bolinger
e167f9ed0a Cache context for generateChallenge response.
Fix: 232678514
Test: manual
Change-Id: I7deac5f296260bf667b15300e600195c42c0cbc1
2022-08-18 00:49:38 +00:00
Treehugger Robot
ac7a368afd Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b am: cdacabf984 am: 49a0bbc650
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: I9c4c43088154202d5818b29d010f053a7630ec90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 20:29:36 +00:00
Treehugger Robot
49a0bbc650 Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b am: cdacabf984
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: I1ce70edf6d735df8340f4ec483dbe3fc4df7b897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 20:11:01 +00:00
Treehugger Robot
cdacabf984 Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: Iac4c2bea65889fbb3847794fc7a8b1d23ff2f9b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 19:44:42 +00:00
Tsung-Mao Fang
a2172abb33 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours am: 662e5722b3 -s ours
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561

Change-Id: I3def89776e44038f96c7ba7e9bcabaa81a2cd31d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 19:26:25 +00:00
Tsung-Mao Fang
d71843cb7a [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours am: a27edf0a5a -s ours
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561

Change-Id: Iab55b2c0976dae5e333ffdcebeddcc65ac536696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 19:26:03 +00:00
Treehugger Robot
a89e7aea3b Merge "Fix array-related errorprone warnings" am: a93e78f781
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: I644d5974c31a216b360a2dc1d1b1c156f6288f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 19:25:27 +00:00
Tsung-Mao Fang
2ecdc63708 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 am: 56c191d288 -s ours am: fed58ddcd0 -s ours
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561

Change-Id: Iec82fac54be6f461bc8754b46a08636814a8e899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 19:24:59 +00:00
Tsung-Mao Fang
662e5722b3 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561

Change-Id: I9075895f07ea2a3bf74ab70aab62439ab19244ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 18:49:20 +00:00
Tsung-Mao Fang
a27edf0a5a [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561

Change-Id: I0c6902c38a253d0c1a17211355b75419abcc6199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 18:47:42 +00:00
Tsung-Mao Fang
fed58ddcd0 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 am: 56c191d288 -s ours
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561

Change-Id: Ic55a9d1f05cb6c0fb2a84626d596983ef3f0ba34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 18:40:29 +00:00
Treehugger Robot
a93e78f781 Merge "Fix array-related errorprone warnings" 2022-08-17 18:37:46 +00:00
TreeHugger Robot
e671474e54 [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 am: 7f32697692 -s ours
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590400

Change-Id: Ib1cde7a72e43ef82db43b15e2d029857b4f0e18c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 18:12:29 +00:00
TreeHugger Robot
a1e365891f [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 -s ours am: 84935ceab8 -s ours
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590400

Change-Id: I9dc41d0c0081fc1a6f5fc7f9e8681bb8ce2dc555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 18:12:04 +00:00
Tsung-Mao Fang
39f5e29a4e [automerger skipped] Wi-Fi panel doesn't need to check permission am: d2c372450c -s ours am: fa5900b6ba -s ours
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590400

Change-Id: I201879780c8ae74b917f0d0b9f6d1f8efca3dc0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 18:12:01 +00:00
Tsung-Mao Fang
4e53971f19 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561

Change-Id: I22b02fef7d8f63615f203fa3634d47b2d369cc96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 18:11:47 +00:00
Tsung-Mao Fang
56c191d288 Wi-Fi panel doesn't need to check permission am: 5e785a2d99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561

Change-Id: I78c410c92c0d7f8d828fab92db97303814a09ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 18:03:31 +00:00
TreeHugger Robot
7f32697692 Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590400

Change-Id: I65697bb252fe44e18cbca6ca1a7b74e8d66f18ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 17:47:32 +00:00