Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,951 Commits 1 Branch 0 Tags
9958fc37532c685fa4da69c9aa6cbee2d6babf22
Commit Graph

81951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wesley Wang
9958fc3753 Merge "Make app usage page active time support time period" into sc-dev am: 04e14e41f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297857

Change-Id: I920f608f130dc142b7f36e95cfcfad2097cc7a36
 2021-04-29 09:15:42 +00:00
Wesley Wang
04e14e41f0 Merge "Make app usage page active time support time period" into sc-dev 2021-04-29 09:07:17 +00:00
Tsung-Mao Fang
5ae82a6f25 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 697a73dfdf -s ours am: c12e5f2455 -s ours am: ea699a1d2c -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 80c3f6d4d8 is already in history

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

Change-Id: I038a1e3cce1f13a24fb1c1c3ce58dc31d5e0af7e
 2021-04-29 09:06:10 +00:00
Tsung-Mao Fang
ea699a1d2c [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 697a73dfdf -s ours am: c12e5f2455 -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 80c3f6d4d8 is already in history

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

Change-Id: I0582443b7085bc7c18289033f59dbb60c7b05540
 2021-04-29 08:59:00 +00:00
Tsung-Mao Fang
de801793ac [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 656dcf8334 -s ours am: 5fb1fd0ca8 -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

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

Change-Id: I9f5fa8d60ae4df93beed882002a5c9257b8388ad
 2021-04-29 08:58:03 +00:00
Tsung-Mao Fang
5fb1fd0ca8 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 656dcf8334 -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

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

Change-Id: If58e6e4b79671712637d7cfb65a1ec58fc654504
 2021-04-29 08:16:29 +00:00
Tsung-Mao Fang
c12e5f2455 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 697a73dfdf -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

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

Change-Id: I07d197911c658be944a00ea9503cfbc518a5d00b
 2021-04-29 08:15:52 +00:00
Tsung-Mao Fang
656dcf8334 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

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

Change-Id: Ia31fdf9137868aa85df1ea723f94e6d0092c3f93
 2021-04-29 07:22:51 +00:00
Tsung-Mao Fang
697a73dfdf [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

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

Change-Id: Iff3503de805075b9645a9f3b9a046460b35ce5ef
 2021-04-29 07:22:15 +00:00
Wesley.CW Wang
86a6a0d32c Make app usage page active time support time period 
- Add time slot into active time text
 Screenshot: https://screenshot.googleplex.com/hzj5cJ3eDJD5iW7.png

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I0904e78ca9ab0a5b454e093388f667e978e8722f
 2021-04-29 15:08:30 +08:00
Tsung-Mao Fang
a66212e11d [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

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

Change-Id: I8cf58ae2e0a0632dc97b2cb049225959fd570828
 2021-04-29 07:06:42 +00:00
Tsung-Mao Fang
4c05b195d7 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

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

Change-Id: I08c75393a497f2d3784ea89376c5a0d0abf7517e
 2021-04-29 06:51:51 +00:00
Tsung-Mao Fang
4d7853f35c [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c is already in history

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

Change-Id: I1433418c4c0ffbf0e0337f6a03c03c22d594d349
 2021-04-29 06:38:45 +00:00
Tsung-Mao Fang
26f3013c32 Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794

Change-Id: Iac38c0d7f7517c8d4ecac036e73524d37c66fb6e
 2021-04-29 06:21:38 +00:00
PETER LIANG
688e5c27f3 Merge "Update the BC style for the vision settings in SuW." into sc-dev am: 9246f6f8b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319864

Change-Id: I351d1a063a19b82cc8ad975e94a3dd88086bd9fa
 2021-04-29 02:46:06 +00:00
TreeHugger Robot
4c22d2f6cc Merge "Settings: Turn Privacy hub on by default." into sc-dev am: 7bdbe80abe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339809

Change-Id: I184406a8d61f70d3be8062b7ccf8207dbe66633f
 2021-04-29 02:46:02 +00:00
TreeHugger Robot
5a9a4e1eb1 Merge "Fix several challenge paths" into sc-dev am: fcb325c562 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14342148

Change-Id: I81a3d6fc0a66abeb72249a2317041d6cee483e8b
 2021-04-29 02:45:44 +00:00
TreeHugger Robot
8aca7b1839 Merge "Remove icons of Location Services and App location permissions" into sc-dev am: 3eb980d41b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14341501

Change-Id: Ife51f1a66ec88cf7e5ec80d481ffb0640e50a351
 2021-04-29 02:45:15 +00:00
PETER LIANG
9246f6f8b0 Merge "Update the BC style for the vision settings in SuW." into sc-dev 2021-04-29 02:44:36 +00:00
TreeHugger Robot
7bdbe80abe Merge "Settings: Turn Privacy hub on by default." into sc-dev 2021-04-29 02:07:09 +00:00
TreeHugger Robot
fcb325c562 Merge "Fix several challenge paths" into sc-dev 2021-04-28 23:48:32 +00:00
TreeHugger Robot
3eb980d41b Merge "Remove icons of Location Services and App location permissions" into sc-dev 2021-04-28 23:46:54 +00:00
Kevin Chyn
1f0cd17e3e Fix several challenge paths 
1) Combined settings page should finish() when losing foreground
   (but not if fingerprint or face settings are launched from it)
2) Challenge should be generated when entering FaceSettings or
   FingerprintSettings each time. This allows us to leave the existing
   revokeChallenge paths in FaceSettings and FingerprintSettings.

Fixes: 186257202
Test: Manual

Change-Id: I1b6452f787279001a71628f220c01fcb86b88f3d
 2021-04-28 13:01:28 -07:00
TreeHugger Robot
01803e9d2a Merge "Apply settings page transition" into sc-dev am: d3de9a1352 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292669

Change-Id: I56f67c2044159570813d70055da1323d2a433834
 2021-04-28 13:59:18 +00:00
Narayan Kamath
c80e4ce3a1 Settings: Turn Privacy hub on by default. 
Bug: 176902658
Test: manual
Change-Id: I44027f29ce1a6b5a0c5eeba1e68cabb7476e7cc6
 2021-04-28 13:48:16 +00:00
TreeHugger Robot
d3de9a1352 Merge "Apply settings page transition" into sc-dev 2021-04-28 13:41:04 +00:00
TreeHugger Robot
10585486bf Merge "Tweak spacing for private DNS mode dialog" into sc-dev am: b07079dab8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319873

Change-Id: I25d285b010fb863fdc2850eaa1232ae76195a22c
 2021-04-28 12:18:55 +00:00
TreeHugger Robot
b07079dab8 Merge "Tweak spacing for private DNS mode dialog" into sc-dev 2021-04-28 12:01:57 +00:00
TreeHugger Robot
21742f0014 Merge "Make collapsing toolbar load font synchronously" into sc-dev am: 9d3442bd47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327008

Change-Id: Ic59fd871e3145afe730ddb447acb77bc3ae46672
 2021-04-28 09:33:14 +00:00
Hugh Chen
69761dfade Fix usb tethering switch back to none after off/on the screen am: ddafb202bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297855

Change-Id: I17ca69282384afb39e39a888eb88dd350318b50f
 2021-04-28 09:33:07 +00:00
Yi-Ling Chuang
58813f7b6c Apply settings page transition 
This change applies Shared X-Axis transition across settings pages. For
injected settings, the injected apps have to also apply the same
transition to take effect.

Fixes: 177479937
Test: robotests and navigate through settings pages
Change-Id: I6241860766f5969428faf9a5b3730a7614fdcd92
 2021-04-28 17:29:49 +08:00
TreeHugger Robot
9d3442bd47 Merge "Make collapsing toolbar load font synchronously" into sc-dev 2021-04-28 09:29:24 +00:00
Hugh Chen
ddafb202bd Fix usb tethering switch back to none after off/on the screen 
This CL adds conditions to check whether usb is connected or not.
If usb is not connected or tethering is not started don't update the
state.

Bug: 157709648
Test: make RunSettingsRoboTests -j56
Change-Id: Ifbf5900923419d6abf35834b196aab12601076e4
 2021-04-28 09:12:15 +00:00
TreeHugger Robot
8c0d342277 Merge "Bring the search icon back in developer page" into sc-dev am: e06f5a93b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14293744

Change-Id: I7f40d88705dd71f4a1f642f6c34d8a9971fd6015
 2021-04-28 08:53:43 +00:00
TreeHugger Robot
e06f5a93b1 Merge "Bring the search icon back in developer page" into sc-dev 2021-04-28 08:36:58 +00:00
SongFerng Wang
94d5c2e861 Merge "Ui show "No connection" when WiFi is turned on and no available network" into sc-dev am: 03fbae7fc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14281929

Change-Id: I84092b24eeac15e7eca5a94986f32b16933a714b
 2021-04-28 07:33:08 +00:00
SongFerng Wang
03fbae7fc5 Merge "Ui show "No connection" when WiFi is turned on and no available network" into sc-dev 2021-04-28 07:18:01 +00:00
Tom Hsu
1e5f3bc96a Merge "[Provider model] Show no connection during out of service." into sc-dev am: 463805b142 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187782

Change-Id: I1ee103a89cfc479e4730bd049c11dbf470b2f6f9
 2021-04-28 06:56:30 +00:00
Tom Hsu
463805b142 Merge "[Provider model] Show no connection during out of service." into sc-dev 2021-04-28 06:32:33 +00:00
YUKAI HUNG
f9b468d88b Merge "Update string for battery usage footer to include charging info" into sc-dev am: 40114d8cf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327007

Change-Id: I30395e93d965548700c5b78b06922697f4ae9563
 2021-04-28 06:12:17 +00:00
YUKAI HUNG
40114d8cf1 Merge "Update string for battery usage footer to include charging info" into sc-dev 2021-04-28 06:00:04 +00:00
SongFerngWang
8e0349a67b Ui show "No connection" when WiFi is turned on and no available network 
Follow this table to display the UI.
https://docs.google.com/spreadsheets/d/1w7R7Q3EXkep7iO4VcgioNp00DWas3Xve5i1rWexAkz8/edit#gid=954295315
Bug: 183593681
Test: atest ProviderModelSliceTest
atest ProviderModelSliceHelperTest
atest InternetConnectivityPanelTest
make RunSettingsRoboTests -j

Change-Id: I103f9b2fafe4fc543452a74b7ee7b2e537f879b5
 2021-04-28 12:35:37 +08:00
YUKAI HUNG
9e559f4b72 Merge "Draw timestamp information into BatteryChartView manually (2/2)" into sc-dev am: 70c872c160 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319868

Change-Id: If30e14af27736a403740053f9fa85754f1732f30
 2021-04-28 04:27:33 +00:00
YUKAI HUNG
70c872c160 Merge "Draw timestamp information into BatteryChartView manually (2/2)" into sc-dev 2021-04-28 04:08:55 +00:00
Kevin Chyn
2d97d3c3d2 Merge changes from topic "new-fp-strings" into sc-dev am: 77ddf11ae6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330069

Change-Id: I6d317eea7ad59032581a9caa58cf37b03f6aff17
 2021-04-28 03:56:42 +00:00
Kevin Chyn
b89cc9b108 Update FingerprintEnrollIntro text and icons am: 28d635d9aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330066

Change-Id: I1d8d313b780f978a5d486e491a14d887b8e85eb3
 2021-04-28 03:56:40 +00:00
Mill Chen
4d6bbc8af9 Make collapsing toolbar load font synchronously 
Since collapsing toolbar might load the font asynchronously, it caused
that some settings pages are seeing a flicker on its title. This change
is using TextAppearanceConfig.setShouldLoadFontSynchronously(true)
method to have title font load synchronously, which would remove the
flicker problem.

Fixes: 182232144
Test: visual verified
1) Enable developer options
2) Settings > System > Developer options
3) See if there's a flicker on title

Change-Id: I4e1db1a0fae9f69c7ff5baca7ada49c08f1bcbea
 2021-04-28 11:45:52 +08:00
Kevin Chyn
77ddf11ae6 Merge changes from topic "new-fp-strings" into sc-dev 
* changes:
  Update fingerprint strings
  Update FingerprintEnrollIntro text and icons
 2021-04-28 03:31:31 +00:00
ykhung
a39dce70fc Update string for battery usage footer to include charging info 
https://docs.google.com/presentation/d/1IDmMZILzXFJb-IOt9zZc0m5g2fCamd9gBoacUsWhibg/edit?ts=6087fc2e&resourcekey=0-UhJZmzej-0opeJHr6yVKWQ#slide=id.gc788e97ad4_0_178

Bug: 177406865
Test: make SettingsRoboTests
Change-Id: I6abba8a2c22be57a1afb2e6fae3d2e222dbb3f96
 2021-04-28 03:08:16 +00:00
TreeHugger Robot
3de5bfc12b Merge "Revert "Remove "See all" button"" into sc-dev am: e37695c89d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14324027

Change-Id: Ib66b8b9bd43cf6ae10510de37b01ace2a31a4d3c
 2021-04-27 21:41:29 +00:00