Pavel Grafov
4350fa4c78
[automerger skipped] Prevent disconnecting admin-configured VPN am: 735a216da3
am: 18c04f023a
-s ours
...
am skip reason: skip tag Change-Id Id59d2ac2782e83601bc3093d3a092faea36ff5d9 with SHA-1 16d588c11a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13931528
Change-Id: I8f040b6e43390b5efb674bfc464aa4a68527de01
2021-04-02 19:25:49 +00:00
Pavel Grafov
9ca72695fd
Prevent disconnecting admin-configured VPN am: 735a216da3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13931528
Change-Id: Ifdd9d0de8d3b91f4cef6dbf470bd43f0f2ba7d47
2021-04-02 19:02:16 +00:00
Pavel Grafov
18c04f023a
Prevent disconnecting admin-configured VPN am: 735a216da3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13931528
Change-Id: Ib7ccf10cba6c1f494bb4dcb7a711aa5a218f9dd8
2021-04-02 18:57:25 +00:00
Edward Cunningham
8ba8d9b228
Merge "Improve installer attribution in App Info." into sc-dev am: aacf7bd6f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13872508
Change-Id: I28ea66bd4d34d1b082d8b9957f905613a37f7b0a
2021-04-02 17:09:26 +00:00
Edward Cunningham
aacf7bd6f0
Merge "Improve installer attribution in App Info." into sc-dev
2021-04-02 16:44:03 +00:00
Julia Reynolds
a434c06a81
Merge "Fix incorrect title" into sc-dev am: 990b405edb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14075639
Change-Id: I472eb4e93302b2e04e08711b437470a0f1c12cc0
2021-04-02 16:27:35 +00:00
Julia Reynolds
990b405edb
Merge "Fix incorrect title" into sc-dev
2021-04-02 15:53:11 +00:00
Julia Reynolds
cc907eadaf
Only show enhanced options for migrated apps
...
Apps that are using the API or target > S.
Test: settings unit tests
Bug: 184027330
Change-Id: Ifae94e6392a19a215ea9beb1e816c221381bf057
2021-04-02 10:39:29 -04:00
Julia Reynolds
6c427a181f
Fix incorrect title
...
Test: view screen after rotating device
Fixes: 182171355
Change-Id: If4cb2a9495bd9e59a586f64377ca05e3b01bfbe2
2021-04-02 10:14:19 -04:00
Edward Cunningham
faf44124ba
Improve installer attribution in App Info.
...
When an app is installed by the Package Installer app on behalf of
another app (eg. a browser, file manager or app store that opens an APK
via an activity start), it is preferable to attribute the install to the
originating app rather than the 'Package Installer' itself.
Since Android R, package manager keeps track of the necessary install
source information which enables this more precise attribution. If an
originating package is recorded and was set by a system app, we use this
as the user-visible 'installer'.
Bug: 182365285
Test: make RunSettingsRoboTests
Change-Id: Ibb329d6fe8f0fa2ad51d3530a219b2d8b8d6c17b
2021-04-02 12:45:43 +01:00
TreeHugger Robot
7d17aa2308
Merge "Fix BatteryInfo test fail" into sc-dev am: a0ada5af53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14065248
Change-Id: I0b49a4d95dd436080b7936c6ca6ed5262d6182b7
2021-04-02 04:02:36 +00:00
TreeHugger Robot
a0ada5af53
Merge "Fix BatteryInfo test fail" into sc-dev
2021-04-02 03:25:07 +00:00
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
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
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
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
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
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
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
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
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
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
Jeremy Goldman
5ef363aadd
Merge "Revert "Unit tests for the VpnInfoPreference.""
2021-04-01 08:26:25 +00:00