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

81123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yi-an Chen
d646e7d8a6 Merge "Add top level privacy hub preference" into sc-dev am: 9724bd9e0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14054525

Change-Id: I45d5b825deff24e61d27c326e6f04c3635d4bdb6
 2021-04-01 20:33:57 +00:00
Yi-an Chen
9724bd9e0c Merge "Add top level privacy hub preference" into sc-dev 2021-04-01 19:56:16 +00:00
Adam Bookatz
0e6b8947b2 Merge "Failed guest creation doesn't crash Settings" into sc-dev am: a01c223fb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14056992

Change-Id: I8f2d4938c409be5dbcb541d989324ee2c8bb8310
 2021-04-01 19:31:11 +00:00
TreeHugger Robot
4be2e03d15 Merge "Don't always change username when adding account" into sc-dev am: 5e98a92fe8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14056085

Change-Id: I5f9f5c16d688e25a8f0072164a69e5153b39d3c4
 2021-04-01 19:29:35 +00:00
Adam Bookatz
a01c223fb8 Merge "Failed guest creation doesn't crash Settings" into sc-dev 2021-04-01 19:26:51 +00:00
TreeHugger Robot
5e98a92fe8 Merge "Don't always change username when adding account" into sc-dev 2021-04-01 18:47:20 +00:00
TreeHugger Robot
577023d6ed [automerger skipped] Merge "Only display single line for title" into rvc-qpr-dev am: 9258e9ee9d am: d86780ddc1 -s ours am: ef3ee12a59 -s ours 
am skip reason: skip tag Change-Id I98d9a93bfdc792017124dda52a59d25a6462079e with SHA-1 4f6caf2941 is already in history

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

Change-Id: I74a93b01b9292736460190aec4789b3415bc87c0
 2021-04-01 17:25:17 +00:00
Tsung-Mao Fang
48e662c195 Merge "Revert "Only display single line for title"" into rvc-qpr-dev am: bfb68fa6fe am: d80c5bba40 am: 2f24ae2f5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060688

Change-Id: Ia0435d966371fc466d9d9e5b59db9ed55d358ee1
 2021-04-01 17:24:29 +00:00
Adam Bookatz
0cb47e92d4 Don't always change username when adding account 
During Setup Wizard for a new user, if an account is added,
the user's name gets updated to match their account's name.
Recently, however, the user can actually type in a name before
even reaching the Setup Wizard. If they elect to do so, we shouldn't
overwrite their name with their account name, so this cl makes
sure to only use the account name if the original name wasn't
manually entered.

Bug: 171255493
Test: manual verification (create new user and enter account during
      SUW. Do both with and without entering initial user name.)
Change-Id: I443648dafc0d83a71750f7f6472bbea4e2ee23bb
 2021-04-01 10:20:17 -07:00
TreeHugger Robot
ef3ee12a59 [automerger skipped] Merge "Only display single line for title" into rvc-qpr-dev am: 9258e9ee9d am: d86780ddc1 -s ours 
am skip reason: skip tag Change-Id I98d9a93bfdc792017124dda52a59d25a6462079e with SHA-1 4f6caf2941 is already in history

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

Change-Id: I01afabba8497720fed7ef9b1eb726d917db4cd6a
 2021-04-01 17:09:41 +00:00
Tsung-Mao Fang
2f24ae2f5b Merge "Revert "Only display single line for title"" into rvc-qpr-dev am: bfb68fa6fe am: d80c5bba40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060688

Change-Id: I4e82a29bba6442681172a99074e11e2f4d231f4f
 2021-04-01 17:08:43 +00:00
Hai Shalom
57ab802758 Merge "Settings: Rename OCSP Do not validate option" into sc-dev am: b7dd5e5857 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14061105

Change-Id: Icac9daa3a6a67cec489d8c0fe1827d355c0bfafb
 2021-04-01 17:03:50 +00:00
Hai Shalom
b7dd5e5857 Merge "Settings: Rename OCSP Do not validate option" into sc-dev 2021-04-01 16:24:38 +00:00
TreeHugger Robot
d86780ddc1 Merge "Only display single line for title" into rvc-qpr-dev am: 9258e9ee9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060694

Change-Id: I57dda339fa89ea790092b24c71a2ac2f0c443fdc
 2021-04-01 16:24:07 +00:00
Tsung-Mao Fang
d80c5bba40 Merge "Revert "Only display single line for title"" into rvc-qpr-dev am: bfb68fa6fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060688

Change-Id: I0312dc7bf253ef50a89848ae9879646200282e66
 2021-04-01 16:23:51 +00:00
