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
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
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
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
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
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
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
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
Christine Franks
b9dc49a612
Merge "Allow developer options in retail mode" into pi-dev
...
am: 265981f394
Change-Id: Ie99484aa859ec5a0032e5d5269bd5401531e5287
2018-03-23 02:54:47 +00:00
Jyun LuoLai
76b91184db
Merge "Fix PATTERN UI to align PIN&PASSWORD screen" into pi-dev
...
am: 644c707590
Change-Id: Ia63f197d24e5055adfadd8c8a4cd09c37f3aa47b
2018-03-23 02:44:38 +00:00
TreeHugger Robot
2c1de66c58
Merge "Add manage notifications screen" into pi-dev
2018-03-23 02:06:38 +00:00
Christine Franks
265981f394
Merge "Allow developer options in retail mode" into pi-dev
2018-03-23 01:11:23 +00:00
Jyun LuoLai
644c707590
Merge "Fix PATTERN UI to align PIN&PASSWORD screen" into pi-dev
2018-03-23 00:56:00 +00:00
Matthew Fritze
4cd1d84f7e
Merge "Add Slider template for Slices" into pi-dev
...
am: 2f137b4bac
Change-Id: I8f7f91c72a475dae21b17ead18bfe660c4b6f342
2018-03-23 00:42:27 +00:00
Julia Reynolds
a7af991f37
Merge "Add a setting for the volume hush gesture" into pi-dev
...
am: 395345c0ad
Change-Id: I3a78c7313146ca19241fa74012212afe1ec3cc7f
2018-03-23 00:01:07 +00:00
Lei Yu
b6b1ee9abb
Merge "Update the toggle state in constructor." into pi-dev
...
am: 5cafb0b553
Change-Id: I13752f6203160f1b92e4da8d0d358002c9105144
2018-03-23 00:00:04 +00:00
Fan Zhang
015c57a38e
Merge "Misc string updates" into pi-dev
...
am: 4aa9d5d2b4
Change-Id: I8d7241779ba92f3d35a9808366ae2cd74467c6a0
2018-03-22 23:59:09 +00:00
Julia Reynolds
ff9500d0f9
Add manage notifications screen
...
Test: make -j RunSettingsRoboTests
Bug: 74318867
Change-Id: I1c872c976677ee38f7d9d9523d18fc8ca03fa547
Add manage notifications screen
Test: make -j RunSettingsRoboTests
Bug: 74318867
Change-Id: Ia3626e9f69e8b91b1a2bba9ef549c775972e749a
2018-03-22 19:57:09 -04:00
Jan Nordqvist
c5f4182189
Rename "Primary data" to "Current data".
...
Bug: 70950124
Test: manual
Change-Id: I5fc9ac10338e2134e903eff392d3c63d2adf021d
2018-03-22 16:07:56 -07:00
Fan Zhang
5f9a348f7e
Get rid of UserPackageWrapper util.
...
Robolectric can support framework private classes now, so there is no
need to use wrappers.
Bug: 76167422
Test: robotests
Change-Id: I034a9f0a9856348bff491f2e9b2b1f7d682ab942
2018-03-22 15:28:46 -07:00
TreeHugger Robot
2f137b4bac
Merge "Add Slider template for Slices" into pi-dev
2018-03-22 22:08:54 +00:00
Salvador Martinez
5de9164520
Add new string for updating auto-wifi
...
This CL simply adds a string that will be used in a follow-up CL
for updating how auto-wifi permission requests work.
Test: None, string change
Bug: 67070896
Change-Id: I28d4e34349e8b3efad33d4e87f10b0f51c97f8ab
2018-03-22 15:08:06 -07:00
Fan Zhang
6c5af54af9
Get rid of extra whitespace under divider lines
...
Change-Id: Iad5ec5771a61c6e12aaefbe5fe41d17f7f09de73
Fixes: 76116029
Test: visual
2018-03-22 15:04:01 -07:00
Julia Reynolds
395345c0ad
Merge "Add a setting for the volume hush gesture" into pi-dev
2018-03-22 22:03:48 +00:00
TreeHugger Robot
5cafb0b553
Merge "Update the toggle state in constructor." into pi-dev
2018-03-22 21:43:52 +00:00
TreeHugger Robot
4aa9d5d2b4
Merge "Misc string updates" into pi-dev
2018-03-22 21:33:54 +00:00
Maurice Lam
731b049e32
Merge "Make GLIF theme default for confirm lock screen" into pi-dev
...
am: a82183849d
Change-Id: I957b9adf288309a1c1af22d50c816d0e084c8645
2018-03-22 21:29:20 +00:00
Maurice Lam
a82183849d
Merge "Make GLIF theme default for confirm lock screen" into pi-dev
2018-03-22 21:04:17 +00:00
Fan Zhang
c1a0cb2aec
Misc string updates
...
Bug: 76022431
Fixes: 17822183
Test: visual
Change-Id: I952e04ca8f5d45612f0088729c2691c60cf3afab
2018-03-22 12:45:58 -07:00
arangelov
b23bf13e72
Merge "Put the FLAG_ACTIVITY_NEW_TASK flag for the "Learn More" button in the "Add Account" settings screen." into pi-dev
...
am: edfdeebfe4
Change-Id: I6849be0a7a2858ffa21a8bec1dbfaf4783466c2f
2018-03-22 19:17:15 +00:00