PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
68,347 Commits 1 Branch 0 Tags
d3162e5a192ca83fe41e6500abd56e9f105c7788
Commit Graph

68347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
d3162e5a19 Merge "Add app icons to leasee view in shared data dev options." into rvc-dev am: 6647ac93d4 am: 4af89f865c am: 48203393e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11817586

Change-Id: I6656c15e365e6ec7f212a71c9428e8b5e638ceaa
 2020-06-10 08:18:46 +00:00
TreeHugger Robot
082d36c0d2 Merge "Add app icons to leasee view in shared data dev options." into rvc-dev am: 6647ac93d4 am: 4af89f865c am: 19323ada32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11817586

Change-Id: I06dcc5eb7cdbb91263be2990361f1bd517caa2a9
 2020-06-10 08:18:30 +00:00
TreeHugger Robot
48203393e8 Merge "Add app icons to leasee view in shared data dev options." into rvc-dev am: 6647ac93d4 am: 4af89f865c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11817586

Change-Id: I26bf25ef43081c23ae722aa9d76ed962e32e0c49
 2020-06-10 08:05:57 +00:00
TreeHugger Robot
19323ada32 Merge "Add app icons to leasee view in shared data dev options." into rvc-dev am: 6647ac93d4 am: 4af89f865c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11817586

Change-Id: Ie48811783028a45cf841f6244a6be53f47dbded4
 2020-06-10 08:05:35 +00:00
TreeHugger Robot
4af89f865c Merge "Add app icons to leasee view in shared data dev options." into rvc-dev am: 6647ac93d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11817586

Change-Id: I62a98c1cd351bc6ea74e69a5a79b833c06ee5402
 2020-06-10 07:53:11 +00:00
TreeHugger Robot
6647ac93d4 Merge "Add app icons to leasee view in shared data dev options." into rvc-dev 2020-06-10 07:35:36 +00:00
TreeHugger Robot
dfd534029b Merge "Remove char limit from permission controller subtitle" into rvc-dev am: e92cbd19d8 am: 22a7106f5f am: 58efbc26bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808486

Change-Id: I80fadbf4324ccff16fb00087fb867204aca08a4f
 2020-06-10 06:52:31 +00:00
Automerger Merge Worker
f472f70420 Merge "Merge "Remove char limit from permission controller subtitle" into rvc-dev am: e92cbd19d8 am: e31a69246e" into rvc-d1-dev-plus-aosp am: a8028cd51b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808486

Change-Id: Iebecc8dd4dfeb4517f485543aea7e13da6024f70
 2020-06-10 06:52:15 +00:00
TreeHugger Robot
9923242b5b Merge "Remove char limit from permission controller subtitle" into rvc-dev am: e92cbd19d8 am: 22a7106f5f am: 58935a9471 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808486

Change-Id: Ib85b606e4510012d0567b85b7eb15293c1b8b934
 2020-06-10 06:51:22 +00:00
Automerger Merge Worker
310b9323fe Merge "Merge "Fix blocked notifications screen" into rvc-dev am: 1528d932ed am: 42ddde2d73 am: ea1b171063" into rvc-qpr-dev-plus-aosp 2020-06-10 06:51:07 +00:00
TreeHugger Robot
626e9dd413 Merge "Fix blocked notifications screen" into rvc-dev am: 1528d932ed am: 42ddde2d73 am: ea1b171063 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808483

Change-Id: I08751ceaceccf81146138de8e24854d1c69e977a
 2020-06-10 06:50:57 +00:00
TreeHugger Robot
38f1727907 Merge "Fix blocked notifications screen" into rvc-dev am: 1528d932ed am: 42ddde2d73 am: 79a40bf611 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808483

Change-Id: I3f2094196d91dccdf8cf804f5b91d7abf7e25279
 2020-06-10 06:50:56 +00:00
TreeHugger Robot
a2aa599410 Merge "Fix blocked notifications screen" into rvc-dev am: 1528d932ed am: 367aeee6b8 am: 84ee394cf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808483

Change-Id: Ic21510efebc9235d55f11c372c519c4adb383310
 2020-06-10 06:50:30 +00:00
TreeHugger Robot
58efbc26bd Merge "Remove char limit from permission controller subtitle" into rvc-dev am: e92cbd19d8 am: 22a7106f5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808486

Change-Id: Ib7a2df39cb47c4c837cfed843c926fa86649293e
 2020-06-10 06:32:36 +00:00
TreeHugger Robot
58935a9471 Merge "Remove char limit from permission controller subtitle" into rvc-dev am: e92cbd19d8 am: 22a7106f5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808486

Change-Id: Iff29586986b88b718fc7849b722a99b97c8e606b
 2020-06-10 06:32:20 +00:00
