Commit Graph

67360 Commits

Author SHA1 Message Date
TreeHugger Robot
bae5889dd1 Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

Change-Id: I4bd6cc79c6188c26ee233306e3979ba9d7806329
2020-06-10 05:22:50 +00:00
TreeHugger Robot
cf74512519 Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

Change-Id: I8846a3b6a8eff6aaab17987cf22892d79371e3ad
2020-06-10 05:22:17 +00:00
TreeHugger Robot
dbe7263055 Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

Change-Id: Ie52943675d3a5610978a6bf7a7ac0743407447f1
2020-06-10 05:22:05 +00:00
TreeHugger Robot
73bf03748e Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev 2020-06-10 05:06:41 +00:00
Varun Shah
8d5cb9a2d0 Add app icons to leasee view in shared data dev options.
Also disable clicking the header view and list items in the same view.

Bug: 156671006
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SharedDataPreferenceControllerTest
Test: manual (visual)
Change-Id: I2821bc6cdc523097283ab44b864088278850be53
2020-06-09 19:04:36 -07:00
Sarah Chin
f71eed162d Add logic for 5G icon to SIM status dialog
Test: manual test with fake 5G data network type
Bug: 156815536
Change-Id: I764f4ade8032511b44098e7eccb19b909fccc717
2020-06-09 18:55:53 -07:00
android-build-team Robot
79f22d2b4d Merge cherrypicks of [11816540, 11816001, 11816620, 11816559, 11816541, 11816621, 11815640, 11816506, 11816507, 11816508, 11816586, 11816587, 11816588, 11816589, 11816520, 11816173, 11816590, 11816591, 11816395, 11816003, 11816698, 11815507] into qt-qpr3-release
Change-Id: I398e0d1f652bafc92f99b05d665cf1f9018cc6fa
2020-06-10 00:37:35 +00:00
Sunny Shao
33dd3187d0 Allows to launch only authenticator owned activities
- 3rd party developers can define himself-authenticator
  and use the accountPreferences attribute to load the
  predefined preference UI.
- If a developer defines an action intent to launch the
  other activity in xml and it would return true due
  to the true exported attribute and no permission.
- To avoid launching arbitrary activity. Here allows
  to launch only authenticator owned activities.

Bug: 150946634
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
Test: PoC app
Change-Id: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
Merged-In: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
(cherry picked from commit d6d8f98844)
(cherry picked from commit 4b6e82fd5d)
2020-06-10 00:36:59 +00:00
Andras Kloczl
4e2a0717c9 Change user setup prompt dialog showing logic
- Extract user setup prompt dialog creation logic
- Move user setup prompt dialog showing to UserDetailsSettings
- Rename user click and creation related methods to improve readability
- Set "disabled by admin" for switch pref when switch is disabled
- Cleanup UserSettings and UserDetailsSettings onPreferenceClick
- After a guest is created the details page opens instead of switching

Test: Manual test and robo tests with this command:
  make -j64 RunSettingsRoboTests
Demo: http://shortn/_ACYsnbIKO9
Bug: 156867277
Change-Id: Ifa0cdefcd49d5b865e940a7cc332136ed26ecf57
2020-06-09 23:06:00 +00:00
Nate Myren
2ee47d8762 Remove char limit from permission controller subtitle
Test: None
Bug: 158125093
Change-Id: Iddc8ab0158a53dda0ed9305988840dd840dd74af
2020-06-09 10:12:53 -07:00
Julia Reynolds
425504c2de Fix blocked notifications screen
Don't filter out apps have don't have any usage events -
the package's notifications are still blocked

Test: atest, and verify that the packages match the 'blocked
count' subtext on the previous screen on an affected device
Fixes: 158343184

