Commit Graph

36333 Commits

Author SHA1 Message Date
Arc Wang
5cfdb6dea7 Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85 am: 89d14a36dc am: 30ab86df65 am: 767f72b09b am: bd35c42fd6 am: d10cc6c80d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: Ifa682cf9e9b527ab985698fdf99703a6dfd63797
2021-04-06 15:55:12 +00:00
Rubin Xu
7a103e20ef Merge "Correctly save credential on config changes" into sc-dev am: 9527ee9aed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103545

Change-Id: If03fcecf0a803a1541107675871d889f2327ad77
2021-04-06 15:54:53 +00:00
Arc Wang
d10cc6c80d Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85 am: 89d14a36dc am: 30ab86df65 am: 767f72b09b am: bd35c42fd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: I2ac3093f0d111e42e58e518ab3977920d6012a36
2021-04-06 15:47:25 +00:00
Rubin Xu
9527ee9aed Merge "Correctly save credential on config changes" into sc-dev 2021-04-06 15:22:13 +00:00
Arc Wang
767f72b09b Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85 am: 89d14a36dc am: 30ab86df65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: I5a1cc56ebca9f1f9dc289a4622b4db22a62a6f73
2021-04-06 14:19:47 +00:00
Arc Wang
30ab86df65 Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85 am: 89d14a36dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: I02b3f057bfb03aa1e2d57ba0ce22854df6690bd9
2021-04-06 13:37:25 +00:00
Rubin Xu
da09a8547d Correctly save credential on config changes
Need to make a copy of the LockscreenCredential in
onSaveInstanceState() since the credential will be
zeroized in onDestroy() while Bundle.putParcelable()
only keeps a reference of the object without any
copying.

Bug: 179108398
Test: manual
Change-Id: I090b691630f82406d1ae2f625dd2e0d578b83707
2021-04-06 14:23:45 +01:00
Arc Wang
89d14a36dc Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: Iec105d8ee74d6d2c869072866c4caffbd40d9a19
2021-04-06 13:01:40 +00:00
Arc Wang
bcc7f89f85 Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev 2021-04-06 12:37:52 +00:00
Arc Wang
eb2ac6e455 Revert "Hide non-system overlay window on ActivityPicker"
This reverts commit 855b1f428d.

Reason for revert: <b/184623294>

Change-Id: Ie1eb6f86feda56d6444971fa5dfd2c11357fab01
2021-04-06 12:29:38 +00:00
TreeHugger Robot
e4749c3458 Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f am: d0957376c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814

Change-Id: I3a5f7ae870c60965676dc776120dc220c336b471
2021-04-06 09:37:39 +00:00
TreeHugger Robot
217feb8062 Merge "Attempt to fix IllegalArgumentException from RecyclerView" into sc-dev am: 0d8b0ebd0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14065251

Change-Id: I47443845e8cf9bf3985bd123b8703dc2b28bacee
2021-04-06 09:17:33 +00:00
TreeHugger Robot
107ea8cf9a Merge "Fix Settings crash" into sc-dev am: 8bc9c9e6ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060701

Change-Id: I032eacd1bb5b1b67a23be94a04492c832384ed73
2021-04-06 09:17:15 +00:00
TreeHugger Robot
0d8b0ebd0d Merge "Attempt to fix IllegalArgumentException from RecyclerView" into sc-dev 2021-04-06 09:04:33 +00:00
TreeHugger Robot
d0957376c0 Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814

Change-Id: If51aba7cfb3495b42335d90a1600734da17d4d42
2021-04-06 09:00:52 +00:00
TreeHugger Robot
8bc9c9e6ef Merge "Fix Settings crash" into sc-dev 2021-04-06 08:42:26 +00:00
TreeHugger Robot
7a09c0613f Merge "Hide non-system overlay window on ActivityPicker" into pi-dev 2021-04-06 08:23:13 +00:00
TreeHugger Robot
759dc67158 Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev 2021-04-06 08:22:07 +00:00
Mill Chen
05c2a2bf41 Fix Settings crash
When pressing back from fingerprint enrollment flow, Settings will get
crashed. That was caused by calling a destroied fragment manager to
create an error dialog.

Bug: 184234884
Test: manual test
1) Settings -> Security -> Fingerprint
2) Following the enrollment flow, then pressing back from either find
sensor or enrolling page
3) Observe and see if there's no crash

Change-Id: I2028df0c6a65e8e960a627161834660681b7b70a
2021-04-06 12:35:14 +08:00
Sally Yuen
2b2c5631d7 Merge "[Reduce Bright Colors] Use a switch preference" into sc-dev am: 9aff855052
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13719274

Change-Id: Ide66887df44b1ea331275a9766c7ac7ee7d5dfec
2021-04-05 18:49:10 +00:00
Julia Reynolds
148d6ec9ff Merge "Only show enhanced options for migrated apps" into sc-dev am: 6ca32df6b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14051178

Change-Id: I57afd181897fb288dea0734888d50cedd11ebd55
2021-04-05 18:47:58 +00:00
Sally Yuen
9aff855052 Merge "[Reduce Bright Colors] Use a switch preference" into sc-dev 2021-04-05 16:15:31 +00:00
sallyyuen
166c89890e [Reduce Bright Colors] Use a switch preference
Test: atest ReduceBrightColorsPreferenceControllerTest, manual
Bug: 128465252
Change-Id: I824af24e545d38bad74613147328cf51108a9127
2021-04-05 16:14:59 +00:00
Julia Reynolds
6ca32df6b6 Merge "Only show enhanced options for migrated apps" into sc-dev 2021-04-05 13:30:57 +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
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
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
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
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
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
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