Commit Graph

44390 Commits

Author SHA1 Message Date
TreeHugger Robot
afafd17873 Merge "Change screen lock preference UI" 2018-04-03 17:12:29 +00:00
Lenka Trochtova
60d38db8d9 Enterprice privacy: let the user know if admin enabled backups. am: a112226db2
am: 6f42f7beec

Change-Id: Iaf11a4d7a7880c77be65d97bb5c9a3527b9b2c22
2018-04-03 08:14:55 -07:00
Lenka Trochtova
6f42f7beec Enterprice privacy: let the user know if admin enabled backups.
am: a112226db2

Change-Id: Id8525709f9d91d13fd7f930d08b6e0bdb3f9b016
2018-04-03 08:02:36 -07:00
Lenka Trochtova
a112226db2 Enterprice privacy: let the user know if admin enabled backups.
Bug: 73750212
Bug: 64012357
Test: make RunSettingsGoogleRoboTests

Change-Id: I586eaccaebb89a8b3e5b4014b3d6427ab2eb15a9
2018-04-03 13:58:39 +02:00
Chalard Jean
07f803d115 Merge "Move the Private DNS dialog back to the top level." into pi-dev am: a62df616f9
am: cf793eb632

Change-Id: I2a5a0d55fb01091deb00aa7d79f72344207e8793
2018-04-03 02:05:20 -07:00
Fan Zhang
f60c3384fa Merge "Remove more wrappers" into pi-dev am: d73d3a8f55
am: 893f9db1ac

Change-Id: I7f9e765e842e4bc8f8c4ad3c041faa9edee2b744
2018-04-03 01:54:04 -07:00
dollylee
a1aeb0b40e Change screen lock preference UI
Change header string to 'Screen lock' and remove a duplicated 'Lock screen message'

Bug: 35960702
Test: manual
Change-Id: I9924ae18e99065f83556520f259ed74d9028637e
2018-04-03 16:19:58 +08:00
Chalard Jean
cf793eb632 Merge "Move the Private DNS dialog back to the top level." into pi-dev
am: a62df616f9

Change-Id: I00414432f7b55038c1cd0c9bda83935c2f25ce40
2018-04-02 22:26:26 -07:00
Chalard Jean
a62df616f9 Merge "Move the Private DNS dialog back to the top level." into pi-dev 2018-04-03 05:17:56 +00:00
TreeHugger Robot
87e4022129 Merge "Add afterclass method to remove static field" 2018-04-03 04:41:57 +00:00
Fan Zhang
893f9db1ac Merge "Remove more wrappers" into pi-dev
am: d73d3a8f55

Change-Id: Ic08a6f5c1b294df3562adfe526247419d762c034
2018-04-02 21:14:43 -07:00
Matthew Fritze
6c79de9a75 Merge "Expand isAvailable to include DISABLED_DEPENDENT" into pi-dev am: 2a51657c8e
am: 749728094f

Change-Id: Ibb470b1340d5f7c0b151b635bd7c64b5dfd8e1c7
2018-04-02 20:15:33 -07:00
rafftsai
662aa42bca Merge "MagnificationPreferenceFragment use DashboardFragment" into pi-dev am: e1549f0af1
am: 9d4f21140c

Change-Id: I88ebcb0cc46b03f42acb242e58857585e4ae63f8
2018-04-02 19:58:51 -07:00
Pengquan Meng
27146be745 [automerger skipped] Fixed ApnEditor issue am: 519009d3ed
am: 572f658ce5  -s ours

Change-Id: I19bb3958649ffe50ccc8dff19493e8dfbbc6c6e5
2018-04-02 19:07:26 -07:00
TreeHugger Robot
d73d3a8f55 Merge "Remove more wrappers" into pi-dev 2018-04-03 02:07:17 +00:00
Matthew Fritze
749728094f Merge "Expand isAvailable to include DISABLED_DEPENDENT" into pi-dev
am: 2a51657c8e

Change-Id: Ia0ca751bebd46c81a0879ba2f518ac081a7ab3d0
2018-04-02 18:06:00 -07:00
rafftsai
9d4f21140c Merge "MagnificationPreferenceFragment use DashboardFragment" into pi-dev
am: e1549f0af1

Change-Id: I10d7a92fabf1f1c6ca7fba2ed0ef78c728e34840
2018-04-02 17:59:52 -07:00
Pengquan Meng
572f658ce5 Fixed ApnEditor issue
am: 519009d3ed

