Commit Graph

2325 Commits

Author SHA1 Message Date
TreeHugger Robot
b2744ea5b2 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 62b2539aae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: Id7773c5410e672ec08cc2e0d7a05acf0117706ef
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 18:58:28 +00:00
Nate Myren
d1749cfbab Allow intent into Privacy Controls page
Test: manual
Bug: 222127397
Change-Id: If98ce8b89332eaaaa9be70885afe9d8465c191dd
2022-04-22 13:58:50 -07:00
TreeHugger Robot
ebfb2acfd1 Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev am: cc27e34330 am: 527f4141a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799708

Change-Id: Ide570864e6684c7ac27691aba29756c0f6dad757
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 17:51:13 +00:00
TreeHugger Robot
cc27e34330 Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev 2022-04-19 17:02:54 +00:00
Yasin Kilicdere
cdc0f7213d Merge "Revert "Revert "Remove the fallback AddSupervisedUserActivity.""" 2022-04-19 15:37:34 +00:00
Milton Wu
a4f30404f0 Not relaunch BiometricEnrollActivity durng SUW
Biometric fingerprint flow is abnormal because BiometricEnrollActivity
is relaunched during SUW because diplay or orientation is changed.

Bug: 205059704
Bug: 228812876
Test: atest BiometricEnrollActivityTest
Test: Before clicking "No thanks" manully unfold or rotate device on the
      fingerprint setup screen of SUW
Change-Id: If0abe785c74c7fb40da779af166d79eeba6ad57f
2022-04-19 03:48:22 +00:00
Yuri Lin
52b7e8ced6 Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850aa5 am: 075dd07035
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17722955

Change-Id: I76b9cc331e0af9d874d241c6d2c1c97b7997a04e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 17:23:40 +00:00
Yuri Lin
554ab1fe3e Special handling for intent coming from "welcome" notification.
This notification is an introduction to new notification permission changes in T and is shown to the user upon upgrade; this change records that the user has seen/interacted with the notification already so we don't have to keep showing it.

This change essentially makes a copy of the existing functionality of NotificationAppListActivity, but meant only for access internally (so that neither the activity nor the associated action is exported/publicly accessible).

Bug: 225373531
Test: manual with the change that sends the notification
Change-Id: I20c6084652ea11a8d0a002a21561fe50b9cf5de3
2022-04-14 12:54:56 -04:00
Betty Chang
6ebed73fbe Merge "[LE Audio] Broadcast Sink UI" into tm-dev 2022-04-11 13:57:52 +00:00
Presubmit Automerger Backend
301f134325 [automerge] [LE Audio] Broadcast Sink UI 2p: a56e198c61 2p: 81fe82cadd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17442209

Bug: 228274114
Change-Id: I98c0fe27e795c2115f7dd725eeda315497a724ad
2022-04-11 08:19:04 +00:00
Presubmit Automerger Backend
81fe82cadd [automerge] [LE Audio] Broadcast Sink UI 2p: a56e198c61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17442209

Bug: 228274114
Change-Id: I327f34d0ffc5270d0869e20a4345d5f95adf42ec
2022-04-11 08:18:56 +00:00
changbetty
a56e198c61 [LE Audio] Broadcast Sink UI
- Add dialog for Broadcast and find broadcast source

 - Add Activity for find broadcast source

Bug: 228274114
Test: Manual test
Change-Id: I830efc3514fc42aaa4e53f491ed3a7459bd9bb41
2022-04-11 08:15:10 +00:00
Tom Hsu
7eb32dec44 Merge "[Panlingual] Revamp the panlingual UI in Settings." into tm-dev 2022-03-31 08:32:52 +00:00
tom hsu
9be043e750 [Panlingual] Revamp the panlingual UI in Settings.
- Create a Activity to contain AppLocaleDetail and
    LocalePickerWithRegion
  - Update the Entry from apps language page