Change-Id: Iac01708849e3ae0b82f97db679ce512fc9675a17
2020-06-09 12:25:15 -04:00
Robert Luo
6cb1c40ae1 [automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: c36fe51faf -s ours
am skip reason: Change-Id Icbc5879301fec9a7deacd7ee2896fd41b6feab7a with SHA-1 1633ae37e7 is in history

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

Change-Id: Ib5f54f360705296df5f84fcf141bb3820df5792c
2020-06-09 13:42:13 +00:00
Robert Luo
c6f7e0d493 Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: 2cdf49c4d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511

Change-Id: I769482b69789e9931fc2662053848607f00c53cd
2020-06-09 13:41:50 +00:00
Robert Luo
f40610182d Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511

Change-Id: Ibcbede056d5ed2703b4c87cb499f2256a759f90b
2020-06-09 13:28:41 +00:00
Robert Luo
c36fe51faf Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511

Change-Id: I9c18b15953b3a3bae512c436ecb7aea4ee336411
2020-06-09 13:28:27 +00:00
Robert Luo
2cdf49c4d5 Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511

Change-Id: I9bf6d161b485683185c3f8d000c06aa1cbfa2fb3
2020-06-09 13:28:23 +00:00
Robert Luo
21ac98e2f1 Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev 2020-06-09 13:18:22 +00:00
Stanley Wang
6d92aef4c2 Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 am: c52aa3d8ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: I94bb64ea7103056c414b97d4f76466c98229596c
2020-06-09 12:05:04 +00:00
Stanley Wang
f71d5e8427 Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 am: b9b28441ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: I7119692f5f073702404c22fda1c8872247c1448b
2020-06-09 12:04:49 +00:00
Stanley Wang
642f97c3c0 Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: Iff713595ac19637412d9157258cf0045f73024df
2020-06-09 11:55:04 +00:00
Stanley Wang
c52aa3d8ca Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: I2fdd9c2227b798376fa3036de82f82843392e02e
2020-06-09 11:54:57 +00:00
Stanley Wang
b9b28441ee Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: Ib7d80f647fad736266d1930e6eef08d660cccdea
2020-06-09 11:54:48 +00:00
Stanley Wang
37d5ed5073 Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev 2020-06-09 11:46:09 +00:00
Robert Luo
1633ae37e7 Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity
Bug: 156696236
Test: 1. Manual 2. make -j42 RunSettingsRoboTests
Change-Id: Icbc5879301fec9a7deacd7ee2896fd41b6feab7a
Merged-In: Icbc5879301fec9a7deacd7ee2896fd41b6feab7a
2020-06-09 18:56:46 +08:00
Sunny Shao
818fef48f3 Allows to launch only authenticator owned activities
- 3rd party developers can define himself-authenticator
  and use the accountPreferences attribute to load the
  predefined preference UI.
- If a developer defines an action intent to launch the
  other activity in xml and it would return true due
  to the true exported attribute and no permission.
- To avoid launching arbitrary activity. Here allows
  to launch only authenticator owned activities.

Bug: 150946634
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
Test: PoC app
Change-Id: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
Merged-In: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
(cherry picked from commit d6d8f98844)
2020-06-09 10:11:04 +00:00
Sunny Shao
e2eab4e258 Allows to launch only authenticator owned activities
- 3rd party developers can define himself-authenticator
  and use the accountPreferences attribute to load the
  predefined preference UI.
- If a developer defines an action intent to launch the
  other activity in xml and it would return true due
  to the true exported attribute and no permission.
- To avoid launching arbitrary activity. Here allows
  to launch only authenticator owned activities.

Bug: 150946634
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
Test: PoC app
Change-Id: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
Merged-In: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
(cherry picked from commit d6d8f98844)
2020-06-09 10:09:23 +00:00
Stanley Wang
4158f0875a Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db am: 9d28584122
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11788801

Change-Id: Ia3cced5bcc46e1fe6865007e00dc0eaea10001c4
2020-06-09 10:07:28 +00:00
Stanley Wang
a924938de6 Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db am: 235b6d4bbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11788801

Change-Id: I87b88bf6b20cee0d8e65e451f4a8c4105ce8e3f9
2020-06-09 10:07:12 +00:00
Sunny Shao
c8f92acbfb Allows to launch only authenticator owned activities
- 3rd party developers can define himself-authenticator
  and use the accountPreferences attribute to load the
  predefined preference UI.
- If a developer defines an action intent to launch the
  other activity in xml and it would return true due
  to the true exported attribute and no permission.
- To avoid launching arbitrary activity. Here allows
  to launch only authenticator owned activities.

Bug: 150946634
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
Test: PoC app
Change-Id: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
Merged-In: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
(cherry picked from commit d6d8f98844)
2020-06-09 10:07:10 +00:00
Sunny Shao
addc1ea1b9 Allows to launch only authenticator owned activities
- 3rd party developers can define himself-authenticator
  and use the accountPreferences attribute to load the
  predefined preference UI.
- If a developer defines an action intent to launch the
  other activity in xml and it would return true due
  to the true exported attribute and no permission.
- To avoid launching arbitrary activity. Here allows
  to launch only authenticator owned activities.

Bug: 150946634
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
Test: PoC app
Change-Id: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
Merged-In: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
(cherry picked from commit d6d8f98844)
2020-06-09 10:02:25 +00:00
Stanley Wang
303418ceb3 Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11788801

Change-Id: Ib641abd34eebb52592ceb644162272f825c098e4
2020-06-09 09:50:03 +00:00
Stanley Wang
9d28584122 Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11788801

Change-Id: Ib6b61ecbc400cd474571c00fa989336a21f7b4c1
2020-06-09 09:49:58 +00:00
Stanley Wang
235b6d4bbd Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11788801

Change-Id: I201b697bc0da1473f669a8058054a2e14164797e
2020-06-09 09:49:44 +00:00
Stanley Wang
d1a7a5618e Add the "Smart Lock" item to dynamic index.
- The "Smart Lock" item is a trust agent which comes from
  TrustAgentManager, so add it to dynamic index.

Fixes: 148867137
Test: manual test the search result and run Settings robotest
Change-Id: I7cd3a9df89a9b9378fa49cc2cb2127c778b795f2
2020-06-09 17:48:43 +08:00
TreeHugger Robot
b235bdf537 Merge "Add extra summary string in cross profiles page" into rvc-dev am: debe9b3577 am: c5cd2de1ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11789922

Change-Id: Ie5d56a74b522a5fbd0d78a465fab72fda1090f4f
2020-06-09 09:39:14 +00:00
Automerger Merge Worker
b59c43e075 Merge "Merge "Add new description to Permission manager in settings" into rvc-dev am: c628df6914 am: 14c4b1eaad" into rvc-d1-dev-plus-aosp 2020-06-09 09:38:35 +00:00
TreeHugger Robot
f9724bb1d9 Merge "Add new description to Permission manager in settings" into rvc-dev am: c628df6914 am: 14c4b1eaad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797825

Change-Id: I821a03311aa6fc5670117d649c01cb0cac6d9b03
2020-06-09 09:38:30 +00:00
TreeHugger Robot
eeb568183b Merge "Add extra summary string in cross profiles page" into rvc-dev am: debe9b3577 am: 4b8c7528f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11789922

Change-Id: I0e657630c93314f7dd8eb6536c1025ad84ceb904
2020-06-09 09:38:26 +00:00
TreeHugger Robot
b8724e9ec8 Merge "Add new description to Permission manager in settings" into rvc-dev am: c628df6914 am: a0c05f2651
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797825

Change-Id: I5c0d7b3eacd3e3bf314b684d63ecaf545708fec6
2020-06-09 09:38:14 +00:00
Stanley Wang
36dd53a0db Merge "Update "yes" string for German language." into rvc-dev 2020-06-09 09:35:11 +00:00
TreeHugger Robot
3efb0b3788 Merge "Add extra summary string in cross profiles page" into rvc-dev am: debe9b3577
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11789922

Change-Id: I8b0fb960db8060e0fd3183771ad8488f0f314b97
2020-06-09 09:25:02 +00:00
TreeHugger Robot
c5cd2de1ed Merge "Add extra summary string in cross profiles page" into rvc-dev am: debe9b3577
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11789922

Change-Id: I2fdb86c9ed0e8f75db56bbf727a36a7b6b806f25
2020-06-09 09:24:56 +00:00
TreeHugger Robot
4b8c7528f3 Merge "Add extra summary string in cross profiles page" into rvc-dev am: debe9b3577
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11789922

Change-Id: If0ffa3ba9ba779ad1a91e4b640d2e961d5fa600b
2020-06-09 09:24:52 +00:00
TreeHugger Robot
e8ad5fa06e Merge "Add new description to Permission manager in settings" into rvc-dev am: c628df6914
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797825

Change-Id: Ie095ca7a71c99530a6a053a1da065a49174382c0
2020-06-09 09:24:48 +00:00
TreeHugger Robot
14c4b1eaad Merge "Add new description to Permission manager in settings" into rvc-dev am: c628df6914
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797825

Change-Id: I33cb6e9dcd4670b3e49edde18b4e630fdd373a93
2020-06-09 09:24:45 +00:00
TreeHugger Robot
a0c05f2651 Merge "Add new description to Permission manager in settings" into rvc-dev am: c628df6914
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797825

Change-Id: Iddab2668f7de47500cd37031389affc2651f5d71
2020-06-09 09:24:27 +00:00
TreeHugger Robot
debe9b3577 Merge "Add extra summary string in cross profiles page" into rvc-dev 2020-06-09 09:16:51 +00:00
TreeHugger Robot
c628df6914 Merge "Add new description to Permission manager in settings" into rvc-dev 2020-06-09 09:10:20 +00:00
android-build-team Robot
b3d3e0d13f Snap for 6571063 from d67258e961 to mainline-release
Change-Id: I94e23933276ccbbc6d950a63575970b536e3ad69
2020-06-09 07:09:59 +00:00
TreeHugger Robot
160fedb6a8 Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3 am: 579189a06b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: Ibe7f26fbb2ae26132ff6ab1d84fc23852cd35c36
2020-06-09 06:58:33 +00:00