TreeHugger Robot
9258e9ee9d Merge "Only display single line for title" into rvc-qpr-dev 2021-04-01 16:18:08 +00:00
Beth Thibodeau
f0f14c4f25 Merge "Update style of main media setting toggle" into sc-dev am: 6812256031 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13998846

Change-Id: I45c37b9cccdc462d3ea94486a09f24e7255102d1
 2021-04-01 16:05:09 +00:00
Jason Hsu
fc4ab252c6 Merge "Remove unused code" into sc-dev am: 4e95be4aa2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060696

Change-Id: Iadf9860b096741754f32859e51d4949f9b18a13a
 2021-04-01 16:04:58 +00:00
Tsung-Mao Fang
bfb68fa6fe Merge "Revert "Only display single line for title"" into rvc-qpr-dev 2021-04-01 15:56:19 +00:00
Beth Thibodeau
6812256031 Merge "Update style of main media setting toggle" into sc-dev 2021-04-01 15:47:07 +00:00
Jason Hsu
4e95be4aa2 Merge "Remove unused code" into sc-dev 2021-04-01 15:27:21 +00:00
Pavel Grafov
8bdddf8ba4 Merge "Prevent disconnecting admin-configured VPN" into rvc-qpr-dev-plus-aosp am: efab095931 am: 69022ccc3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14051306

Change-Id: I02869fbbff2a04b2b67769c731b75d4e9f85d968
 2021-04-01 15:02:27 +00:00
Pavel Grafov
69022ccc3a Merge "Prevent disconnecting admin-configured VPN" into rvc-qpr-dev-plus-aosp am: efab095931 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14051306

Change-Id: Iaa80f44026f969706701bfc6a4aa4317b1a8acf2
 2021-04-01 14:24:46 +00:00
tim peng
8e6583cf69 Merge "[Rohan]The battery level show up "-1%", not sync with Rohan." into sc-dev am: 6f96226f45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14045485

Change-Id: Ib71bad87161501a98eec50ca3cbe12544f0c68c5
 2021-04-01 14:00:28 +00:00
Pavel Grafov
efab095931 Merge "Prevent disconnecting admin-configured VPN" into rvc-qpr-dev-plus-aosp 2021-04-01 13:49:32 +00:00
tim peng
6f96226f45 Merge "[Rohan]The battery level show up "-1%", not sync with Rohan." into sc-dev 2021-04-01 13:25:31 +00:00
Wesley Wang
7fbf2baf49 Merge "Fix testing fail for BatteryInfoTest and HighUsageTipTest" into sc-dev am: e949d0f870 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14063746

Change-Id: Ida57003f03a40fe813f299903b39502a5945f7d2
 2021-04-01 12:14:23 +00:00
Wesley Wang
e949d0f870 Merge "Fix testing fail for BatteryInfoTest and HighUsageTipTest" into sc-dev 2021-04-01 11:30:22 +00:00
Wesley.CW Wang
d7e0fa959b Fix testing fail for BatteryInfoTest and HighUsageTipTest 
- Fix the test fail from ag/14048547

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: Ia7a0d0fa567b1826a42b304a04e627e3b0e5f896
 2021-04-01 18:28:14 +08:00
Jason Hsu
5dc2efe572 Merge "Update accessibility settings layout" into sc-dev am: 849055967f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14056751

Change-Id: I9157244ff9b733ffd14053a80994b3c04b9bb380
 2021-04-01 10:20:22 +00:00
jasonwshsu
6e33293fa3 Remove unused code 
* isColorTransformAccelerated() already moved to ColorDisplayManager
* TurnScreenDarker fragment already moved to top level accessibility settings or TextAndDisplay fragment

Bug: 174829936
Test: manual test
Change-Id: I34ec6947129a5042d573e94eabe3c24c2fe761b5
 2021-04-01 09:41:11 +00:00
Jason Hsu
849055967f Merge "Update accessibility settings layout" into sc-dev 2021-04-01 09:40:32 +00:00
Jeremy Goldman
5ef363aadd Merge "Revert "Unit tests for the VpnInfoPreference."" 2021-04-01 08:26:25 +00:00
Tsung-Mao Fang
10246383a0 Merge "Only display single line for title" into sc-dev am: 6d0ed92049 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060693

Change-Id: I4f8023f23e0561bee0afcc8688db173caa3c70fa
 2021-04-01 07:59:35 +00:00
