Commit Graph

68295 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
bc18278871 Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3 am: 579189a06b am: 160fedb6a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: I6375843ee5e5dd60e86478ec5c5be057dc0f8560
2020-06-09 07:09:56 +00:00
TreeHugger Robot
52537a98a7 Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3 am: 7014feb9a7 am: e7770d0bbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: I4e576483a84f02c36c658a56d9bf17285c440ce5
2020-06-09 06:59:41 +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
47cc72d326 Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3 am: 7014feb9a7 am: b93b108379
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: I491eb2d18d3d5e905f5b946e8f3575fb78cf4b2a
2020-06-09 06:47:08 +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
TreeHugger Robot
579189a06b Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: Ia81192a3c3557bf5b39f050b2037af51f5c7e78e
2020-06-09 06:44:16 +00:00
TreeHugger Robot
e7770d0bbb 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: I3cce0bee52484922bba9198ecffbed08dbe53a29
2020-06-09 06:44:13 +00:00
TreeHugger Robot
7014feb9a7 Merge "Add blob size to shared data dev options screens." into rvc-dev am: eef7b5e7e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11764432

Change-Id: Id8ad9c5edcb475c26e3474af7c53ce1422d68291
2020-06-09 06:43:30 +00:00
TreeHugger Robot
eef7b5e7e3 Merge "Add blob size to shared data dev options screens." into rvc-dev 2020-06-09 06:36:21 +00:00
TreeHugger Robot
1e89d84c06 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: 825fa93316 am: 62746f0d84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: Ic01983978c42ab3a67e2d1ae114832ba233e95f9
2020-06-08 22:38:46 +00:00
Automerger Merge Worker
4097433543 Merge "Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9 am: 72f55ee81c" into rvc-qpr-dev-plus-aosp 2020-06-08 22:38:40 +00:00
TreeHugger Robot
93c1c50adb Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9 am: 72f55ee81c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: I5347ac8b0cba757b8a239dea23e3b28f45c9cc0e
2020-06-08 22:38:33 +00:00
TreeHugger Robot
84a644b0e4 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9 am: 0a93295af2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: I48b2d735d76f29428842d5659e89516ebf32a891
2020-06-08 22:38:30 +00:00