PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,486 Commits 1 Branch 0 Tags
c273cb266ce6da6ce8b4a40e323f7b351edb64b5
Commit Graph

114486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
8793da4a56 Merge "Added basic SecuritySettingsPref test" into tm-qpr-dev am: b87ada7c93 am: 4006c7e9e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19658607

Change-Id: Iac0e30237c3b8d0490c94a77f2f18b53fe846bc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 01:15:21 +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
b23643cd51 [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: 79eeb70843 -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: I82177d588cdc09906d6eba7e7cecc378d5b2dfb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-18 21:05:49 +00:00
Weng Su
50d77b8c75 [automerger skipped] Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID am: dc4ad09291 -s ours am: e76784f08c -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: Ia17ae2dc0abaf9920dd563560c45daa915dcb4ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-18 21:05:45 +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
Tiffany Nguyen
1d1b115785 Align strings and UX across the different pages. 
https://screenshot.googleplex.com/ercwXXcfg2QHkAW.png
https://screenshot.googleplex.com/AWfsrNWsJUbdF8x.png

Bug: 240711618
Test: Manual
Change-Id: I3d1083a7b50adffb67592b2e42914adf755bd6cd
 2022-08-18 17:52:06 +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
48b4af999a Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b am: cdacabf984 am: 49a0bbc650 am: ac7a368afd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: I0ebc25250b00a36bef5a72dd87192013b08e098f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 20:53:49 +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
aa21979d79 Merge "Fix b/242009481: Refine the battery usage chart timestamp label rule" 2022-08-17 20:27:55 +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
Tsung-Mao Fang
9c826fe1f7 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours am: 662e5722b3 -s ours am: a2172abb33 -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: Ia941a9dec4fab948352e4642fd8a7e44c6ebe4f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:48:15 +00:00
Tsung-Mao Fang
4346c1edeb [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours am: 4e53971f19 -s ours am: a27edf0a5a -s ours am: d71843cb7a -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: Ia555ddb9ba1a75356012de36d4caddc83ca83122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:48:06 +00:00
Tsung-Mao Fang
68e5a2fc39 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 am: 56c191d288 -s ours am: fed58ddcd0 -s ours am: 2ecdc63708 -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: I05d9101fbd11f27a04a8dfaa54bad9f1fbce39d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:45:42 +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