Commit Graph

60364 Commits

Author SHA1 Message Date
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
cec1f09aaa Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda
Change-Id: Ia8b5455a7856747dda56a94dea22c0f6a1d38eec
2020-03-04 02:32:59 +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
Automerger Merge Worker
969e0fddc6 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: eb31d86af9 am: 9ad579bfe6
Change-Id: I1a8d2a648ae152542968de06e5c1a368cc9cad4b
2020-03-04 01:55:45 +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
8029e937dd Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 61c7581322 am: 0b924d6cad
Change-Id: I54c0103e8b490a0423d968a1a2193243582929aa
2020-03-04 01:42:48 +00:00
Automerger Merge Worker
9ad579bfe6 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: eb31d86af9
Change-Id: I2cb340913046145917130697dcf188fa372c0e86
2020-03-04 01:40:49 +00:00
Automerger Merge Worker
8ae78e19a9 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: 0d7209e303
Change-Id: Ia3d5e817750c398575c1116072a5b179e00702bf
2020-03-04 01:40:08 +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
eb31d86af9 Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a
Change-Id: I131d6f9021fe9840b9617af4dfe5d6265371831e
2020-03-04 01:26:42 +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
Rahul Sabnis
3e0f661f11 Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."
Revert submission 10303287-revert-10253996-bt-a2dp-no-null-FQRXACWPIA

Reason for revert: Fixing breakage
Reverted Changes:
I4d9f2f819:Revert "Make sure calls to BluetoothA2dp APIs pass...
I771ca0d57:Revert "Need to now pass in active device instead ...
I76529c7a1:Revert "Pass in active device to all BluetoothA2dp...
I297bda68d:Revert "Require user pass in a non-null BluetoothD...
I525327959:Revert "Pass in active device to all BluetoothA2dp...
I1d8660b11:Revert "Pass in active device to all BluetoothA2dp...

Bug: 147287141
Test: robotests
Merged-In: I5aecfa4b5a8e371b914573ddd080acb98078bfca
Change-Id: I5aecfa4b5a8e371b914573ddd080acb98078bfca
2020-03-03 16:21:49 -08:00
Julia Reynolds
5879a2c8b4 Use contrasted color icons
Test: manual in dark mode
Fixes: 150411005
Change-Id: I850cf89fce79131f57f9e390225be91ad6cf3274
2020-03-03 16:18:19 -05: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
ed6a726216 Merge "Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3a059026bc" into rvc-qpr-dev-plus-aosp 2020-03-03 12:42:18 +00:00
Automerger Merge Worker
860971a028 Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3a059026bc
Change-Id: I6b9b3f0705d0f479da006ecca58f12b086c60310
2020-03-03 12:42:14 +00:00
Automerger Merge Worker
2c2c1b9540 Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 43d72405b5 am: e358b7ab8c
Change-Id: I104dab937a60a4f2b9cf03deeee9bd6a204765af
2020-03-03 12:42:11 +00:00
Automerger Merge Worker
9c00d5db7b Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3cee900a20
Change-Id: I70979fafb82a2986ebc582723c6d79c5e0a524b0
2020-03-03 12:42:01 +00:00
Automerger Merge Worker
3a059026bc Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9
Change-Id: Icfd47c2e0d5dfcb04347167fb31c4cbda59a7bf1
2020-03-03 12:25:31 +00: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
atrost
76f93fe912 Fix PlatformCompatDashboardTest.
CompatibilityChangeInfo constructor has a new parameter.
The logging only is not currently reflected in the dashboard - it will be grayed out as it's not overridable.
In a followup we can group those changes together in the UI.

Test: atest com.android.settings.development.compat.PlatformCompatDashboardTest
bug: 148009004
Change-Id: I833669f7f2a5128bdeda7451b8ff6e0bb753c500
2020-03-03 11:32:28 +00:00
Automerger Merge Worker
6ecf807448 [automerger skipped] Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 am: 42b698cdc5 -s ours am: 68eb90cda8 -s ours am: fcaf45ba79 -s ours
am skip reason: Change-Id I904da749df7074918d205ebd004a173ed109c561 with SHA-1 569f760c12 is in history

Change-Id: I05032fb277c7da998c8f5ef7f12aefb06b86cc1c
2020-03-03 11:18:47 +00:00
Automerger Merge Worker
fe3216fad9 [automerger skipped] Remove reference to PhoneConstant. am: 28c11a8c01 am: c405329ce7 -s ours am: c1ee210aef -s ours am: a79cb95017 -s ours
am skip reason: Change-Id I2e1b9ac5b9ab051876f1bb26866d055f822bac90 with SHA-1 72e5cecd2a is in history

Change-Id: I5c879a4397f97cbb3a34a22d3134a2e1b2e439c2
2020-03-03 11:18:45 +00:00
atrost
62c470475f Fix PlatformCompatDashboardTest.
CompatibilityChangeInfo constructor has a new parameter.
The logging only is not currently reflected in the dashboard - it will be grayed out as it's not overridable.
In a followup we can group those changes together in the UI.

Test: atest com.android.settings.development.compat.PlatformCompatDashboardTest
bug: 148009004
Change-Id: I833669f7f2a5128bdeda7451b8ff6e0bb753c500
Merged-In: I833669f7f2a5128bdeda7451b8ff6e0bb753c500
2020-03-03 11:16:01 +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