Automerger Merge Worker
f8d7068d84
[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb
am: 3dfc9bc59f
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I36730d6958077d8f43cd1bd259f2071c898c6d8e
2020-03-06 00:26:03 +00:00
Automerger Merge Worker
9b03774e7c
[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17
am: 567f83adbe
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia410ff9b6c93b99dc2a3e0a162bdc32881901589
2020-03-06 00:25:28 +00:00
Automerger Merge Worker
3dfc9bc59f
Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7d35be74cb
...
Change-Id: I841a54be0ccf815e08eed0b4d769ef01e7151317
2020-03-06 00:12:48 +00:00
Automerger Merge Worker
567f83adbe
Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09be9fbb17
...
Change-Id: I02042e7d32a1daa74e624c18633ef69dace67838
2020-03-06 00:12:13 +00:00
Automerger Merge Worker
90a99332e7
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54
...
Change-Id: Id8ea47aadc2d443bd8ac77cca1f7fc4ba4f63eca
2020-03-05 19:33:47 +00:00
TreeHugger Robot
54edae5e54
Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev
2020-03-05 19:15:30 +00:00
Bill Yi
7d35be74cb
Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE"
2020-03-05 18:27:29 +00:00
Bill Yi
09be9fbb17
Merge stage-aosp-master to aosp-master - DO NOT MERGE
...
Change-Id: Ic40bc7d2b6b306b5cfb0b061e5a3a6f8fe3737c9
2020-03-05 09:51:19 -08:00
Automerger Merge Worker
ef5570fd64
Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5
...
Change-Id: I99c8ee2ce6a6cb2a33ba9566bc2429183e6ed44d
2020-03-05 17:05:04 +00:00
Julia Reynolds
64fff70aa5
Merge "Use contrasted color icons" into rvc-dev
2020-03-05 17:02:15 +00:00
Automerger Merge Worker
ece27868c4
PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1
...
Change-Id: Idaa3569dbc41841a59103fd77c6d56895d89a102
2020-03-05 17:00:34 +00:00
SongFerngWang
8598dccce1
PreferredNetworkModePreferenceController's summary no 5G item
...
Bug: 150839189
Test: Summary show 5G items
Change-Id: I5fa42e48b8c073b4c4933b32417c2cbeada09a40
2020-03-05 14:08:53 +00:00
Automerger Merge Worker
b7fedbde23
String change on Storage page am: b7a3c9a8c6
...
Change-Id: Ib41098cad76e8f35cb96c1297a44286ec206683c
2020-03-05 11:45:30 +00:00
Tsung-Mao Fang
b7a3c9a8c6
String change on Storage page
...
The string of the CTA under "Settings > Storage" from "Free up space" to
"Manage storage" to match the new ux flow.
Test: visual
Fix: 150782402
Change-Id: Ic636d73b92f11f6f332475d591ff92633083bc85
2020-03-05 08:45:03 +00:00
Automerger Merge Worker
087e60ca06
Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814
...
Change-Id: I650985673b4c7401f5da545f8175f9baddb5f864
2020-03-05 08:08:41 +00:00
TreeHugger Robot
e8f1c6c814
Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev
2020-03-05 07:53:51 +00:00
Automerger Merge Worker
15d36aeddc
Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
...
Change-Id: I558b9d04bab94d072ff325937966f8dfb813465e
2020-03-05 05:58:56 +00:00
tim peng
5578920e4c
Merge "Add package name when launching output switcher from remote slice" into rvc-dev
2020-03-05 05:45:44 +00:00
Tsung-Mao Fang
2fc9fed89c
Fix pendingIntent in SettingsSliceProvider could be Hijacked
...
A malicious app is able to obtain this pending intent.
It can then mutate all fields except for the action and
launch the intent. This can be used to launch any activity
with the ACTION_SETTINGS action.
So, we enfore assign the package name for this intent,
it only can launch the settings app.
Fix: 147355897
Test: a) Install the new settings apk, and it won't launch other screen.
(See details in bug)
b) Start the settings search, slice search results work as normal.
Change-Id: Ie954d8a4b7153d6a4cac40621f363b45185990f2
(cherry picked from commit b3c0a2a6c1
)
Merged-In: Ie954d8a4b7153d6a4cac40621f363b45185990f2
2020-03-05 05:38:55 +00:00
Automerger Merge Worker
4a4ee98a19
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
...
Change-Id: I50df00daa2471adc120a9934febc4554a3608bde
2020-03-05 03:15:33 +00:00
Automerger Merge Worker
35014d26ed
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
...
Change-Id: I4f9570ea05ef71ae565fc1950c766f3d7bd8b618
2020-03-05 03:15:14 +00:00
Zhen Zhang
042aa85b50
Merge "Update SharedPreference values based on tethering state" into rvc-dev
2020-03-05 02:58:24 +00:00
TreeHugger Robot
d9f611fe6b
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev
2020-03-05 02:57:24 +00:00
Steven Liu
cc6eb5c0f7
Remove the unnecessary dependent on WifiTrackerLib.
...
Bug: 150467119
Test: build
Change-Id: I947d4ee2f88aadc2d8b2002a2c5b04f60c4d853b
2020-03-04 14:51:27 -08: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
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
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
Zhen Zhang
0c02d33818
Update SharedPreference values based on tethering state
...
TetherEnabler need to update tethering state of each tethering
interfaces to make sure other preferences that depends on these
SharedPreferences be consistent with UI.
Bug: 148968321
Test: TetherEnablerTest; CodeInspectionTest. Manully test, built and
flashed to crosshatch device.
Change-Id: Ie0be7748adf20e6fb0ff5489795b0ca0664b6323
2020-03-04 10:59:29 -08: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
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
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
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
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
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
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
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
Yanting Yang
0ab87cce3d
Merge "Fix double scroller of App info page" into rvc-dev
2020-03-04 06:51:19 +00:00
Tim Peng
2688639b05
Add package name when launching output switcher from remote slice
...
Bug: 150742783
Test: make -j42 RunSettingsRoboTests
Change-Id: I670870cd314dc9a51d7a9a58837b95b4b8cf8808
2020-03-04 13:30:41 +08: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
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