Change-Id: Idab921debf4a00895e5c93766327bf91b40864c0
2018-04-02 23:55:33 +00:00
Fan Zhang
947a673f74 Remove more wrappers
- WallpaperManagerWrapper
- UserManagerWrapper

Bug: 76167422
Test: robotests
Change-Id: I3ca866089082e01f1e9d7a4554387962f45a5437
2018-04-02 16:51:40 -07:00
TreeHugger Robot
2a51657c8e Merge "Expand isAvailable to include DISABLED_DEPENDENT" into pi-dev 2018-04-02 23:49:22 +00:00
Fan Zhang
bf0a17a90b Merge "Remove wrapper for device policy manager" into pi-dev am: e35e00712c
am: 4d91ea3036

Change-Id: If7baa937eda42db42cc5161c195f8da56677f06e
2018-04-02 22:30:37 +00:00
Salvador Martinez
cdaf7f2c32 Update color whitelist for check color repohook am: 38c4b38740
am: f6812242e4

Change-Id: If8e4b2c0140d559b0c8b024f18025ae530322b29
2018-04-02 22:29:55 +00:00
Lei Yu
d5dceb7d5c Merge changes Ib497aca6,Ic6def54a into pi-dev am: 5e8a0e2436
am: fc6f4e05da

Change-Id: I44510b8dd49325b913d0d7ad82ceb844f3d98886
2018-04-02 22:29:29 +00:00
Salvador Martinez
49d0d7b492 Merge "Update auto wi-fi to prompt user for permissions" into pi-dev am: 27587f7884
am: 3903f787e9

Change-Id: Ia5f05b32874ec93019fad725bb78d1adae922e4b
2018-04-02 22:27:49 +00:00
TreeHugger Robot
e1549f0af1 Merge "MagnificationPreferenceFragment use DashboardFragment" into pi-dev 2018-04-02 22:25:04 +00:00
Lei Yu
739c68c369 Merge "Update the battery string." into pi-dev am: 43a325dd05
am: 3dbdb27605

Change-Id: If997f4feac5446310ab8e98091ea40b65aa5256c
2018-04-02 21:56:11 +00:00
Jyun LuoLai
6c5c6d7c22 Merge "Let battery status icon has consist UI in PowerSummaryPage" into pi-dev am: ab19293cf4
am: 6b0a77647c

Change-Id: I2fffa4d581d527b302056e2535f496e62ed1c272
2018-04-02 21:44:35 +00:00
Fan Zhang
4d91ea3036 Merge "Remove wrapper for device policy manager" into pi-dev
am: e35e00712c

Change-Id: I2b10893350176f34604d1a9dfeb9c5a6256a5842
2018-04-02 21:35:55 +00:00
Salvador Martinez
f6812242e4 Update color whitelist for check color repohook
am: 38c4b38740

Change-Id: I6667de2d1b0520c5291cd6f3efe081d81a800e3c
2018-04-02 21:31:42 +00:00
Lei Yu
fc6f4e05da Merge changes Ib497aca6,Ic6def54a into pi-dev
am: 5e8a0e2436

Change-Id: Iaf656a0a6600e5907a7272b1c6e12e2b3a58fd06
2018-04-02 21:24:24 +00:00
Salvador Martinez
3903f787e9 Merge "Update auto wi-fi to prompt user for permissions" into pi-dev
am: 27587f7884

Change-Id: I9c171a39c3594641f46f53a789e383798bae248c
2018-04-02 21:14:15 +00:00
Lei Yu
3dbdb27605 Merge "Update the battery string." into pi-dev
am: 43a325dd05

Change-Id: I8282a986797fdce16673a890d501853348af7123
2018-04-02 20:58:15 +00:00
rafftsai
807506b166 MagnificationPreferenceFragment use DashboardFragment
- Move preference related logic to Controller
- Add settings:controller in xml file

Bug: 73899467
Test: manual
Test: make RunSettingsRoboTests

Change-Id: I3eaccc617c4408f50110bf1f5df3482f491f7393
Signed-off-by: rafftsai <rafftsai@android.com>
2018-04-02 13:18:58 -07:00
Jyun LuoLai
6b0a77647c Merge "Let battery status icon has consist UI in PowerSummaryPage" into pi-dev
am: ab19293cf4

