Alex Salo
925c6c0e68
Merge "Re-enable the test" into qt-dev am: 95c26b67f1
...
am: ee9f413a0f
2019-05-08 14:48:07 -07:00
Fan Zhang
5f91d8da42
Merge "Display settings homepage content fully edge-to-edge" into qt-dev am: c084301c02
...
am: 7f58e8cd1b
2019-05-08 14:47:07 -07:00
Jonathan Scott
3935966a7e
Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am: db98a8edec -s ours am: 1fd7dfb12e
...
am: 9017dc6c0a
2019-05-08 14:30:52 -07:00
Jonathan Scott
b16b6dbd61
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am: db98a8edec -s ours am: 019e435e87
...
am: c1c2a98c51
2019-05-08 14:27:39 -07:00
Lei Yu
b9974fddc4
Merge "Add null check when restart batteryinfo loader" into qt-dev am: 285fc7f7c3
...
am: ddf3268ad1
2019-05-08 14:24:40 -07:00
Alex Salo
ee9f413a0f
Merge "Re-enable the test" into qt-dev
...
am: 95c26b67f1
2019-05-08 14:07:58 -07:00
Fan Zhang
7f58e8cd1b
Merge "Display settings homepage content fully edge-to-edge" into qt-dev
...
am: c084301c02
2019-05-08 14:07:00 -07:00
Jonathan Scott
9017dc6c0a
Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am: db98a8edec -s ours
...
am: 1fd7dfb12e
2019-05-08 14:00:15 -07:00
Jonathan Scott
c1c2a98c51
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am: db98a8edec -s ours
...
am: 019e435e87
2019-05-08 13:57:25 -07:00
Lei Yu
ddf3268ad1
Merge "Add null check when restart batteryinfo loader" into qt-dev
...
am: 285fc7f7c3
2019-05-08 13:50:37 -07:00
TreeHugger Robot
95c26b67f1
Merge "Re-enable the test" into qt-dev
2019-05-08 20:29:38 +00:00
Fan Zhang
c084301c02
Merge "Display settings homepage content fully edge-to-edge" into qt-dev
2019-05-08 20:26:31 +00:00
Android Build Merger (Role)
1fd7dfb12e
Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am: db98a8edec -s ours am skip reason: subject contains skip directive" into qt-dev
2019-05-08 20:20:20 +00:00
Lei Yu
285fc7f7c3
Merge "Add null check when restart batteryinfo loader" into qt-dev
2019-05-08 20:18:11 +00:00
Jonathan Scott
019e435e87
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev
...
am: db98a8edec
2019-05-08 13:17:58 -07:00
Lei Yu
e0bde475a1
Merge "Update datausage for DataUsagePreferenceController" into qt-dev am: 2ace95f386
...
am: f3cd7b6b17
2019-05-08 13:14:29 -07:00
TreeHugger Robot
db98a8edec
Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev
2019-05-08 20:00:27 +00:00
Lei Yu
f3cd7b6b17
Merge "Update datausage for DataUsagePreferenceController" into qt-dev
...
am: 2ace95f386
2019-05-08 12:56:23 -07:00
Aran Ink
f57b9549be
Merge "Use correct constants for Global Actions Panel settings." into qt-dev am: 7627363d3e
...
am: 6d740fdb4c
2019-05-08 12:50:19 -07:00
Antony Sargent
7c27e5f88a
Merge "Fix two problems related to data connectivity in the multi-SIM header" into qt-dev am: ea6bd51bea
...
am: a3c46e0543
2019-05-08 12:40:01 -07:00
TreeHugger Robot
2ace95f386
Merge "Update datausage for DataUsagePreferenceController" into qt-dev
2019-05-08 19:20:13 +00:00
Aran Ink
6d740fdb4c
Merge "Use correct constants for Global Actions Panel settings." into qt-dev
...
am: 7627363d3e
2019-05-08 12:08:02 -07:00
Antony Sargent
a3c46e0543
Merge "Fix two problems related to data connectivity in the multi-SIM header" into qt-dev
...
am: ea6bd51bea
2019-05-08 11:59:05 -07:00
Aran Ink
7627363d3e
Merge "Use correct constants for Global Actions Panel settings." into qt-dev
2019-05-08 18:56:26 +00:00
Fan Zhang
3e14383a28
Display settings homepage content fully edge-to-edge
...
This is needed to support fully gesture navigation.
Bug: 132182711
Test: visual
Change-Id: Ifaf15ecec73b974356355a74e73754f95b84ad3e
2019-05-08 11:43:58 -07:00
TreeHugger Robot
ea6bd51bea
Merge "Fix two problems related to data connectivity in the multi-SIM header" into qt-dev
2019-05-08 18:31:39 +00:00
Lei Yu
b47b99ed38
Add null check when restart batteryinfo loader
...
Even though we unregister contentObserver in onPause and register
in onResume, callback still be called while fragment is detached.
Anyhow add a null check in settings to stop crash
Fixes: 131905853
Test: RunSettingsRoboTests
Change-Id: I8c0c2c04c3b8d942e0c97cf71a7d3e735a24b467
2019-05-08 11:12:55 -07:00
Fan Zhang
31ba39e333
Merge "Add flag to disable part of event_logging in Settings." into qt-dev am: c949d12a12
...
am: 25e5a98734
2019-05-08 11:05:52 -07:00
Edgar Wang
bc1895971b
Merge "Show admin dialog when preference is disabled by Device Admin" into qt-dev am: e3278d8240
...
am: ed2e1e9a0f
2019-05-08 10:52:04 -07:00
JeiFeng Lee
3d278e7bbd
Merge "[PATCH] Buttons in storage settings" into qt-dev am: d88ca05b2e
...
am: d851d36b8c
2019-05-08 10:51:01 -07:00
Yi-Ling Chuang
ead58c3d6d
Merge "Add null check before setting the visibility of swipe background" into qt-dev am: 1079d2833a
...
am: 9a8717c9c0
2019-05-08 10:48:29 -07:00
Alex Salo
83a63abd2d
Re-enable the test
...
Update the test to handle new API and simplify the logic in the
controller.
Bug: 130897305
Test: make RunSettingsRoboTests -j64
Change-Id: I0c46ff22d4a3bf913add753f85a24af9aeee0a33
2019-05-08 17:48:12 +00:00
Fan Zhang
25e5a98734
Merge "Add flag to disable part of event_logging in Settings." into qt-dev
...
am: c949d12a12
2019-05-08 10:40:03 -07:00
Edgar Wang
ed2e1e9a0f
Merge "Show admin dialog when preference is disabled by Device Admin" into qt-dev
...
am: e3278d8240
2019-05-08 10:32:06 -07:00
Lei Yu
9bc3273489
Update datausage for DataUsagePreferenceController
...
Data usage number was wrong because we didn't set correct
subId, this CL fixes this issue.
Bug: 132113657
Test: RunSettingsRoboTests
Change-Id: If7c9cf2f4709d9a8e5f9a154c02de9484800d6d5
2019-05-08 10:25:10 -07:00
JeiFeng Lee
d851d36b8c
Merge "[PATCH] Buttons in storage settings" into qt-dev
...
am: d88ca05b2e
2019-05-08 10:16:42 -07:00
TreeHugger Robot
c949d12a12
Merge "Add flag to disable part of event_logging in Settings." into qt-dev
2019-05-08 17:15:03 +00:00
Yi-Ling Chuang
9a8717c9c0
Merge "Add null check before setting the visibility of swipe background" into qt-dev
...
am: 1079d2833a
2019-05-08 10:12:51 -07:00
TreeHugger Robot
e3278d8240
Merge "Show admin dialog when preference is disabled by Device Admin" into qt-dev
2019-05-08 17:03:42 +00:00
TreeHugger Robot
d88ca05b2e
Merge "[PATCH] Buttons in storage settings" into qt-dev
2019-05-08 16:35:12 +00:00
TreeHugger Robot
1079d2833a
Merge "Add null check before setting the visibility of swipe background" into qt-dev
2019-05-08 16:34:32 +00:00
Aran Ink
6e858db304
Merge "Create Settings preference for Global Actions Panel." into qt-dev am: 70313a4600
...
am: 6bf5b847f6
2019-05-08 07:40:11 -07:00
Aran Ink
6bf5b847f6
Merge "Create Settings preference for Global Actions Panel." into qt-dev
...
am: 70313a4600
2019-05-08 07:35:13 -07:00
Aran Ink
70313a4600
Merge "Create Settings preference for Global Actions Panel." into qt-dev
2019-05-08 14:16:07 +00:00
TreeHugger Robot
5894aa6948
Merge "Misc change about ResetNetworkConfirm"
2019-05-08 08:10:16 +00:00
Christopher Dombroski
acc87f1d3f
[automerger skipped] Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd am: aebc5bbc94 am: 1d163af113 am: 6b34347b4c -s ours am: 484d5f914b -s ours
...
am: d4e19bf92ed3864daebd
2019-05-07 23:40:39 -07:00
Winson Chung
14a487f821
Merge "Disable settings preferences when the packages do not exist" into qt-dev am: 46b356d37d
...
am: 0936f8f942
2019-05-07 23:24:20 -07:00
Christopher Dombroski
d4e19bf92e
[automerger skipped] Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd am: aebc5bbc94 am: 1d163af113 am: 6b34347b4c -s ours
...
am: 484d5f914bd3864daebd
2019-05-07 22:56:47 -07:00
Christopher Dombroski
484d5f914b
[automerger skipped] Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd am: aebc5bbc94 am: 1d163af113
...
am: 6b34347b4cd3864daebd
2019-05-07 22:00:45 -07:00
Winson Chung
0936f8f942
Merge "Disable settings preferences when the packages do not exist" into qt-dev
...
am: 46b356d37d
2019-05-07 21:29:28 -07:00
