Commit Graph

36706 Commits

Author SHA1 Message Date
Jeremy Goldman
d62b2c23cf Update string associated with Connected, Always On or Insecure VPNs
Previously these strings were separated with a comma, but the new design
is to separate them with a "/" and to not include always-on information
if the vpn is also insecure.

Comment thread on the strings doc: https://docs.google.com/document/d/1hjaYuGmvNzCKPOrmjixpmLLXBV8cbxgrZ3eN4KvC4E8/edit?resourcekey=0-zo7B2GVc9luQTut0o8THNA&hl=zh-TW&forcehl=1&disco=AAAAIF3eiQY
screenshot: https://screenshot.googleplex.com/BmBroUZtmUPJz9s
Test: atest -c SettingsUnitTests
Bug: 176821216

Change-Id: Ib9c273de61c9722b0beb6fba127e7481e6c64705
2021-04-07 17:04:13 +08:00
Ryan Lin
4ad147b31e Merge "Change illustrations of Magnification Settings" into sc-dev am: 7bb5b8f326
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14098543

Change-Id: I8a9d6415dffb557f8603bc7e4fcd57132fff7643
2021-04-07 08:33:24 +00:00
ykhung
a4c8c4440e Move the battery components from SettingsGoogle to Settings am: b350c66d97
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108646

Change-Id: Ib025b2d4ab25a3ea743f4e1934aaf771d4ef0533
2021-04-07 08:32:28 +00:00
Jeremy Goldman
a51780f35d Subscription name has whitespace trimmed to determine uniqueness
For example, if a subscription has the name "subsc" and another has
"subsc    " the extra unique information will be added to the
subscriptions.

Test: atest -c SubscriptionUtilTest
Bug: 183664625
Change-Id: Ia137169f6cdd9804ab04126e5045c9fb61556d54
2021-04-07 16:26:52 +08:00
Ryan Lin
7bb5b8f326 Merge "Change illustrations of Magnification Settings" into sc-dev 2021-04-07 08:19:32 +00:00
ykhung
b350c66d97 Move the battery components from SettingsGoogle to Settings
Bug: 183921876
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I47cbba1cbfd6cb17745e7aaaf56b22e3c9dcd30e
2021-04-07 12:09:54 +08:00
Abel Tesfaye
b7a66b3068 Add warning message when camera privacy lock is enabled for
smart auto rotate settings fragment

Test: locally with flame, make RunSettingsRoboTests -j$(nproc)
ROBOTEST_FILTER=SmartAutoRotateCameraStateControllerTest,SmartAutoRotateControllerTest

Bug: 177462182
Change-Id: If443bd2456f3fbe76876777be912b204a50f4088
2021-04-06 19:49:04 +00:00
Weng Su
4981dc6ea1 Maximize compatibility string update
- Single AP device:
  Title: Extend compatibility
  Summary: Helps other devices find this hotspot. Reduces hotspot connection speed.

- Dual AP device:
  Title: Extend compatibility
  Summary: Helps other devices find this hotspot. Increases battery usage.

- Screenshot:
  https://screenshot.googleplex.com/84sFvsDegjvJfWT

Bug: 184595717
Test: manual test
atest -c WifiTetherMaximizeCompatibilityPreferenceControllerTest

Change-Id: Idca20d4cf5b174110f800fbed91c404d13994b94
2021-04-07 02:27:00 +08:00
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
Arc Wang
2a20e51f91 Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85 am: 89d14a36dc am: 30ab86df65 am: 767f72b09b am: fe3572be66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: Ib575416cf0f1de16cbac939d3e16ba08281a40d4
2021-04-06 15:42:49 +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
fe3572be66 Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85 am: 89d14a36dc am: 30ab86df65 am: 767f72b09b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366

Change-Id: I9fe6a78f1970d85fd30ee3d69b465de523ffddbc
2021-04-06 15:01:42 +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
Almaz Mingaleev
3be24f4ab2 Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils.
That timestamp is used in two places for the same purpose.

Bug: 155738410
Test: presubmit
Change-Id: Ia6836fd34c63aef6e335ef97922d34a60dbf3703
2021-04-06 14:10:05 +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
Tsung-Mao Fang
ebcabd9c07 Fix ANR on ShorcutManager#getPinnedShortcuts
By design, ShorcutManager#getPinnedShortcuts is meant to called on
a work thread.

Fix: 183785618
Test: Switch the user profile, and function works properly.
Change-Id: I87b8d3f57123ff12f83f95fc7f053b8840028ebe
2021-04-06 18:27:06 +08: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
Sunny Shao
41db38c0af Refine the summary of "Open by default" in "App info" page
Fixes: 184597364
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.applications.appinfo
Change-Id: I9e453c719e5d06570ab1093ffe5510c3e9c7567b
2021-04-06 17:35:57 +08: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
6f11ad8534 Merge "Hide non-system overlay window on ActivityPicker" into rvc-qpr-dev am: 7e3e9ed32a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835817

Change-Id: I1fe5682763d592f4ba0b0468e829f1b8cbb42991
2021-04-06 08:55:57 +00:00
TreeHugger Robot
8bc9c9e6ef Merge "Fix Settings crash" into sc-dev 2021-04-06 08:42:26 +00:00
ryanlwlin
465b790717 Change illustrations of Magnification Settings
Bug: 184081570
Test: Treehugger build pass
Change-Id: I3c3d00ebb38af1a3af835305fbaa66d2e9b33018
2021-04-06 16:34:23 +08:00
TreeHugger Robot
7e3e9ed32a Merge "Hide non-system overlay window on ActivityPicker" into rvc-qpr-dev 2021-04-06 08:24:45 +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
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
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