Bill Yi
2edeee25bb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 61ed5ced16
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14086570
Change-Id: Ie806af38f3cbf7ca8a8465f82169d62184c29c3b
2021-04-05 02:36:36 +00:00
TreeHugger Robot
c103d6a4f5
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-05 02:01:40 +00:00
Bill Yi
7874d8e62a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I389256341a0b1f398eb21c91e26a0884127b0de0
2021-04-04 11:57:04 +00:00
Bill Yi
61ed5ced16
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie15e5c6fface9f7f2685500a843a6146f4854ee8
2021-04-04 11:27:52 +00:00
TreeHugger Robot
04cdea7668
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9b66cefa48
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14078237
Change-Id: I8e1afa18e7bbe9a91700a1103f8633bccbe71f9b
2021-04-03 04:42:01 +00:00
TreeHugger Robot
4a1442b81f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3d25650265
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14078241
Change-Id: I8d287a69332322ce5721fd31fcfc9ce573f9b59a
2021-04-03 04:41:45 +00:00
TreeHugger Robot
bc1448092a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-03 04:39:54 +00:00
TreeHugger Robot
b27b9a28ed
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-03 04:27:13 +00:00
TreeHugger Robot
9b66cefa48
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-03 04:17:31 +00:00
TreeHugger Robot
3d25650265
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-03 04:08:05 +00:00
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
6474b7cb6b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I53b1d9de319f0bf5fa3683b93c3fcb606668fdc8
2021-04-03 01:48:58 +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
Bill Yi
e6a1d87285
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie8d3cafb7b2f8228a0659de5a3af75cab60a7344
2021-04-03 00:50:43 +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
102062b2ab
[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: I7ef31935fed73dfd264136445df3c7ae1e1ed069
2021-04-02 20:30:23 +00:00
Pavel Grafov
05f70ec6c3
[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: I2194536dd1b64f129f2fa9fe943f3cc38ac3eeb0
2021-04-02 20:29:30 +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
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