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
Android Build Merger (Role)
bd3672b2d8
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357
...
Change-Id: If8d375a600b9db7b011b08770ad6e7fbf29073c4
2019-05-08 20:51:48 +00:00
Android Build Merger (Role)
333afb4357
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6
...
Change-Id: Ief43c33183fa5f24cf3bd9f26c9d7362d235492e
2019-05-08 20:51:45 +00:00
Android Build Merger (Role)
003ce809c6
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b
...
Change-Id: I89b5b93b63beb9f52e5799c822edccf208158f39
2019-05-08 20:51:43 +00:00
Android Build Merger (Role)
7d86790c7b
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc
...
Change-Id: Ibb0d6c1d0253c78160d66e27a2847192c19d10d1
2019-05-08 20:51:40 +00:00
Android Build Merger (Role)
133337b4dc
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29
...
Change-Id: Iee20bc7fe4fe756b87c9231689792ab50f8a76bc
2019-05-08 20:51:37 +00:00
Jonathan Scott
b985aa2f29
[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks.
...
Bug: 127605586
Test: Manual
Change-Id: I4186c2d57b42b6e3d27013f2c9708fca56c561fe
Merged-In: I1cdd82bea4dc9e4182694b061a7746aa83dabdfe
2019-05-08 20:51:35 +00: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
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
Salvador Martinez
fb940feebf
Clear preferences when dialog acknowledged and increase order
...
This CL makes it so that the order on the seekbar is increased
to a very large value to ensure it gets added to the end in the
case where a refresh is triggered due to the first time battery
saver dialog. Additionally it clears the preferences on the screen
when we receive confirmation to ensure that no caching can cause
the seekbar ot show up on top of other preferences.
Test: atest BatterySaverScheduleSeekBarControllerTest
Bug: 132107662
Change-Id: I26bf2772ed7135daa4879bca17e0ecfc22a2d0dd
2019-05-08 12:28:43 -07:00
TreeHugger Robot
2ace95f386
Merge "Update datausage for DataUsagePreferenceController" into qt-dev
2019-05-08 19:20:13 +00:00
joshmccloskey
0458262fb3
Added Face Enroll Education Screen
...
Test: Builds
Bug: 131774352
Fixes: 131857742
Change-Id: Ib384b9efaf053b405ce3f55e449dd6abb9e75296
2019-05-08 19:15:50 +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
Beth Thibodeau
4765faa9cf
Increase char limit as requested by i18n team
...
Fixes: 132257773
Test: mp settingsg
Change-Id: I4c5c21899bb9fa61f8f8b32cd56dc57288e282bd
2019-05-08 15:05:55 -04: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
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
6bf5b847f6
Merge "Create Settings preference for Global Actions Panel." into qt-dev
...
am: 70313a4600
2019-05-08 07:35:13 -07:00
Annie Meng
6e2a67f538
Change inactive backup UI to show "Disabled by admin"
...
Change text displayed when backup is inactive for a user from "Backup
service isn't active" to "Disabled by admin".
Bug: 131296047
Test: Make backup inactive, check UI (primary and work profile)
Change-Id: I087755fa1e79564d320fe1fa62de92e3dc40a343
2019-05-08 15:18:10 +01:00
Aran Ink
70313a4600
Merge "Create Settings preference for Global Actions Panel." into qt-dev
2019-05-08 14:16:07 +00: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
Christopher Dombroski
6b34347b4c
Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd am: aebc5bbc94
...
am: 1d163af113
2019-05-07 21:15:40 -07:00
Yi-Ling Chuang
0f75eb550e
Add null check before setting the visibility of swipe background
...
Some contextual cards does not allow card dismissal, so they won't have
swipe background declared in the layout file. Add null check to prevent
from NPE.
Fixes: 132209310
Test: robotests & launch Settings
Change-Id: I31f897f445c4901d007c8187fe69aea416b915d1
2019-05-08 12:04:36 +08:00
Winson Chung
46b356d37d
Merge "Disable settings preferences when the packages do not exist" into qt-dev
2019-05-08 03:47:09 +00:00
Arc Wang
1d2527061a
Fix Wi-Fi QR code scanner height at 360dp
...
To avoid error message cut on small screen devices
Bug: 131628795
Test: manual
Change-Id: I33fa55da22823064608739bed33cdd287bffa0b8
2019-05-08 11:43:22 +08:00
Christopher Dombroski
1d163af113
Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd
...
am: aebc5bbc94
2019-05-07 20:20:44 -07:00
Christopher Dombroski
aebc5bbc94
Treat mode_default as denied for install_unknown_apps
...
am: 4b78bcd5cd
2019-05-07 19:14:43 -07:00
Arc Wang
10371fd3a5
Add margin 24dp to the error message of Wi-Fi QR code scanner
...
Bug: 131628073
Test: manual
Change-Id: I8eaf461efbc8e3c44952d92b151ca621c4640bc1
2019-05-08 09:53:15 +08:00
Fan Zhang
83ff47b4d1
Merge "Add an interface that returns time spent text for app." into qt-dev
...
am: 6e8c403360
2019-05-07 18:22:13 -07:00
TreeHugger Robot
6e8c403360
Merge "Add an interface that returns time spent text for app." into qt-dev
2019-05-08 00:11:32 +00:00