Change-Id: Ifb1c8093929fdc763b90d3a324c875177e654efb
2018-04-02 19:55:09 +00:00
TreeHugger Robot
e9c8a73607 Merge "Add registry for PreventRingingGestureSettings" 2018-04-02 19:22:30 +00:00
Matthew Fritze
8c48defb52 Expand isAvailable to include DISABLED_DEPENDENT
isAvailable will now return true when getAvailabilityStatus
returns DISABLED_DEPENDENT_SETTING. This is because the setting
should be displayed in the Fragment even if it has a dependent setting,
which matches existing behaviour. Slices will still display the warning
slice without inline content, where the main action brings you to the
setting page. For now, we have to assume the user will be able to figure
out how to enable the setting. In Q, we would like to build a more
intelligent flow so that we can prompt or even help the user fix the
dependency (we just ran out of time in P).

The only setting that had previously used DISABLE_DEPENDENT_SETTING
was a developer option.

Change-Id: I1f774a2e09cb60de01388cf6c35785c8b5dea176
Fixes: 77334915
Test: robotests
2018-04-02 11:59:40 -07:00
Pengquan Meng
519009d3ed Fixed ApnEditor issue
The mainly changed:
1. Will not insert invalid apn data to database.
2. Clicking back button will save the APN data to database if the data is valid.

Test: make ROBOTEST_FILTER=ApnEditorTest -j40 RunSettingsRoboTests
Bug: 73745458
Bug: 67327863
Merged-In: Ie2c147cae03ad78d43c351e05add761b2dffac0c
Change-Id: Ie2c147cae03ad78d43c351e05add761b2dffac0c
(cherry picked from commit f39ef85653)
2018-04-02 18:53:53 +00:00
Pengquan Meng
811a0ad404 Merge "Fixed ApnEditor issue" 2018-04-02 18:52:31 +00:00
TreeHugger Robot
e35e00712c Merge "Remove wrapper for device policy manager" into pi-dev 2018-04-02 18:45:53 +00:00
Salvador Martinez
38c4b38740 Update color whitelist for check color repohook
It is blocking cl's being uploaded due to someone skipping the
repo-hooks.

Test: Can build and upload CL's
Bug: 77478756
Change-Id: I3ae4212fb06a5b82c0afe57dcd839f5a55583cce
2018-04-02 11:32:06 -07:00
TreeHugger Robot
5e8a0e2436 Merge changes Ib497aca6,Ic6def54a into pi-dev
* changes:
  Make anomaly jobs persistent.
  Update job ids in Settings
2018-04-02 16:44:51 +00:00
Chalard Jean
42405603c7 Move the Private DNS dialog back to the top level.
Bug: 64133961
Fixes: 74844869
Test: visual test and interaction
      also updated tests and checked they pass
Change-Id: I7c8d50e5941c2a7dd46014932bdace14dc222c80
2018-04-02 09:58:12 +00:00
hylo
ba3fce9559 Add registry for PreventRingingGestureSettings
Register PreventRingingGestureSettings to SearchIndexableResourcesImpl

Change-Id: Idbb9c09f844a327dc1dd865e932ae464db1933ee
Fixes: 77454987
Test: remove @ignore("b/73960706") and make RunSettingsRoboTests ROBOTEST_FILTER=CodeInspectionTest
2018-04-02 14:06:33 +08:00
hylo
14d00bbafd Add afterclass method to remove static field
Some unit tests did not clean their status
So add @after method to fix this issue

Change-Id: I9450714d1133049a87c2287f527f0598eab56041
Fixes: 73960706
Test: make RunSettingsRoboTests
2018-04-02 10:54:55 +08:00
TreeHugger Robot
27587f7884 Merge "Update auto wi-fi to prompt user for permissions" into pi-dev 2018-04-02 01:36:37 +00:00
TreeHugger Robot
43a325dd05 Merge "Update the battery string." into pi-dev 2018-04-02 01:33:28 +00:00
Jyun LuoLai
ab19293cf4 Merge "Let battery status icon has consist UI in PowerSummaryPage" into pi-dev 2018-04-02 01:27:56 +00:00
Fan Zhang
570bd7bb0c Merge "Remove wrappers" into pi-dev am: 1873faefb8
am: cb8a01dd00

Change-Id: I0b7f46ee3ff2626c2a2e3e471b8cd11a9667b21c
2018-03-31 11:14:36 +00:00
Fan Zhang
cb8a01dd00 Merge "Remove wrappers" into pi-dev
am: 1873faefb8

Change-Id: Id9c1c6625ddf6dccb39c19fb396a9009c447b33f
2018-03-31 11:08:34 +00:00
TreeHugger Robot
1873faefb8 Merge "Remove wrappers" into pi-dev 2018-03-31 11:00:25 +00:00