TreeHugger Robot
97c50e681a
[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: Id34a2d4698c52f2c920b5d4aa8a37083df0b3b68
2021-04-01 17:25:37 +00:00
Tsung-Mao Fang
92e34391eb
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: I43d2b977fa40acfb24c16d4fceba102d3e7fa5e7
2021-04-01 17:25:21 +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
11b6dadfb1
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: Ie3e120377f86607c9031fe55ce68616bbc162eae
2021-04-01 17:05:22 +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
ee004b8f00
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: I833ee9707b5ba624b18766ee4e8ac37a1ccad063
2021-04-01 16:05:18 +00:00
Jason Hsu
95c4073c2e
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: I0e02f847a1e8b8720c3a050a96b2913c3de2829d
2021-04-01 16:05:10 +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
Tsung-Mao Fang
e858691cfc
Attempt to fix IllegalArgumentException from RecyclerView
...
From the log, the crash happens while RecyclerView is doing
animation stuff. In Settings case, we didn't use any animation
in the list, so the simplest solution is to disable the ItemAnimator
completely.
Test: Check if origin listview behavior is affected.
There's no crash after user comes back from subpage.
Fix: 184214085
Change-Id: If0988cb8e036ce5af1b8d2aa0d4ab77effd476e2
2021-04-01 23:54:49 +08: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
9bdbdad05f
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: I4924ab3bc748ffde96d2bbcd344c3b546b0abe48
2021-04-01 15:01:54 +00:00
Wesley.CW Wang
7366d71702
Fix BatteryInfo test fail
...
- rollback part of ag/14063746
Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: I11129713dac2584c54890f65af53ce76b0672b8d
2021-04-01 14:31:14 +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
8e54e9a16e
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: I28f0d5e182311fe69933593e75b4515247ddea7d
2021-04-01 14:00:27 +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
93ee8efe94
BTHS will have no sound after disable HD audio
...
-setCodecConfigPreference() should not be called when disableOptionalCodecs() is called.
-disableOptionalCodecs() would set SBC codec automatically
Bug: 183456866
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothCodecDialogPreferenceControllerTest
Change-Id: Ib18f4a683dcba7ba92df827c30da0088c90b4d72
2021-04-01 21:38:00 +08: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
7180fcfa4e
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: I0b86e1a12017e1025a9f0b513aef5ad1b6a00b61
2021-04-01 12:14:45 +00:00
Pavel Grafov
735a216da3
Prevent disconnecting admin-configured VPN
...
First, if the VPN is configured by an admin, the preference is
disabled and tapping on it will results in a policy disclouser
dialog.
In addition restriction checks in the dialog also check if the
VPN is admin-configured.
Bug: 179975048
Test: Manual, setting VPN in profile and primary user and via DPM API.
Test: make RunSettingsRoboTests -j
Merged-In: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
Change-Id: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
2021-04-01 12:39:32 +01: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
3b50fa0a9e
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: Idd91938fae54d4e16abcb4a2e2396d2a51413ffc
2021-04-01 10:27:25 +00:00
Ivan Chiang
a4788bdc81
Update the strings for Media Management Apps
...
Bug: 184102095
Test: manual, screenshot
Change-Id: I0be92b600bc45fd805c01e6be5db39df40976ead
2021-04-01 18:03:24 +08: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
Tsung-Mao Fang
46cd45a50f
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: Ibae8e463e946b819dccd5e702ec4caaf1ee44829
2021-04-01 08:00:31 +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
0432960627
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: I0c3bda522fee87d3cc48a511f1ffaddd2784a852
2021-04-01 07:37:15 +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
43e371c393
Update low battery tips string am: 6d836d2d51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14048550
Change-Id: I7a86ed3ac4cb2f26ca302bf87def529d460847f9
2021-04-01 06:52:41 +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
04052e23d7
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: I3bc893768abbf7905fed16945a9c24cf42bdf671
2021-04-01 06:12:54 +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
Yanting Yang
e177746d0c
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: Ib535b28fcfd0a7d2678e871d0306a93a846296ba
2021-04-01 04:17:17 +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
Yanting Yang
123422c99c
Merge "Add positive button into regulatory info dialog" into sc-dev
2021-04-01 03:54:27 +00:00
Wesley.CW Wang
055fd69bb4
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: Ief4426d55b698e7f896f77e88c4c8526aee45282
2021-04-01 03:38:55 +00:00
Bill Lin
e07f4fa4f7
Merge "2/ Make One handed mode support multiple user switch" into sc-dev am: e3e3fc915a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849836
Change-Id: I1e1c67501fa97ffae04c59a672c1e258de074381
2021-04-01 02:38:13 +00:00
Bonian Chen
26d235c109
[automerger skipped] Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330 am: a472f53325 am: 5735be835c -s ours am: 02fc12a796
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980
Change-Id: I8c72522dc11b42cc8df8fcebaae3f15c873140ad
2021-04-01 02:36:20 +00:00