Commit Graph

81115 Commits

Author SHA1 Message Date
Bill Yi
c181acd313 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I82383299dd970fba9caec3c6d6655bd94be8a7b7
2021-04-03 02:20:06 +00:00
Bill Yi
bf172a131f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I61889b4b2af1661d93590f98956fe0dfc391d194
2021-04-03 01:18:47 +00:00
Fan Zhang
1c16a3bb67 Misc tweaks to Safety settings UI
- Remove emergency info setting tile from Safety setting page. The
  emergency info setting is now injected as emergency contact & medical
  info settings.

- Add an icon to emergency gesture setting
- Add an icon place holder to WEA setting

Bug: 184261824
Test: manual
Change-Id: I8bb9abfac054b5745e978695043584ea1266d53e
2021-04-02 22:17:08 +00:00
Winson
ed6d733b5a Handle modern OPEN_BY_DEFAULT action
From API feedback, the constant was migrated to the standard format.
Settings needs to catch both the modern and legacy format.

Bug: 184370492

Test: manual, adb shell am start \
        -a "android.settings.APP_OPEN_BY_DEFAULT_SETTINGS" \
        -d "package:com.example.app"

Change-Id: I138383a65c7b8269696f401e250cc3b6f1cfd1d0
2021-04-02 14:44:05 -07:00
Pavel Grafov
6f17d2e27c [automerger skipped] Prevent disconnecting admin-configured VPN am: 735a216da3 am: 18c04f023a -s ours am: 4350fa4c78 -s ours am: 3574bfc1a6 -s ours
am skip reason: skip tag Change-Id Id59d2ac2782e83601bc3093d3a092faea36ff5d9 with SHA-1 735a216da3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13931528

Change-Id: I2e0a791bafe8a3a56fbc4550b9d91b86e52c2fa1
2021-04-02 20:29:41 +00:00
Pavel Grafov
244201c1c6 [automerger skipped] Prevent disconnecting admin-configured VPN am: 735a216da3 am: 9ca72695fd -s ours am: 2de4347bcc -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: Ic4741393e38755975be6994691f09ff9d335834e
2021-04-02 20:29:18 +00:00
Pavel Grafov
3574bfc1a6 [automerger skipped] Prevent disconnecting admin-configured VPN am: 735a216da3 am: 18c04f023a -s ours am: 4350fa4c78 -s ours
am skip reason: skip tag Change-Id Id59d2ac2782e83601bc3093d3a092faea36ff5d9 with SHA-1 735a216da3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13931528

Change-Id: If9f0bf0e9639e636dd31bdd7352d0ac5b450063f
2021-04-02 20:09:30 +00:00
Pavel Grafov
2de4347bcc [automerger skipped] Prevent disconnecting admin-configured VPN am: 735a216da3 am: 9ca72695fd -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: I1c7aaf63fb33ca9cf44847891ad7868107cbf4ac
2021-04-02 19:50:14 +00:00
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
b1bb4daeec 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: I31e7a4b6b7448c884ed2ee6d1d80fdf500e195b5
2021-04-02 17:10:14 +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
420f5d4d59 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: I534b7858313d7f1e41a0fc4a33167a9182aaee28
2021-04-02 16:28:07 +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
cadf08da4e 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: Ia80a4c9bc67566a44b40f537a4e3ac7bf928d319
2021-04-02 04:02:35 +00:00
TreeHugger Robot
a0ada5af53 Merge "Fix BatteryInfo test fail" into sc-dev 2021-04-02 03:25:07 +00:00
Yi-an Chen
b93fd515ad 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: I68a3b6c69487b07f81374c7c63c186a7de7af278
2021-04-01 20:34:15 +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
292c0c8d11 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: I51173787eb436419d04ec6d094f0730fbfa4541d
2021-04-01 19:31:35 +00:00
TreeHugger Robot
34a063b739 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: I785bbc7b7dede1cd6d6ce9930d48d343570c9b5c
2021-04-01 19:30:05 +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
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
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