PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,488 Commits 1 Branch 0 Tags
58efbc26bd112f59019c9667e74db1e97f85f29d
Commit Graph

64488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
b93b108379 Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3 am: 7014feb9a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: I6baba679ff67c34587aa1efa15d7620e13734445
 2020-06-09 06:44:30 +00:00