PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,946 Commits 1 Branch 0 Tags
ca1a2705d6f535cc254b26da334a315fbb91e4f0
Commit Graph

70946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
ca1a2705d6 Merge "Merge "Fix blocked notifications screen" into rvc-dev am: 1528d932ed am: 42ddde2d73 am: ea1b171063" into rvc-qpr-dev-plus-aosp am: 310b9323fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808483

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

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

Change-Id: I1608aa52c3bc19bb4115faa16bccdf5ae0363886
 2020-06-10 07:02:52 +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
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
f254f0e31c Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf03748e am: bae5889dd1 am: 6f86a8e5fe am: a58885aff5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

Change-Id: I9688701637cf9f1f98445ade65ad7d1b8c844592
 2020-06-10 06:17:16 +00:00
Automerger Merge Worker
6feccd1ea7 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 am: 08b4801bf9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11763678

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

Change-Id: Ia9caa7467bd6d8c859bca9acf1ffce1e69414576
 2020-06-10 06:15:41 +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
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
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
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
6e57b15b2a [automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: c36fe51faf -s ours am: 6cb1c40ae1 -s ours am: aee23dc6fc -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: I5f946645a47b70b4f664a6609e759c15fd7ba671
 2020-06-09 14:09:46 +00:00
Robert Luo
afe64f6d2e [automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: 2cdf49c4d5 am: c6f7e0d493 -s ours am: edeb3c91c9 -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: I11cb035053611393b70a475e97245b7f60f3f8be
 2020-06-09 14:09:37 +00:00
Robert Luo
c2114694f2 [automerger skipped] Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" into rvc-dev am: 21ac98e2f1 am: 2cdf49c4d5 am: dad4baf879 am: 9e1fdc3ef2 -s ours 
am skip reason: Change-Id Icbc5879301fec9a7deacd7ee2896fd41b6feab7a with SHA-1 a289708db1 is in history

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

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

Change-Id: I07ecbe60ad7cd1ab1b22c7723eb99c6c69d358d7
 2020-06-09 12:32:19 +00:00
Stanley Wang
e2223eea3d Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 am: c52aa3d8ca am: 6d92aef4c2 am: dadbba076f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

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

Change-Id: I2201c8cd46464cd1be832478cd91f1f5e1b26ae8
 2020-06-09 12:31:52 +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
Stanley Wang
dadbba076f Merge "Add the "Smart Lock" item to dynamic index." into rvc-dev am: 37d5ed5073 am: c52aa3d8ca am: 6d92aef4c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544230

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

Change-Id: I1136afffbc410aaceba6d4d644830f30dedcad58
 2020-06-09 12:16:41 +00:00
Stanley Wang
f38093956a 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: I3468789ab0b977a8e80545b171ce497b7c7565fd
 2020-06-09 12:05:06 +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
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