Automerger Merge Worker
a3f95abb80
Merge "Accessibility shortcut primary action - remove search and help icon" into rvc-dev am: 91d2dbe2d4 am: d53f368e7e am: 1272338049
...
Change-Id: I9cf0a7bef074feeaca654c6fe25b298f7f3ef826
2020-03-04 13:03:37 +00:00
Automerger Merge Worker
de5ef978c1
Merge "Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment" into rvc-dev am: 58081f2c36 am: 2f0acb9ac5 am: 3d9118084d
...
Change-Id: Ib39a87b46a4a0f565bfb7938665b2897db4cb0c3
2020-03-04 13:03:13 +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
1272338049
Merge "Accessibility shortcut primary action - remove search and help icon" into rvc-dev am: 91d2dbe2d4 am: d53f368e7e
...
Change-Id: I47d31348b60644040e4c5ce0b4400fe96483efb6
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
3d9118084d
Merge "Accessibility shortcut primary action - add settings UI for accessibility shortcut type fragment" into rvc-dev am: 58081f2c36 am: 2f0acb9ac5
...
Change-Id: I70fdde5a45fad7e73335c0de8df797437edf4b43
2020-03-04 12:49:14 +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
7567ce83ab
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: a2027e5960 am: f0004bf1dc am: 20f0980dfb am: c75011e715
...
Change-Id: Ic090e7eb121f0750e378099bf6615196df9e4a0b
2020-03-04 12:08:53 +00:00
Automerger Merge Worker
c75011e715
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: a2027e5960 am: f0004bf1dc am: 20f0980dfb
...
Change-Id: Ic9788016428bb6e112fde332561eb9518e8a065b
2020-03-04 12:03:24 +00:00
Automerger Merge Worker
f0285fbeeb
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: 96d04824ed am: 69ff0559c1 am: 7f4cbf0e59
...
Change-Id: Ib90b3c049ea9ad78de60964036df5b3e7375fafc
2020-03-04 12:03:21 +00:00
Automerger Merge Worker
0e0a503aba
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: a2027e5960 am: b616ab6e6d am: 972c2fac45
...
Change-Id: I2a799987a4903e1b287cecac2285081ea1ebb262
2020-03-04 12:03:08 +00:00
Automerger Merge Worker
7f4cbf0e59
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: 96d04824ed am: 69ff0559c1
...
Change-Id: I4024048f8f691d2271a86f9afef5468560929c57
2020-03-04 11:45:01 +00:00
Automerger Merge Worker
972c2fac45
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: a2027e5960 am: b616ab6e6d
...
Change-Id: I91b3d1272ee45a537ed7e72207ba10d2af73f499
2020-03-04 11:43:19 +00:00
Automerger Merge Worker
20f0980dfb
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: a2027e5960 am: f0004bf1dc
...
Change-Id: I74e149079c43d7c205363ab57add997138e201f0
2020-03-04 11:41:23 +00:00
Automerger Merge Worker
f0004bf1dc
Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: a2027e5960
...
Change-Id: Ib3ef974d9da0476b9c97c69ce6c063215a33ea16
2020-03-04 11:15:26 +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
Alex Johnston
be527a0049
Merge "Update AccountRestrictionHelper in master"
2020-03-04 09:51:50 +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
2aba7874d5
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9 am: cf6bc20c70 am: 7c59f85d84 am: 55beb55222
...
Change-Id: Iddbe6967486256234b46ccff9d2e2833f3e74fdf
2020-03-04 08:05:22 +00:00
Automerger Merge Worker
55beb55222
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9 am: cf6bc20c70 am: 7c59f85d84
...
Change-Id: I6e8fc4bb2578419f85335c8aaa71f3095d5e00a4
2020-03-04 07:56:41 +00:00
Automerger Merge Worker
090f40daf2
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: b62bdbb1ba am: 5452c86902 am: e2824665f2
...
Change-Id: I21eb6de5e3dc4ebb153c27d3c7a1890230eb168c
2020-03-04 07:56:38 +00:00
Automerger Merge Worker
191371fdc8
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9 am: c480a5a219 am: 0c601ed9ca
...
Change-Id: I967e431deaa99ba0a57bbd679f0cea89deafbaaa
2020-03-04 07:56:29 +00:00
Automerger Merge Worker
e2824665f2
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: b62bdbb1ba am: 5452c86902
...
Change-Id: I381a9823da5d54ffebbd33a2b773c74796bebadd
2020-03-04 07:46:14 +00:00
Automerger Merge Worker
0c601ed9ca
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9 am: c480a5a219
...
Change-Id: Ib562cfc082f5dd8023dcc0f1f37cfc3d1ff7c2ca
2020-03-04 07:45:40 +00:00
Automerger Merge Worker
7c59f85d84
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9 am: cf6bc20c70
...
Change-Id: Ic3b3fc21c1ad2694bb21067d43ba1da533a6bb24
2020-03-04 07:44:45 +00:00
Automerger Merge Worker
cf6bc20c70
Merge "Fix double scroller of App info page" into rvc-dev am: 0ab87cce3d am: 85b274b6c9
...
Change-Id: I0f4a089a31374ccea3fbf8f7b9ffcf1eed50fa1f
2020-03-04 07:25:29 +00: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
Automerger Merge Worker
35a3e47b10
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: 5c5c13e2a9 am: 56f95e94ad am: 85321037af am: 0327de2860
...
Change-Id: I8d7548e8536d014b1bd4092ae17f94b7e1ef153d
2020-03-04 04:10:26 +00:00
Automerger Merge Worker
aec038b1d0
Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 01d9e35c58 am: 06ab772ba4 am: 2b9a685801 am: ca33958483
...
Change-Id: I6cd4541e455947f19bd91496a202b0a20285a38d
2020-03-04 04:10:24 +00:00
Automerger Merge Worker
9a2e6e68ff
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be am: 513096cded am: 92d19c19a6 am: 43f995eab5
...
Change-Id: I7160d7e885b0f2a71867eba298d4c40c48801526
2020-03-04 04:10:23 +00:00
Automerger Merge Worker
c098349d37
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours am: b0ed691dd8 -s ours am: 4954088094 -s ours am: 66e930120e -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history
Change-Id: I35bb26cd475a7cb76fb1caffd808ea9699256915
2020-03-04 04:10:14 +00:00
Automerger Merge Worker
892360ee4e
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e am: e8100bb129 am: a3f11009b6 am: 58b74c724b
...
Change-Id: I6a339fa097809f0e69a39bb908b303a11439ab2e
2020-03-04 04:10:02 +00:00