Automerger Merge Worker
a8028cd51b Merge "Merge "Remove char limit from permission controller subtitle" into rvc-dev am: e92cbd19d8 am: e31a69246e" into rvc-d1-dev-plus-aosp 2020-06-10 06:32:06 +00:00
TreeHugger Robot
5d381f1ca4 Merge "Remove char limit from permission controller subtitle" into rvc-dev am: e92cbd19d8 am: e31a69246e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808486

Change-Id: I11de0de2919183a48a27d7ad924e610aa1d19ff3
 2020-06-10 06:32:02 +00:00
TreeHugger Robot
ea1b171063 Merge "Fix blocked notifications screen" into rvc-dev am: 1528d932ed am: 42ddde2d73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808483

Change-Id: Icddfb90bea14bad2acdce031e167dc5642e51d15
 2020-06-10 06:31:59 +00:00
TreeHugger Robot
84ee394cf1 Merge "Fix blocked notifications screen" into rvc-dev am: 1528d932ed am: 367aeee6b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808483

Change-Id: I9ba51ea22f1551b79709c0de38230981920159df
 2020-06-10 06:31:54 +00:00
TreeHugger Robot
79a40bf611 Merge "Fix blocked notifications screen" into rvc-dev am: 1528d932ed am: 42ddde2d73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808483

Change-Id: I660c8c7cd4016c3fb93832c0df929314ccc518f3
 2020-06-10 06:31:43 +00:00
TreeHugger Robot
22a7106f5f Merge "Remove char limit from permission controller subtitle" into rvc-dev am: e92cbd19d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808486

Change-Id: Ida3dd1c2e05350e68d7ad09d4caba76facf2a315
 2020-06-10 06:15:40 +00:00
TreeHugger Robot
e31a69246e Merge "Remove char limit from permission controller subtitle" into rvc-dev am: e92cbd19d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808486

Change-Id: I636f5965dc78749f6680b4f94b9a7ae4645ca147
 2020-06-10 06:15:37 +00:00
TreeHugger Robot
42ddde2d73 Merge "Fix blocked notifications screen" into rvc-dev am: 1528d932ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808483

Change-Id: If2fd41dbb50a4908962fdcbcd40ec08e9a9b8860
 2020-06-10 06:15:26 +00:00
TreeHugger Robot
367aeee6b8 Merge "Fix blocked notifications screen" into rvc-dev am: 1528d932ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808483

Change-Id: Iafdae12f789f21d26c59d74382b5a147feeb0454
 2020-06-10 06:15:23 +00:00
TreeHugger Robot
e92cbd19d8 Merge "Remove char limit from permission controller subtitle" into rvc-dev 2020-06-10 06:00:39 +00:00
TreeHugger Robot
1528d932ed Merge "Fix blocked notifications screen" into rvc-dev 2020-06-10 05:59:31 +00:00
TreeHugger Robot
a58885aff5 Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e am: bae5889dd1 am: 6f86a8e5fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

Change-Id: I87ee56988dbb9c510a09a0ceb2f07915248208f5
 2020-06-10 05:58:22 +00:00
Automerger Merge Worker
08b4801bf9 Merge "Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e am: dbe7263055" into rvc-d1-dev-plus-aosp am: 369f4f61ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

Change-Id: I1f1b5438c430e0622f8372963d10918ace41fbba
 2020-06-10 05:57:48 +00:00
TreeHugger Robot
7647b5fad5 Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e am: bae5889dd1 am: 2b61c0c6a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

Change-Id: I110fa3efe890b8448cecd5ba7709d40dfa1bd15f
 2020-06-10 05:57:16 +00:00
Automerger Merge Worker
369f4f61ac Merge "Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e am: dbe7263055" into rvc-d1-dev-plus-aosp 2020-06-10 05:41:06 +00:00
TreeHugger Robot
2b61c0c6a5 Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e am: bae5889dd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

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

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

Change-Id: Idd574e7b8d31d7ab917a5784eb7acd6bfaf4291e
 2020-06-10 05:40:49 +00:00
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
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
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
aee23dc6fc [automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: c36fe51faf -s ours am: 6cb1c40ae1 -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: Ifb7decfc74757b807fad4aacd9ea1da49bdeb133
 2020-06-09 13:56:04 +00:00
Robert Luo
edeb3c91c9 [automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: 2cdf49c4d5 am: c6f7e0d493 -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: I44396a23338623fcab85534991f62bd67b609faf
 2020-06-09 13:55:37 +00:00
Robert Luo
9e1fdc3ef2 Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: 2cdf49c4d5 am: dad4baf879 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489511

Change-Id: I2fdb58e481e95546a8933e52dc82687c27a6c5f7
 2020-06-09 13:55:24 +00: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
dad4baf879 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: Ie93d5805043f70fb28855bed88369554414b3d7e
 2020-06-09 13:42:04 +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
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
04a1ebd4d5 Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 am: b9b28441ee am: f38093956a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

Change-Id: I5101920a147f0ea7e837cc6b0720f6f886e94aa8
 2020-06-09 12:17:02 +00:00