Automerger Merge Worker
24de3fbf97
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d -s ours am: c49ada9182 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I194b0cac70dc5a0b1a364e9ceb559df9962f9985
2020-03-04 21:24:25 +00:00
Automerger Merge Worker
c49ada9182
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ibd939d46e2bcc31623f69049c6a06015e39c137a
2020-03-04 21:13:02 +00:00
TreeHugger Robot
b79218f56d
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-03-04 20:59:22 +00:00
Automerger Merge Worker
ed8a3467a3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590 -s ours am: e0bc29df11 -s ours am: 306d47bca5 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I5db4fafec9e8f1745b3c0b842442593888135e16
2020-03-04 20:11:05 +00:00
Automerger Merge Worker
479eb958c8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590 -s ours am: e0bc29df11 -s ours am: b43406147b -s ours
...
am skip reason: subject contains skip directive
Change-Id: I204cea9f138462beb6b0ffca74df7e3b46e0a354
2020-03-04 20:10:50 +00:00
Automerger Merge Worker
306d47bca5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590 -s ours am: e0bc29df11 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I5977827c3ebecc7f3055d491922d875f6f8a88a3
2020-03-04 19:53:34 +00:00
Automerger Merge Worker
b43406147b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590 -s ours am: e0bc29df11 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifdeb07456af76024e651cf6723c71bcb037762f8
2020-03-04 19:53:27 +00:00
Automerger Merge Worker
e0bc29df11
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I98d470799b1ddddd9cc497d4f3729f2d04fd613c
2020-03-04 19:40:30 +00:00
TreeHugger Robot
3779025590
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2020-03-04 19:24:28 +00:00
Automerger Merge Worker
c3b6944712
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8 am: 12d9e009a6
...
Change-Id: Ic81ddc2f3e51169d0b662df8a11aedc6c95ab34c
2020-03-04 18:27:10 +00:00
Automerger Merge Worker
57e5809c32
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8 am: fe6755ec7f
...
Change-Id: Ia5ee80e7c4c9d03d6f541fe075d4826ef90659fd
2020-03-04 18:25:38 +00:00
Automerger Merge Worker
fe6755ec7f
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
...
Change-Id: Ib65f8a21f5b9dc1bfcd2ecf1b66ea43747ec1774
2020-03-04 18:16:07 +00:00
Automerger Merge Worker
12d9e009a6
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
...
Change-Id: I4eed6959e7c36171a7df1a37ce9087166ba75418
2020-03-04 18:06:25 +00:00
Brad Ebinger
6bdf1393f8
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev
2020-03-04 18:05:25 +00:00
Automerger Merge Worker
93375e2f15
Merge "Merge "Replace TYPE_STATUS_BAR_PANEL with the SUB_PANEL" into rvc-dev am: 64d5b09500 am: 3a3d457968" into rvc-d1-dev-plus-aosp
2020-03-04 17:30:20 +00:00
Automerger Merge Worker
82f87f0265
Merge "Replace TYPE_STATUS_BAR_PANEL with the SUB_PANEL" into rvc-dev am: 64d5b09500 am: 3a3d457968
...
Change-Id: Ie88c5885142eb9a232bd1448204c2111d9325d4f
2020-03-04 17:30:01 +00:00
Automerger Merge Worker
9cb57e5c3a
Merge "Replace TYPE_STATUS_BAR_PANEL with the SUB_PANEL" into rvc-dev am: 64d5b09500 am: b08e748c54
...
Change-Id: Ifb3967b3fda51e59a1dbcf4a554a24cb560ca277
2020-03-04 17:30:00 +00:00
Automerger Merge Worker
b08e748c54
Merge "Replace TYPE_STATUS_BAR_PANEL with the SUB_PANEL" into rvc-dev am: 64d5b09500
...
Change-Id: Ie5cbf24da1de6b5b0fcb7c101ee1b1b404f03118
2020-03-04 17:08:40 +00:00
Automerger Merge Worker
3a3d457968
Merge "Replace TYPE_STATUS_BAR_PANEL with the SUB_PANEL" into rvc-dev am: 64d5b09500
...
Change-Id: I161853d92a352b7f0fa3eca408eb86a60a9905b6
2020-03-04 17:08:32 +00:00
Heemin Seog
64d5b09500
Merge "Replace TYPE_STATUS_BAR_PANEL with the SUB_PANEL" into rvc-dev
2020-03-04 17:06:51 +00:00
Automerger Merge Worker
7a315bda17
Merge "Accessibility shortcut primary action - remove search and help icon" into rvc-dev am: 91d2dbe2d4 am: d53f368e7e
...
Change-Id: I8df69f4c2edb4965d0e817808f6c4c517ddecd07
2020-03-04 12:50:00 +00:00
Automerger Merge Worker
7a04498c3f
Merge "Accessibility shortcut primary action - remove search and help icon" into rvc-dev am: 91d2dbe2d4 am: 9a8777e083
...
Change-Id: I5614de2f2c2cc0699924c549812c599621a09a88
2020-03-04 12:49:25 +00:00
Automerger Merge Worker
bd6419b22b
Merge "Merge "Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment" into rvc-dev am: 58081f2c36 am: 2f0acb9ac5" into rvc-d1-dev-plus-aosp
2020-03-04 12:49:22 +00:00
Automerger Merge Worker
92014f4ce2
Merge "Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment" into rvc-dev am: 58081f2c36 am: 2f0acb9ac5
...
Change-Id: I02e7040b64bb4a95709893be57c6385580223f3c
2020-03-04 12:49:12 +00:00
Automerger Merge Worker
53dcd289d9
Merge "Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment" into rvc-dev am: 58081f2c36 am: f453b47d90
...
Change-Id: Ideac47f0bd31db31f57ab64ba5875a360a9f00b4
2020-03-04 12:49:11 +00:00
Automerger Merge Worker
d53f368e7e
Merge "Accessibility shortcut primary action - remove search and help icon" into rvc-dev am: 91d2dbe2d4
...
Change-Id: I222e9cab69f66d4732c97fa1a022c14d0c525261
2020-03-04 12:32:30 +00:00
Automerger Merge Worker
9a8777e083
Merge "Accessibility shortcut primary action - remove search and help icon" into rvc-dev am: 91d2dbe2d4
...
Change-Id: Ibee03175e29a6f67b19c5ee0832abf38b9870b61
2020-03-04 12:32:15 +00:00
Automerger Merge Worker
2f0acb9ac5
Merge "Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment" into rvc-dev am: 58081f2c36
...
Change-Id: Ibe74593cc2d37aa17f49e179ac80aa092e43e95d
2020-03-04 12:32:12 +00:00
Automerger Merge Worker
f453b47d90
Merge "Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment" into rvc-dev am: 58081f2c36
...
Change-Id: I536f70269a545f2263f68939e56a97b2a87bfd0e
2020-03-04 12:31:57 +00:00
Jason Hsu
91d2dbe2d4
Merge "Accessibility shortcut primary action - remove search and help icon" into rvc-dev
2020-03-04 12:14:49 +00:00
Jason Hsu
58081f2c36
Merge "Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment" into rvc-dev
2020-03-04 12:13:42 +00:00
Automerger Merge Worker
69ff0559c1
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: 96d04824ed
...
Change-Id: I8a17fb537b8e6a71e4505a7198e5c6c0c9c67a9b
2020-03-04 11:15:26 +00:00
Automerger Merge Worker
b616ab6e6d
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: a2027e5960
...
Change-Id: I7585337e5cbd967256487dd3b7773157a3acf69b
2020-03-04 11:15:15 +00:00
Automerger Merge Worker
96d04824ed
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479
...
Change-Id: I24e5d0d7d90371f0c755045476f8f34436dd7879
2020-03-04 11:00:07 +00:00
Automerger Merge Worker
a2027e5960
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479
...
Change-Id: I84cb4504ee074d0ab9bbc4bc2d46f3fa8d2afb02
2020-03-04 10:59:52 +00:00
TreeHugger Robot
d3946b5479
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev
2020-03-04 10:40:39 +00:00
jasonwshsu
693068f512
Accessibility shortcut primary action - remove search and help icon
...
* Show search and help page only for accessibility framework feature. Framework don't know the information for downloaded accessibility.
* Modify MagnificationPreferenceFragment to use same logic.
Bug: 142531433
Bug: 150130421
Test: manual test
Change-Id: I29ab5080acc035f46f1e816a9df1b46020bc356c
2020-03-04 17:27:35 +08:00
Arc Wang
d5bdbdb345
Fix exception when filtering the APPs which can CHANGE_WIFI_STATE
...
When filtering AppEntry, only allow the extraInfo type of WifiSettingsState.
Bug: 148486719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppStateChangeWifiStateBridgeTest
Change-Id: I486e88629aec8cfecf6174de8987d37394043743
2020-03-04 16:09:41 +08:00
jasonwshsu
c7fa4da58d
Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment
...
Bug: 142531433
Test: manual test
Change-Id: I6a9eebc1718f2b924cfb373f09abb57890fa10a5
2020-03-04 16:06:41 +08:00
Automerger Merge Worker
5452c86902
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: b62bdbb1ba
...
Change-Id: I5b711a731d988d24ac10ea5eeb1bdfd95a7d7000
2020-03-04 07:25:28 +00:00
Automerger Merge Worker
c480a5a219
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9
...
Change-Id: I1b3249edd8b1c3ceb653c8d82571ddf29032e947
2020-03-04 07:25:13 +00:00
Automerger Merge Worker
b62bdbb1ba
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d
...
Change-Id: I5debb5a498a2a898cccf74d61209597295e3bd46
2020-03-04 07:04:26 +00:00
Automerger Merge Worker
85b274b6c9
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d
...
Change-Id: I43a6edf20ab7fdaa5323d6b955e3f5408423629e
2020-03-04 07:04:18 +00:00
Yanting Yang
0ab87cce3d
Merge "Fix double scroller of App info page" into rvc-dev
2020-03-04 06:51:19 +00:00
Brad Ebinger
66c709844a
Add new DialogFragment and Controller for capability discovery opt-in
...
Adds a new controller to monitor the capability discovery opt-in
setting as well as a new DialogFragment, which displays a dialog
providing the user with more information before they enable the
setting.
Also removes multiple updateSubscriptions() happening when the
activity is first created from onStart() and onChanged() callbacks.
Bug: 111305845
Test: manual
Change-Id: I70821964bc618c3c389c9039cd7f5028e34c7ebb
2020-03-03 19:39:27 -08:00
Bill Yi
8e8a5a1a2c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I3e95725552e5510a27025a8315fe4ec69dd2bfd8
2020-03-03 19:10:03 -08:00
Automerger Merge Worker
b4acbd0cb3
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: b856ed655c
...
Change-Id: I38325fe26892d8db1a2b4310479744df5da62822
2020-03-04 03:07:10 +00:00
Automerger Merge Worker
2ba30b9e04
Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 74bd004539
...
Change-Id: I35bc6b0470c37926f0cf7bb7279f09b1f4d5a2b6
2020-03-04 03:07:07 +00:00
Automerger Merge Worker
32df3f1e11
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: ddaa0871cb
...
Change-Id: I48cdae6972a93866e66ab0e09f27009dde190270
2020-03-04 03:07:05 +00:00
Automerger Merge Worker
05e452fabf
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: aa8531e082 -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history
Change-Id: Ifecde9540d9093fa033d3522ff02c9d57e48dace
2020-03-04 03:06:59 +00:00