Automerger Merge Worker
eef2d790d2
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: d105b75046
...
Change-Id: I2bcb99373bb7a29529fd93c44ceed0ef68002a3b
2020-03-04 03:06:53 +00:00
Automerger Merge Worker
5171781e75
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f am: 5c5c13e2a9
...
Change-Id: Ib8b8acc72ddbb21bb1bb9e70721e144653401bca
2020-03-04 02:59:35 +00:00
Automerger Merge Worker
cfbdb03d2d
Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968 am: 01d9e35c58
...
Change-Id: I80c3e348b4882fb259c72cc1b87f0c89a1d501e9
2020-03-04 02:59:34 +00:00
Automerger Merge Worker
50aefb75b0
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be
...
Change-Id: I4c710e3a5ac052232139ab103205efbbbe394ca6
2020-03-04 02:59:33 +00:00
Automerger Merge Worker
8e78fccbab
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history
Change-Id: If333151ac53f2b506c8deaf6a9bc4c34781e6b15
2020-03-04 02:59:26 +00:00
Automerger Merge Worker
ec9c799dcc
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e
...
Change-Id: If0e7aad1904e70cf550bcb8143d22962086ed65c
2020-03-04 02:59:21 +00:00
Automerger Merge Worker
b856ed655c
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f
...
Change-Id: I57a4099c7aca8c366bf2740c29f8a17577ef1cc0
2020-03-04 02:39:02 +00:00
Automerger Merge Worker
74bd004539
Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968
...
Change-Id: Icbe88e520ce7c8c7489fc6f4e19f6e5abaf87e32
2020-03-04 02:39:00 +00:00
Automerger Merge Worker
ddaa0871cb
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9
...
Change-Id: I167d365acf558341669ce71413bb260acca43fe6
2020-03-04 02:38:59 +00:00
Automerger Merge Worker
5c5c13e2a9
Merge "Add dynamic group panel" into rvc-dev am: 9a1701b42f
...
Change-Id: I2455802d495dc2331b72fe7de02f5de4dbae289f
2020-03-04 02:38:57 +00:00
Automerger Merge Worker
01d9e35c58
Merge "Add slice regist key for dynamic group" into rvc-dev am: 9904275968
...
Change-Id: I4cb461f0395e948cc5b0ccf24474978984c4d50d
2020-03-04 02:38:55 +00:00
Automerger Merge Worker
bc0d38d1be
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9
...
Change-Id: Id1ca213df71e06a33d89b7d1e510b75b74ace8c6
2020-03-04 02:38:54 +00:00
Automerger Merge Worker
aa8531e082
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history
Change-Id: I006489e23cf726ccb9df0336d6b6cd282c5c6ecf
2020-03-04 02:38:50 +00:00
Automerger Merge Worker
b012406ee6
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history
Change-Id: I9b319237feb46c080fdfebc8d0ca4106b52834fc
2020-03-04 02:38:45 +00:00
Automerger Merge Worker
d105b75046
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8
...
Change-Id: I26b62e17a8182371b63b70542adcd2b390a77a18
2020-03-04 02:38:40 +00:00
Automerger Merge Worker
55fa845f1e
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8
...
Change-Id: I84001a5c44becfe7d8590e8097dbf99f6aed2eb9
2020-03-04 02:38:35 +00:00
tim peng
9a1701b42f
Merge "Add dynamic group panel" into rvc-dev
2020-03-04 02:35:35 +00:00
tim peng
9904275968
Merge "Add slice regist key for dynamic group" into rvc-dev
2020-03-04 02:35:35 +00:00
tim peng
09ff25cdf9
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev
2020-03-04 02:35:35 +00:00
Automerger Merge Worker
ad3edcf79c
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda
...
Change-Id: I07b6bd9ff2ab5ee82c116c83a2d4f1ea8fe69f27
2020-03-04 02:32:59 +00:00
Automerger Merge Worker
99cb10c954
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: b3ff936644
...
Change-Id: I5638d4c12907aea63a9f61b0c0dc3cea4d8115a0
2020-03-04 02:32:42 +00:00
Automerger Merge Worker
d6f421d593
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86 is in history
Change-Id: Ia2bbed0f22a29e50bc6d4523bf5ec4b75ee1a981
2020-03-04 02:32:26 +00:00
Arc Wang
e64fb77bc8
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev
2020-03-04 02:25:38 +00:00
Bill Yi
65ad469136
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I78654f59453a732ad46a34331b96d38e9dc809a0
2020-03-03 18:14:07 -08:00
Automerger Merge Worker
b3ff936644
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82
...
Change-Id: I8fc697e7682b9da3243b2050820d1b0ba59efebb
2020-03-04 02:04:23 +00:00
Automerger Merge Worker
7d7ddddcda
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82
...
Change-Id: I925eec066c43a8befeef41d40cad7ecfb2b6fb86
2020-03-04 02:04:18 +00:00
Zhen Zhang
5dbf99de82
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev
...
* changes:
Let tether preference controllers extend TogglePreferenceController
Make tether option preferences listen to own SharedPreferences change
2020-03-04 01:53:07 +00:00
Automerger Merge Worker
0b924d6cad
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 61c7581322
...
Change-Id: I58d050e865f53aef709be9b27d3865e3307b8729
2020-03-04 01:26:45 +00:00
Automerger Merge Worker
0d7209e303
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a
...
Change-Id: I34ef1774e79d6b280d34fb2298f316c15ea1480e
2020-03-04 01:26:24 +00:00
Automerger Merge Worker
61c7581322
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5
...
Change-Id: I65ba4dcd05836f14b94da7811fc37ba92521efaf
2020-03-04 01:13:19 +00:00
Automerger Merge Worker
9aebc16b6a
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5
...
Change-Id: Iac9a8770e495bcb01a8fc87436af66378f2c2b1f
2020-03-04 01:13:07 +00:00
tim peng
8c07f06cd5
Merge "Add string for output switcher transferring error" into rvc-dev
2020-03-04 00:55:01 +00:00
Zhen Zhang
abb734920d
Let tether preference controllers extend TogglePreferenceController
...
Refactored USBTether, BluetoothTether and WifiTetherDisable preference
controllers to extend TogglePreferenceControllers, since they are all
SwitchPreference.
Bug: 150634051
Test: UsbTetherPreferenceControllerTest,
BluetoothTetherPreferenceControllerTest,
WifiTetherDisablePreferenceControllerTest,
CodeInspectionTest
Change-Id: I3b1d1c4e678c65ced8dd506a87c3c43ed300d64f
2020-03-03 11:28:18 -08:00
Yanting Yang
0bc52c307e
Fix double scroller of App info page
...
App info page has enabled the FastScroll for recycler view to provide a
vertical scroll bar.
In tabbed screen, the default scroller will be shown and then occurred
overlap problem with FastScroller.
Hide the default scroller to fix this double scroller problem.
Fixes: 150285712
Test: visual
Change-Id: I26390a0497d820e3a07e8df247a4bc03b5ff23d9
2020-03-03 22:48:05 +08:00
Automerger Merge Worker
e358b7ab8c
Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 43d72405b5
...
Change-Id: Icff2d3010afe04f74eb1639360324400a4add3ed
2020-03-03 12:25:31 +00:00
Automerger Merge Worker
3cee900a20
Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9
...
Change-Id: Ic87db00a6c97157d65b3b4d5b8138e73bbf40a62
2020-03-03 12:25:25 +00:00
Automerger Merge Worker
43d72405b5
Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f
...
Change-Id: Icfa72b48ab61fc16fbfaa63aaa39ffa359523d08
2020-03-03 12:12:32 +00:00
Automerger Merge Worker
36a30b38b9
Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f
...
Change-Id: I865472594bd8c37b1fda311e99276238fb15d2ac
2020-03-03 12:12:23 +00:00
TreeHugger Robot
6acde7c21f
Merge "ShortcutPreference Toggle design." into rvc-dev
2020-03-03 12:01:57 +00:00
Automerger Merge Worker
fcaf45ba79
[automerger skipped] Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 am: 42b698cdc5 -s ours am: 68eb90cda8 -s ours
...
am skip reason: Change-Id I904da749df7074918d205ebd004a173ed109c561 with SHA-1 569f760c12 is in history
Change-Id: Ib60019f859877fb46eed2c77d114a08fede3dad9
2020-03-03 11:05:42 +00:00
Automerger Merge Worker
a79cb95017
[automerger skipped] Remove reference to PhoneConstant. am: 28c11a8c01 am: c405329ce7 -s ours am: c1ee210aef -s ours
...
am skip reason: Change-Id I2e1b9ac5b9ab051876f1bb26866d055f822bac90 with SHA-1 72e5cecd2a is in history
Change-Id: I0d58b4bb5baef39bc9b05dca64e432483d132d6f
2020-03-03 11:05:40 +00:00
Automerger Merge Worker
68eb90cda8
[automerger skipped] Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 am: 42b698cdc5 -s ours
...
am skip reason: Change-Id I904da749df7074918d205ebd004a173ed109c561 with SHA-1 569f760c12 is in history
Change-Id: I23fc0161148e4c7f30b017a41fd04749f7d239d3
2020-03-03 10:49:36 +00:00
Automerger Merge Worker
c1ee210aef
[automerger skipped] Remove reference to PhoneConstant. am: 28c11a8c01 am: c405329ce7 -s ours
...
am skip reason: Change-Id I2e1b9ac5b9ab051876f1bb26866d055f822bac90 with SHA-1 72e5cecd2a is in history
Change-Id: I1e9547363f67b8bb1b79cb25961054b7efc5c4fa
2020-03-03 10:49:35 +00:00
Automerger Merge Worker
42b698cdc5
Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5
...
Change-Id: I237ff4ef41d3dfb3fd74f74e0c252898d19962e5
2020-03-03 10:27:48 +00:00
Automerger Merge Worker
c405329ce7
Remove reference to PhoneConstant. am: 28c11a8c01
...
Change-Id: I635f49570f67f88cca0f937bb3aac3361f9a926a
2020-03-03 10:27:47 +00:00
Treehugger Robot
1ea70d24d5
Merge changes I193805ef,I2e1b9ac5
...
* changes:
[Settings] Replace isImsRegistered
Remove reference to PhoneConstant.
2020-03-03 10:15:27 +00:00
Automerger Merge Worker
a43cd13dad
[automerger skipped] Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: 4c435922e5 -s ours
...
am skip reason: Change-Id Iec0f57b988e1d4fd08bca040abd1bb30b6991507 with SHA-1 051c3ecaa3 is in history
Change-Id: Ibb84fd8864ff09ccc924039f4c6a3d8c7028d4f8
2020-03-03 10:04:14 +00:00
Automerger Merge Worker
79741be4bc
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d am: b5191ad96a
...
Change-Id: If3cfa6a75e1db2b7685385f60a7b3a0287a2836b
2020-03-03 10:03:02 +00:00
Automerger Merge Worker
4c435922e5
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d
...
Change-Id: I5145177f1e9c982af790b0f7aa95ceaf84161c39
2020-03-03 09:52:20 +00:00
Automerger Merge Worker
b5191ad96a
Merge "Add policy transparency dialog to 'Remove work profile'" into rvc-dev am: cf470fab9d
...
Change-Id: I6d12c929d4fd1c763b6a49d4cfe7b82da5075e5d
2020-03-03 09:52:01 +00:00