Christine Franks
09ddd4d650
Merge "Add strings for night display UX changes" into pi-dev am: 0aa142ff18
...
am: f1cc3ad4a1
Change-Id: Id37f77209f3bb184f06cb7451bb1698307fa5396
2018-03-23 21:51:05 +00:00
Doris Ling
3d6dd75b90
Merge "Update battery saver condition text." into pi-dev am: 96a85d6aca
...
am: e6f6441255
Change-Id: I2836de5db3950e01d0548c6443c1bbe4e104cd9e
2018-03-23 21:45:52 +00:00
Salvador Martinez
c46a7562ef
Merge "Add new string for updating auto-wifi" into pi-dev am: e9b0ba9bac
...
am: 61266a2c29
Change-Id: I1a2df19f2dbc93b4ab4b77bd28ff812e23b57d0c
2018-03-23 21:39:13 +00:00
Jan Nordqvist
96e31ec1ad
Merge "Rename "Primary data" to "Current data"." into pi-dev am: 7884751938
...
am: becfdd247f
Change-Id: I1c9126dd889f11ebda15a8eef50acf0aec99939a
2018-03-23 20:49:01 +00:00
Christine Franks
f1cc3ad4a1
Merge "Add strings for night display UX changes" into pi-dev
...
am: 0aa142ff18
Change-Id: Ib18f40bad556370bb3e56b223446754a9de8863c
2018-03-23 20:45:36 +00:00
Doris Ling
e6f6441255
Merge "Update battery saver condition text." into pi-dev
...
am: 96a85d6aca
Change-Id: Ia5e121af00fa07aae39f89b70a5a1dc36bb171d4
2018-03-23 20:37:55 +00:00
Salvador Martinez
61266a2c29
Merge "Add new string for updating auto-wifi" into pi-dev
...
am: e9b0ba9bac
Change-Id: Ieeefa5bc8a8ad96f80905b8838d2d0357627e1ef
2018-03-23 20:33:19 +00:00
Jan Nordqvist
becfdd247f
Merge "Rename "Primary data" to "Current data"." into pi-dev
...
am: 7884751938
Change-Id: Ieac649b12d0df53a1102a619afd59be6463d7adc
2018-03-23 20:12:03 +00:00
Lei Yu
18994382d5
Merge "Hide password for wifi tether" into pi-dev am: 9bb2efa0ff
...
am: 1684f605f7
Change-Id: I8351f06cfdf8e505e1c00c78bfc3daaca15703b4
2018-03-23 20:10:15 +00:00
Fan Zhang
2e1d9e802a
Merge changes I034a9f0a,Iad5ec577 into pi-dev am: dd5977901d
...
am: 7e75de29b1
Change-Id: Ife81eb4fa926cd9a54e84ea4b9d5374c07e1a5b6
2018-03-23 20:03:54 +00:00
Neil Fuller
8f5a7f2001
Merge "Show time zone used in or after 2018 only" into pi-dev am: cbaa984cde
...
am: 790a55fc97
Change-Id: Ibc62444b70c819f613df9e5c947cb6ec703af065
2018-03-23 19:48:40 +00:00
hylo
85afc26e7f
Merge "Add string for forget confirmation dialog" into pi-dev am: 4b8715afa8
...
am: ae943c5f4d
Change-Id: Id0915109c06f4fc55bd47facad574ee840196238
2018-03-23 19:43:18 +00:00
Tao Bao
7110bf4cd6
Merge "Add summary text for "Automatic system updates" option." into pi-dev am: 06bf8a21c6
...
am: 08888b75f8
Change-Id: I8f7d989bad4e605bdfd756afeb873d8fc00031ea
2018-03-23 19:36:57 +00:00
Lei Yu
1684f605f7
Merge "Hide password for wifi tether" into pi-dev
...
am: 9bb2efa0ff
Change-Id: I7f82bf71672b6e966bf699ca17a215547c0dc8d9
2018-03-23 18:51:42 +00:00
Fan Zhang
7e75de29b1
Merge changes I034a9f0a,Iad5ec577 into pi-dev
...
am: dd5977901d
Change-Id: If135a04e461c80dafe0994010d6d1b36324a8f9a
2018-03-23 18:46:08 +00:00
Neil Fuller
790a55fc97
Merge "Show time zone used in or after 2018 only" into pi-dev
...
am: cbaa984cde
Change-Id: Ibfeab2c86368c80315b6be18701e70deeac5069f
2018-03-23 18:40:32 +00:00
hylo
ae943c5f4d
Merge "Add string for forget confirmation dialog" into pi-dev
...
am: 4b8715afa8
Change-Id: I5d7217a63c5cd3585b38f15de892f00aa7beb6ed
2018-03-23 18:33:28 +00:00
Christine Franks
0aa142ff18
Merge "Add strings for night display UX changes" into pi-dev
2018-03-23 18:33:06 +00:00
Tao Bao
08888b75f8
Merge "Add summary text for "Automatic system updates" option." into pi-dev
...
am: 06bf8a21c6
Change-Id: I62b1f70d49b5492ffe9a4f442811f8ad11a1078c
2018-03-23 18:27:18 +00:00
TreeHugger Robot
96a85d6aca
Merge "Update battery saver condition text." into pi-dev
2018-03-23 18:20:24 +00:00
TreeHugger Robot
bf73ece580
Merge "Enable R8 for settings"
2018-03-23 18:09:44 +00:00
Salvador Martinez
e9b0ba9bac
Merge "Add new string for updating auto-wifi" into pi-dev
2018-03-23 18:09:04 +00:00
TreeHugger Robot
7884751938
Merge "Rename "Primary data" to "Current data"." into pi-dev
2018-03-23 17:59:56 +00:00
TreeHugger Robot
9bb2efa0ff
Merge "Hide password for wifi tether" into pi-dev
2018-03-23 17:37:23 +00:00
TreeHugger Robot
dd5977901d
Merge changes I034a9f0a,Iad5ec577 into pi-dev
...
* changes:
Get rid of UserPackageWrapper util.
Get rid of extra whitespace under divider lines
2018-03-23 17:36:54 +00:00
Neil Fuller
cbaa984cde
Merge "Show time zone used in or after 2018 only" into pi-dev
2018-03-23 17:18:36 +00:00
TreeHugger Robot
4b8715afa8
Merge "Add string for forget confirmation dialog" into pi-dev
2018-03-23 17:10:14 +00:00
Jason Monk
fb9b6077c4
Merge "Add option for settings to push to a device index" into pi-dev am: f9c6bc59ae
...
am: 5411c21dde
Change-Id: I48ecc5d6e892a8662d5f0ad019579d6d2396c18a
2018-03-23 17:08:10 +00:00
leo huang
2d6067a0f2
Merge "Align email provider correctly for RTL locales" into pi-dev am: 5de68c700d
...
am: 28d6fd6be8
Change-Id: I47db40d280b34adea0e537159dc972524c8ab8a8
2018-03-23 17:07:25 +00:00
TreeHugger Robot
06bf8a21c6
Merge "Add summary text for "Automatic system updates" option." into pi-dev
2018-03-23 17:05:20 +00:00
Jason Monk
5411c21dde
Merge "Add option for settings to push to a device index" into pi-dev
...
am: f9c6bc59ae
Change-Id: I150401825889647386877cd5e674a6a0378995f6
2018-03-23 16:59:20 +00:00
leo huang
28d6fd6be8
Merge "Align email provider correctly for RTL locales" into pi-dev
...
am: 5de68c700d
Change-Id: I85e8755685fe0c589991cb74646e8b2f2fb5cdb3
2018-03-23 16:58:26 +00:00
Jason Monk
f9c6bc59ae
Merge "Add option for settings to push to a device index" into pi-dev
2018-03-23 16:52:24 +00:00
TreeHugger Robot
5de68c700d
Merge "Align email provider correctly for RTL locales" into pi-dev
2018-03-23 16:49:47 +00:00
Christine Franks
68ddd0eaca
Add strings for night display UX changes
...
Bug: 73739388
Bug: 69912911
Test: make -j100 and make RunSettingsRoboTests -j100
Change-Id: I8f2ecef92fdc24b9d984cc7246875dcdf5969a5e
2018-03-23 09:30:48 -07:00
Lenka Trochtova
ecb417e770
Merge "Add a string for mandatory backups in DO disclosures screen." into pi-dev am: 7da5fe3f50
...
am: 1e23473f87
Change-Id: I145c34a56e49ad05defc552748b46e66f388c186
2018-03-23 15:30:26 +00:00
Lenka Trochtova
1e23473f87
Merge "Add a string for mandatory backups in DO disclosures screen." into pi-dev
...
am: 7da5fe3f50
Change-Id: Iaffce7d2f8d523ae37dbae9dcf2d4e453d0560c4
2018-03-23 15:20:15 +00:00
TreeHugger Robot
7da5fe3f50
Merge "Add a string for mandatory backups in DO disclosures screen." into pi-dev
2018-03-23 15:02:59 +00:00
Antoan Angelov
7e866d903e
Merge "Show policy transparency popup dialog for Bluetooth in Settings." into pi-dev am: 84a4dd0bde
...
am: 3f0b96cd18
Change-Id: I817a4aef7e1fbad8a6bccc9a455b32dabc13d96c
2018-03-23 14:26:03 +00:00
Antoan Angelov
3f0b96cd18
Merge "Show policy transparency popup dialog for Bluetooth in Settings." into pi-dev
...
am: 84a4dd0bde
Change-Id: I474a00b854451afa7058de91f6c0cd601803c951
2018-03-23 14:19:30 +00:00
Antoan Angelov
84a4dd0bde
Merge "Show policy transparency popup dialog for Bluetooth in Settings." into pi-dev
2018-03-23 14:10:29 +00:00
Jason Monk
f6edc7c80a
Add option for settings to push to a device index
...
The index implementation is optional and left up to the OEM.
Test: Open settings, see content in index
Test: robo tests
Bug: 68378569
Bug: 76102600
Change-Id: Idb8bb1e0cabbbe92e7a852e2eadbdcd8c2ab7d56
2018-03-23 09:36:57 -04:00
Lenka Trochtova
9157310cc3
Add a string for mandatory backups in DO disclosures screen.
...
Test: make -j64
Bug: 73750212
Bug: 64012357
Change-Id: I8a4b7eb65b0cbeffbe480497fa097c70dfd1f81e
2018-03-23 13:01:40 +01:00
Victor Chang
490e46e01b
Show time zone used in or after 2018 only
...
- Year 2018 is picked as the new time zone data
for picker is introduced in 2018. I can be adjusted
in the future to show more merged time zones.
- Add test to ensure each region has at least
one time zone.
- Fix a issue not using a singleton of TimeZoneData
in commit 6c33caad4b
Bug: 72142943
Test: atest SettingsUnitTests:TimeZoneDataTest
Change-Id: I5eba7fbd59a2d3fd2e8062c9615946dc4bbb6314
2018-03-23 08:23:51 +00:00
Julia Reynolds
9865aaa3fc
Merge "Add manage notifications screen" into pi-dev am: 2c1de66c58
...
am: e76a12526b
Change-Id: I5866617ba35dc9f0ecc4f2ea237eae5f2a9576ae
2018-03-23 05:21:05 +00:00
Christine Franks
614485a700
Merge "Allow developer options in retail mode" into pi-dev am: 265981f394
...
am: b9dc49a612
Change-Id: Ibedd48f978cce4d2579dbe5c935b4d2d61b1c2f4
2018-03-23 04:23:54 +00:00
Tao Bao
8271220cb6
Add summary text for "Automatic system updates" option.
...
Fixes: 72472580
Test: m -j RunSettingsRoboTests
Test: Build and flash on sailfish. Check the text.
Change-Id: Ied5b307f8c43c0bdccea4996cced483ce54568e7
2018-03-22 21:02:09 -07:00
Julia Reynolds
e76a12526b
Merge "Add manage notifications screen" into pi-dev
...
am: 2c1de66c58
Change-Id: I1135e87f89a5079b2b92f659e2cae60a02cb25ba
2018-03-23 03:37:57 +00:00
hylo
bfe02b1912
Add string for forget confirmation dialog
...
Bug: 71812838
Test: Manual test
Change-Id: I01d9bdce1b06bfeeff406b1e45be900325041ecc
2018-03-23 11:10:37 +08:00
Jyun LuoLai
4ab36ffef1
Merge "Fix PATTERN UI to align PIN&PASSWORD screen" into pi-dev am: 644c707590
...
am: 76b91184db
Change-Id: Ie197bd99c0288b55d6cbb4c91dd205a0abc3c5f2
2018-03-23 03:03:38 +00:00