Bug: 223089715
Test: local test pass
Change-Id: Id01e93f3df32412c7323ca577a149009eb1862ad
Merged-In: Id01e93f3df32412c7323ca577a149009eb1862ad
2022-03-31 03:35:21 +00:00
Joe Bolinger
6f94d1f784 Merge changes from topic "presubmit-am-7558807516104e4aa3755256c45095b4" into sc-v2-dev-plus-aosp am: 8ff1ef339f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17386185

Change-Id: I753ad8af595172167eb8b34dd73a58e95d65d1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 22:39:18 +00:00
Joe Bolinger
998dad16f3 Merge "Set exported flag to false." 2022-03-25 22:20:13 +00:00
Joe Bolinger
200707c7cd [automerge] Set exported flag to false. 2p: 34704f4108
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17386185

Bug: 222684510
Change-Id: Ieb28cc08edd9027734c4ed40e0fe083b50360964
2022-03-24 18:31:09 +00:00
Joe Bolinger
34704f4108 Set exported flag to false.
It was set to true when the attribute became required in I878adb9108c95f06ddd059b23a542b61210edfa4

Bug: 222684510
Test: manual (see bug)
Change-Id: I8f67a5c3ac92f4813dc503cada8888833d7dbfbf
2022-03-24 18:31:01 +00:00
TreeHugger Robot
2ddb627c77 Merge "Enhance Settings deep link transition" into tm-dev am: 73d2d07d1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17290004

Change-Id: Ie78032f2edb7a3e0081b79cb95886f0c375d0a02
2022-03-24 10:37:14 +00:00
TreeHugger Robot
73d2d07d1e Merge "Enhance Settings deep link transition" into tm-dev 2022-03-24 10:16:46 +00:00
Philip Junker
c4648f276b Merge "Add special app access for turning on the screen." into tm-dev am: bf4878c877
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182673

Change-Id: Ia91f563137a21fe5628ca98564d2cc8669d52807
2022-03-24 10:07:12 +00:00
Philip Junker
bf4878c877 Merge "Add special app access for turning on the screen." into tm-dev 2022-03-24 10:02:49 +00:00
Jason Chiu
177573c892 Enhance Settings deep link transition
Since the deep link mechanism uses a trampoline activity to redirect the
target activity, and the targeting activity is launched in a separate
task, there will be two transitions played, where one is the splash
screen with the trampoline acitvity and another one is the task
transition. This makes the UX weird.

To avoid this, this CL tries to make the targeting activity launch in
the same task as the trampoline acitivity by removing the taskAffinity,
so there won't be a task transition.

Fix: 215275940
Test: Create a settings shortcut on the home screen and launch it.
Change-Id: I7621ab9f1132acbf619495801a3b985c5c3b1b5d
2022-03-24 12:42:01 +08:00
Joe Bolinger
8d5082848d Set exported flag to false.
It was set to true when the attribute became required in I878adb9108c95f06ddd059b23a542b61210edfa4

Bug: 222684510
Test: manual (see bug)
Change-Id: I8f67a5c3ac92f4813dc503cada8888833d7dbfbf
2022-03-24 00:39:20 +00:00
Yuri Ufimtsev
b1469cce58 Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev am: 7e7d3f898e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17134743

Change-Id: Ic2fe73e794f3f41708308762757270024e696a93
2022-03-22 13:55:33 +00:00
Yuri Ufimtsev
be98245015 Declare task affinity for entries that could be launched by SafetyCenter
Test: manual

Bug: 222676668
Change-Id: I44c2f0cee61ffd8f10284cda5a740a9e9d9ea7bb
2022-03-22 10:36:28 +00:00
Bonian Chen
bb44ceb407 Merge "[Settings] Enable support for AdaptiveIcon (Data Usage, Hotspot, VPN)" into tm-dev 2022-03-22 03:12:17 +00:00
Bonian Chen
c79e74dd49 [Settings] Avoid popup activity get bringup from recent history
A popup dialog is designed to sit on top of an single instance activity.
Although activity might #finish(), but will be restarted due to staying
in the recent history.

Remove it from recent history may allow end user not seeing that UI.

