Commit Graph

14640 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
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
rafftsai
662aa42bca Merge "MagnificationPreferenceFragment use DashboardFragment" into pi-dev am: e1549f0af1
am: 9d4f21140c

Change-Id: I88ebcb0cc46b03f42acb242e58857585e4ae63f8
2018-04-02 19:58:51 -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
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
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
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
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
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
HJ ChangLiao
53bc8f575f Merge "Wake notifications to TogglePreferenceController" into pi-dev am: 3173e9d103
am: 64b0fbf89e

Change-Id: I69c71e6fc9ebda8f8641f3d6e667a9081eb33ef6
2018-03-31 10:35:22 +00:00
Tracy Zhou
5d538ca257 Merge "Update screen pinning instructions for QuickStep." into pi-dev am: ef440bd313
am: e25fe8e3bf

Change-Id: Iafc0b77cc1ba7b6e664beb98d0f116d2542e5fe0
2018-03-31 09:03:20 +00:00
Fan Zhang
564bf11ece Merge "Update wi-fi hotspot min length of summary to 2" into pi-dev am: 8608f6b000
am: 0dda026432

Change-Id: Ic4ab7959061fce5040ae824d0de71cc75002ad45
2018-03-31 07:46:40 +00:00
Salvador Martinez
0f9a6d439f Merge "Update add network dialog to not make networks hidden by default" into pi-dev am: 9dc3f74ccf
am: e36aafd230

Change-Id: I1899e6d309bdb6c997cc9846742623cb272a8aab
2018-03-31 07:43:17 +00:00
TreeHugger Robot
94bc86c12a Merge "Use colorPrimary for EntityHeader's background." 2018-03-31 06:15:37 +00:00
HJ ChangLiao
64b0fbf89e Merge "Wake notifications to TogglePreferenceController" into pi-dev
am: 3173e9d103

Change-Id: Iae79df1337ec924937ce6f704f927d455451f58d
2018-03-31 05:28:49 +00:00
TreeHugger Robot
3173e9d103 Merge "Wake notifications to TogglePreferenceController" into pi-dev 2018-03-31 05:15:28 +00:00
Tracy Zhou
e25fe8e3bf Merge "Update screen pinning instructions for QuickStep." into pi-dev
am: ef440bd313

Change-Id: I098e8f3981a045e31568091dcd24d9b5d74612e8
2018-03-31 04:30:16 +00:00
Daniel Nishi
1a509e4af9 Merge "Polish the About Phone page." into pi-dev am: e645558049
am: 45a587441f

Change-Id: I18252d96dc06d1f47c0121ce7bb45d5820f4dd69
2018-03-31 04:18:08 +00:00
Lei Yu
4e5ec9a9c1 Merge "Remove the obsolete bluetooth code" into pi-dev am: fa150fca3c
am: a5a338dff6

Change-Id: Icbc382b54b4bfe329aa8f2045433885997badf05
2018-03-31 03:35:30 +00:00
Fan Zhang
62b5000647 Merge "Remove networkScorer wrapper" into pi-dev am: 272d3b5096
am: 0cad854925

Change-Id: Ieb6bf1eed2e0877d5223bb45036af42ed6ebd791
2018-03-31 03:34:46 +00:00
Lei Yu
1ad1a29d88 Merge "Update the battery saver summary" into pi-dev am: 97dd3c9aac
am: 5b8c6c39e9

Change-Id: I6584692ea03b6f1c8bea8ceda4693d48d057e9e1
2018-03-31 03:34:11 +00:00
HJ ChangLiao
5621641c41 Wake notifications to TogglePreferenceController
Convert Wake for new notifications to TogglePreferenceController
Because Slice controller only support Constructor(context)
Move other parameter to setAmbientDisplayConfiguration

Change-Id: I01042b84217ad9592fece966374140dffaf813e4
Fixes:67997460
Test: make RunSettingsRoboTests -j
2018-03-31 03:13:41 +00:00
Shaotang Li
aab7756f08 Use colorPrimary for EntityHeader's background.
Bug: 76219670
Test: check color from screen manually.
Change-Id: If13d5cbd2bd7db1c6d9c9f840281601ab78ba267
2018-03-31 11:09:30 +08:00
Fan Zhang
0dda026432 Merge "Update wi-fi hotspot min length of summary to 2" into pi-dev
am: 8608f6b000

Change-Id: Ia36e6e4c02d2b7b8bf0dda508a2547b3b286800d
2018-03-31 02:55:01 +00:00
Bill Yi
ca9e5c682a Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I7d6f7e4fa935eb00c198e0ad018faa42ec7dee05
2018-03-30 19:48:05 -07:00
TreeHugger Robot
ef440bd313 Merge "Update screen pinning instructions for QuickStep." into pi-dev 2018-03-31 02:21:15 +00:00
Salvador Martinez
e36aafd230 Merge "Update add network dialog to not make networks hidden by default" into pi-dev
am: 9dc3f74ccf

Change-Id: I463adc8f49a2707d4db3c7ff6a2c9fc6f7b6d2bd
2018-03-31 02:10:50 +00:00
Fan Zhang
8608f6b000 Merge "Update wi-fi hotspot min length of summary to 2" into pi-dev 2018-03-31 00:45:49 +00:00
Lei Yu
824bd92a16 Merge "Update battery strings" into pi-dev am: 7bbc11e87d
am: ab4ebab76c

Change-Id: Ic7bd7ff889bf921cdf3123d5df7a73795f3b734a
2018-03-31 00:21:58 +00:00
Tracy Zhou
7bc31e9c21 Update screen pinning instructions for QuickStep.
Change-Id: I786c7a1f4dd5d13d0ea69abe5c56f565a5bb16ae
Fixes: 76317335
Test: N/A
2018-03-30 17:06:02 -07:00
Daniel Nishi
45a587441f Merge "Polish the About Phone page." into pi-dev
am: e645558049

Change-Id: I05a7128ca22960baa8ce19585441864f1d4d8a36
2018-03-30 23:56:52 +00:00