Tsung-Mao Fang
6d0ed92049 Merge "Only display single line for title" into sc-dev 2021-04-01 07:41:55 +00:00
Tim Peng
7246a4f842 [Rohan]The battery level show up "-1%", not sync with Rohan. 
-Hide battery information when it is unknown

Bug: 184017556
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I5f94ccae364f1420e04af21ba425c29ac6a11dd2
 2021-04-01 15:40:54 +08:00
YUKAI HUNG
99e05960b8 Merge "Fix testing fail for BatteryEntryTest from patch ag/14008232" into sc-dev am: 971dc476c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060695

Change-Id: I9934802a429341758faf141d2c57d1a9f749da61
 2021-04-01 07:36:59 +00:00
YUKAI HUNG
971dc476c3 Merge "Fix testing fail for BatteryEntryTest from patch ag/14008232" into sc-dev 2021-04-01 07:10:22 +00:00
Wesley.CW Wang
ce453159f7 Update low battery tips string am: 6d836d2d51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14048550

Change-Id: I20ef817e4cd7bea00cc4ea6b74a35c7ea82022c6
 2021-04-01 06:52:53 +00:00
Wesley.CW Wang
6d836d2d51 Update low battery tips string 
- Screenshot: https://screenshot.googleplex.com/33zJkqsTex8r49W.png

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: I864c555c3e500bf4ae5364db8dd6c86be564b883
 2021-04-01 06:30:08 +00:00
Hugh Chen
ebe6e7e5ea Merge "Revert "Fix bluetooth settings will broadcast to anywhere when some cases"" into sc-dev am: cf2dc5107b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14056750

Change-Id: Ic276e1f9f9db9eff9258f7501d03a66e41963745
 2021-04-01 06:05:47 +00:00
Tsung-Mao Fang
f7ae52bed6 Only display single line for title 
When a malicious device admin app’s name includes
a bunch of CRLF characters, it will cause incorrect shows
and selection confusion in Settings Device admin apps listView.

Test: Built the apk and saw single line title.
Bug: 169936038
Change-Id: I98d9a93bfdc792017124dda52a59d25a6462079e
Merged-In: I98d9a93bfdc792017124dda52a59d25a6462079e
 2021-04-01 05:48:04 +00:00
Tsung-Mao Fang
4f6caf2941 Only display single line for title 
When a malicious device admin app’s name includes
a bunch of CRLF characters, it will cause incorrect shows
and selection confusion in Settings Device admin apps listView.

Test: Built the apk and saw single line title.
Bug: 169936038
Change-Id: I98d9a93bfdc792017124dda52a59d25a6462079e
 2021-04-01 13:45:24 +08:00
Hugh Chen
cf2dc5107b Merge "Revert "Fix bluetooth settings will broadcast to anywhere when some cases"" into sc-dev 2021-04-01 05:40:21 +00:00
ykhung
1b8a100c7a Fix testing fail for BatteryEntryTest from patch ag/14008232 
Bug: 184138623
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: Ic770b09cc303a9f213e31174f279940c2aa1f87d
 2021-04-01 13:40:11 +08:00
Jeremy Goldman
761b0f0b77 Revert "Unit tests for the VpnInfoPreference." 
This reverts commit 1e461619ab.

Bug: 183926662
Reason for revert: Quick fix to resolve broken test in production

Change-Id: Iadd655ed522c3c3c39109655183859e8b4875acd
 2021-04-01 04:53:01 +00:00
Yanting Yang
934fbb91a8 Merge "Add positive button into regulatory info dialog" into sc-dev am: 123422c99c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14048549

Change-Id: I707dfce8e1dd57e9d89fa6096226732cc7f50870
 2021-04-01 04:16:22 +00:00
Tsung-Mao Fang
ba9215cbda Revert "Only display single line for title" 
This reverts commit 121041cf58.

Reason for revert: Some use cases don't need single line design. see b/184108687

Fix: 184108687
Change-Id: I1d095ae198cf2fd73eef39caf93895c7d96ca7f7
 2021-04-01 04:14:03 +00:00
Hai Shalom
f909a3d29e Settings: Rename OCSP Do not validate option 
Rename OCSP "Do not validate" option to "Do not verify".

Bug: 176863452
Test: compiles, verify new string
Change-Id: I806c29a711b674a9f5636ee84e55367fb6391ac8
 2021-03-31 21:11:47 -07:00
Wesley.CW Wang
79ce6650bc Update battery settings relative strings (2/3) am: e9cfef7ace 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14048547

Change-Id: Id40d818662fdf4fe878819151e751fb55cf22f65
 2021-04-01 03:56:41 +00:00