Bug: 202033230
Test: local
Change-Id: Id1d52eefb90d011296495f39b1533a1af68435f1
(cherry picked from commit f81eaeb8fa)
2022-03-21 08:08:07 +00:00
Bonian Chen
3370b50c6b Merge "[Settings] Avoid popup activity get bringup from recent history" 2022-03-21 08:06:17 +00:00
Bonian Chen
b6a4bc9d3f [Settings] Enable support for AdaptiveIcon (Data Usage, Hotspot, VPN)
This is a change to enable the support of AdaptiveIcon for following
widgets:
1. Data Usage
2. Wi-Fi Hotspot
3. VPN

Bug: 225252321
Test: local
Change-Id: I523dee9cfd435a95fd31e8730053e0d9ff2c2339
(cherry picked from commit 86027479cb)
2022-03-21 00:18:26 +00:00
Philip Junker
8a9780527e Add special app access for turning on the screen.
Bug: 216114297
Test: manually built and installed on device, verified absence of jank.
Test: atest SettingsRoboTests:TurnScreenOnDetailsTest
Test: atest SettingsRoboTests:TurnScreenOnSettingsTest
Change-Id: I1ed5948504222b537207978cbaa117b48aa28e6c
2022-03-18 14:53:13 +00:00
Bonian Chen
f81eaeb8fa [Settings] Avoid popup activity get bringup from recent history
A popup dialog is designed to sit on top of an single instance activity.
Although activity might #finish(), but will be restarted due to staying
in the recent history.

Remove it from recent history may allow end user not seeing that UI.

Bug: 202033230
Test: local
Change-Id: Id1d52eefb90d011296495f39b1533a1af68435f1
2022-03-18 16:52:40 +08:00
Bonian Chen
86027479cb [Settings] Enable support for AdaptiveIcon (Data Usage, Hotspot, VPN)
This is a change to enable the support of AdaptiveIcon for following
widgets:
1. Data Usage
2. Wi-Fi Hotspot
3. VPN

Bug: 225252321
Test: local
Change-Id: I523dee9cfd435a95fd31e8730053e0d9ff2c2339
2022-03-18 09:23:19 +08:00
TreeHugger Robot
93d881598b Merge "Set higher priority for ADD_DEVICE_ADMIN intent" into tm-dev am: 5f6aee1cf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17197594

Change-Id: I019fa52c8b397ba33d900375fd2419fe0451da61
2022-03-17 04:22:09 +00:00
Tsung-Mao Fang
56e9b25b5f Set higher priority for ADD_DEVICE_ADMIN intent
Settings should set android:priority of the intent-filter > 1
so that regular apps can't provide an alternative.

Test: Rebuilt apk
Fix: 197960672
Change-Id: Ic12db4fa5e6a5f803930deba2a81254c375403df
2022-03-16 18:03:40 +08:00
Corina Grigoras
5a1f4f2de3 Merge "Rename READ_MEDIA_IMAGE to READ_MEDIA_IMAGES" into tm-dev am: f2c1c97edc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17149237

Change-Id: I89ebb3f7b4fa8f59c8e3133004b826c35d339c6e
2022-03-10 22:03:21 +00:00
Corina Grigoras
f2c1c97edc Merge "Rename READ_MEDIA_IMAGE to READ_MEDIA_IMAGES" into tm-dev 2022-03-10 21:36:38 +00:00
Tom Hsu
76147437bf Merge "[Panlingual] Revamp the panlingual UI in Settings." 2022-03-10 13:06:47 +00:00
Yasin Kilicdere
ba6ee82d59 Revert "Revert "Remove the fallback AddSupervisedUserActivity.""
This reverts commit a30b27657b.

Reason for revert: Now we can remove the fallback activity since the real flow is ready

Change-Id: Iecedbf588412547feecc6de36c89236097f8c236
2022-03-10 11:34:40 +00:00
TreeHugger Robot
377d4dfea4 Merge "Add highlight menu key for app pages" into tm-dev am: 439bd335a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17148789

