PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,299 Commits 1 Branch 0 Tags
eadf475e12752a72a15e9334d029985b4b95a7de
Commit Graph

81299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Pietal
eadf475e12 Merge "SUW - Apply theme to FRP PIN pages" into sc-dev am: 0ddacf1152 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339991

Change-Id: I8480d5b9775393c969026b7932b23551cd7f639d
 2021-04-29 12:20:17 +00:00
Matt Pietal
0ddacf1152 Merge "SUW - Apply theme to FRP PIN pages" into sc-dev 2021-04-29 12:04:44 +00:00
Tom Hsu
0a930e3e91 Merge "[ApnEditor] Create another string id for translation" into sc-dev am: 58fb70f8d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327014

Change-Id: I34cdfcd694606fcddad85d689a68e5c049df6f89
 2021-04-29 09:24:36 +00:00
Wesley Wang
ec3961fab1 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: Idfc4fda23a670fe7a2de255818af13daf14c3910
 2021-04-29 09:23:44 +00:00
Tom Hsu
58fb70f8d6 Merge "[ApnEditor] Create another string id for translation" into sc-dev 2021-04-29 09:16:20 +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
2e807e4f0b [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: Ibc1608e81ae7764ee22cda3c10e9620c7e8650be
 2021-04-29 09:00:16 +00:00
Tsung-Mao Fang
bb4c367e7d [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: Iec283f108fe57611ce83ea68bb3e34e3472b9d8c
 2021-04-29 08:59:50 +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
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
5db9770aba 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: I431de866be724613d84548bf8ff314736dd09663
 2021-04-29 02:47:36 +00:00
TreeHugger Robot
d481442b83 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: Ieb86cf2c80fc9cd4834472f74ca3d66fad4b7dac
 2021-04-29 02:47:30 +00:00
TreeHugger Robot
1533fd1e11 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: I0c64891c95e3ad09dd8afb431a943a6d12dd6839
 2021-04-29 02:47:12 +00:00
TreeHugger Robot
3006e0473b 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: Ic61d297a31265d0e36c2959eff512ffe326a7254
 2021-04-29 02:46:24 +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
Matt Pietal
558ace6aca SUW - Apply theme to FRP PIN pages 
It is safe to always attempt to copy SUW intent extras, as they will
only be applied if they exist.

Fixes: 171950236
Fixes: 181212237
Fixes: 183711331
Test: SUW FRP verify, settings confirm existing PIN
Change-Id: I6d35683abdc864aea7b1ed0190d6776a75b3e116
 2021-04-28 13:29:29 -04:00
tom hsu
a3f00c0d18 [ApnEditor] Create another string id for translation 
- make translation of MVNO value be diversity.

Bug: 185209214
Test: Maunal test passed
 - https://screenshot.googleplex.com/33vyFFBp8EnTpQ8
 - atest passed
Change-Id: I9b26e23bf61f06a987682fe64d9ce079e2194818
 2021-04-29 01:12:34 +08:00
TreeHugger Robot
cfc3968b4e 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: I07dd19e42f3b1956ae401ac2cd99d4f8c5db57c4
 2021-04-28 14:01:19 +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
dd31e73878 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: I6163e9dc52fe9634da1b6ab4b8477e3e8d7e1893
 2021-04-28 12:20:26 +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
77f7afac7a 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: If105c32959e2b7f4641581c1b99b30a859abfab4
 2021-04-28 09:35:08 +00:00
Hugh Chen
433dbcc6f7 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: I023176a52a05b7aa0c9d45357f198c8363250286
 2021-04-28 09:34:59 +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
b17996e9bb 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: Ie6b306402257a21a4d9e6d89103d914e4cd4fd9e
 2021-04-28 08:55:40 +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
3333935a67 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: I626b44973e66e9d2a261c654b92df17a84c48080
 2021-04-28 07:34:42 +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
563198613f 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: I9a2ed61da03616f09a85c6e46804eca8736a5023
 2021-04-28 06:58:19 +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
8b589f1a82 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: If0b6c47a35489f5850a723999d7d32ce71b563a7
 2021-04-28 06:14:06 +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
5f84a08a50 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: Ib29387457cba307584e21835b5cd194e760ea8a6
 2021-04-28 04:28:54 +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