PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,058 Commits 1 Branch 0 Tags
d209f1e782e11700ea3db2771a92a1bf1310d87d
Commit Graph

71058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Robert Luo
51d3a80a27 Merge "Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity" 2020-06-09 10:49:29 +00:00
Automerger Merge Worker
795d0684f9 Merge "Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db am: 9d28584122 am: 4158f0875a" into rvc-qpr-dev-plus-aosp am: 186217dcb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11788801

Change-Id: Ie33b1c66c2619676bf65bab07449ff23d6237cc3
 2020-06-09 10:34:17 +00:00
Stanley Wang
291bb9e1d9 Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db am: 235b6d4bbd am: 0f96e7b527 am: 858efc1381 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11788801

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

Change-Id: I8058a37ba9cabf1508d390f1f1ebeaa66671815a
 2020-06-09 10:33:47 +00:00
Automerger Merge Worker
186217dcb5 Merge "Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db am: 9d28584122 am: 4158f0875a" into rvc-qpr-dev-plus-aosp 2020-06-09 10:21:36 +00:00
Stanley Wang
858efc1381 Merge "Update "yes" string for German language." into rvc-dev am: 36dd53a0db am: 235b6d4bbd am: 0f96e7b527 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11788801

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

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

Change-Id: I9557573b9994205c31a84383352dc120a2cea5c8
 2020-06-09 10:21:15 +00:00
TreeHugger Robot
5b8c52dd7d Merge "Add extra summary string in cross profiles page" into rvc-dev am: debe9b3577 am: c5cd2de1ed am: b235bdf537 am: ecef5590c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11789922

Change-Id: Ie4cf26dd7c03575d03891a3133667f718f32af1d
 2020-06-09 10:11:20 +00:00
Automerger Merge Worker
3a888b5b6c Merge "Merge "Add new description to Permission manager in settings" into rvc-dev am: c628df6914 am: 14c4b1eaad" into rvc-d1-dev-plus-aosp am: b59c43e075 am: 000ebbfaba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797825

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

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

Change-Id: I8f1f54929b97235f4dbd3e9e8614c4d223287dea
 2020-06-09 10:10:51 +00:00
TreeHugger Robot
0b487874ee Merge "Add extra summary string in cross profiles page" into rvc-dev am: debe9b3577 am: 4b8c7528f3 am: 713049c75b am: 64a69f266d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11789922

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

Change-Id: I6af3c681dc0c2f95c79c18ebcb2634b2b2c7a91e
 2020-06-09 10:08:32 +00:00
Stanley Wang
0f96e7b527 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: If800efd915bf3c83c28d932849e664ca1fa98de0
 2020-06-09 10:07:28 +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
TreeHugger Robot
ecef5590c1 Merge "Add extra summary string in cross profiles page" into rvc-dev am: debe9b3577 am: c5cd2de1ed am: b235bdf537 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11789922

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

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

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

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

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

Change-Id: Ic2e5888f9d7457a2da95c616009b0c9e6c8d98cd
 2020-06-09 09:50:01 +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
713049c75b 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: Icf6279f2f9ce89fdb27fc944e23ac0572906c5c4
 2020-06-09 09:38:28 +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
aa860a901a 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: Ie47ecb201dbc6240af61e7f2e179a7fe1f8bcea1
 2020-06-09 09:38:15 +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
Robert Luo
a289708db1 Apply BLUETOOTH_ADMIN permission for BluetoothDeviceDetailActivity 
Bug: 156696236
Test: 1. Manual 2. make -j42 RunSettingsRoboTests
Change-Id: Icbc5879301fec9a7deacd7ee2896fd41b6feab7a
 2020-06-09 17:26:58 +08: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