Change-Id: I5b3a8d326cbcd08508adbbdddf495117ab534826
2022-03-10 10:15:56 +00:00
TreeHugger Robot
439bd335a4 Merge "Add highlight menu key for app pages" into tm-dev 2022-03-10 09:56:35 +00:00
Jason Chiu
bbb9f20346 Add highlight menu key for app pages
Fix: 216402156
Test: manual
Change-Id: I8a79e72e07739aca831a62b8186bdaaa3dc69870
2022-03-10 15:34:55 +08:00
Jay Thomas Sullivan
cd2109a17b Rename READ_MEDIA_IMAGE to READ_MEDIA_IMAGES
This permission was only created very recently, and it is unlikely that
any apps are using it yet.

After its creation, it was decided that it should be renamed.

Bug: 223691971
Test: atest CtsPermissionTestCases CtsPermission3TestCases
Change-Id: If82cee5995a2adc8e1b1fcc88ea7b540e7df0fac
2022-03-09 22:34:52 -08:00
PETER LIANG
9ecf3b2b44 Merge "Fix that the theme of "Vision Settings" was inconsistent with "Anything else?"." into tm-dev am: 66a510d2dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17137385

Change-Id: Idada6dac443ebf07e64fa387354d0ae7911fc8c1
2022-03-10 05:57:46 +00:00
Peter_Liang
d2fc78d797 Fix that the theme of "Vision Settings" was inconsistent with "Anything else?".
Remove theme attribute in the xml to avoid overriding.

Fix: 220127506
Fix: 219417232
Fix: 219415822
Fix: 223341110
Fix: 222415445
Fix: 219592951
Test: manual test
Change-Id: I8075be594714dfbd941cdcc642453500f093fc26
2022-03-10 01:07:26 +08:00
tom hsu
6fc5bb64dc [Panlingual] Revamp the panlingual UI in Settings.
- Create a Activity to contain AppLocaleDetail and
    LocalePickerWithRegion
  - Update the Entry from apps language page

Bug: 223089715
Test: local test pass
Change-Id: Id01e93f3df32412c7323ca577a149009eb1862ad
2022-03-09 17:06:33 +08:00
Eric Biggers
9b18c5d081 Remove CryptKeeperSettings
FDE support has been removed in favor of FBE, so remove the FDE settings
from the "Encryption & credentials" page of the Settings app.

For now I didn't change the way the page appears on devices that don't
use FDE; as before, it still lists "Encrypt phone", followed by either
"Encrypted" or "Phone not encrypted" with no changeable settings.  Note
that the strings used for this have "crypt_keeper" in their names but
aren't specific to FDE; the next CL will rename them.

Test: On Cuttlefish with and without encryption enabled, tested visiting
      the "Encryption & credentials" settings.
Bug: 208476087
Change-Id: I3ce9894291ea1f1886f21980a86a92bfce38038a
(cherry picked from commit 36609c18d1)
Merged-In: I3ce9894291ea1f1886f21980a86a92bfce38038a
2022-03-07 22:18:38 +00:00
Eric Biggers
f8ca0a448c Remove CryptKeeper
Since Android 10, new devices have been required to use FBE (File Based
Encryption) instead of FDE (Full Disk Encryption).  FDE support was
already removed from system components such as init and vold.
Therefore, the CryptKeeper activity is no longer needed.  Remove it.

Note: this CL only removes CryptKeeper itself, i.e. the activity which
runs at boot time on devices that are using FDE or are being encrypted
with FDE in-place.  Later CLs will remove FDE-specific code from the
Settings app.

Bug: 208476087
Change-Id: I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9
(cherry picked from commit 43616ed3b6)
Merged-In: I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9
2022-03-07 22:18:32 +00:00
TreeHugger Robot
d0c2f30970 Merge "Revert "Remove the fallback AddSupervisedUserActivity."" 2022-03-07 18:41:45 +00:00
Yasin Kilicdere
a30b27657b Revert "Remove the fallback AddSupervisedUserActivity."
This reverts commit 86f3500439.

Reason for revert: Real flow is not ready yet, so we still need the fallback activity.

Change-Id: I34dc5386ff8c18a62b4b11e25fd355a62602329f
2022-03-04 15:44:42 +00:00