Jan Nordqvist
becfdd247f
Merge "Rename "Primary data" to "Current data"." into pi-dev
...
am: 7884751938
2018-03-23 20:12:03 +00:00
Fan Zhang
7e75de29b1
Merge changes I034a9f0a,Iad5ec577 into pi-dev
...
am: dd5977901d
2018-03-23 18:46:08 +00:00
hylo
ae943c5f4d
Merge "Add string for forget confirmation dialog" into pi-dev
...
am: 4b8715afa8
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
2018-03-23 18:27:18 +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
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
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
leo huang
28d6fd6be8
Merge "Align email provider correctly for RTL locales" into pi-dev
...
am: 5de68c700d
2018-03-23 16:58:26 +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
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
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
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
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
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
76b91184db
Merge "Fix PATTERN UI to align PIN&PASSWORD screen" into pi-dev
...
am: 644c707590
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
Jyun LuoLai
644c707590
Merge "Fix PATTERN UI to align PIN&PASSWORD screen" into pi-dev
2018-03-23 00:56:00 +00:00
Julia Reynolds
a7af991f37
Merge "Add a setting for the volume hush gesture" into pi-dev
...
am: 395345c0ad
2018-03-23 00:01:07 +00:00
Fan Zhang
015c57a38e
Merge "Misc string updates" into pi-dev
...
am: 4aa9d5d2b4
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
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
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
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
anitalin
a396fdb580
Merge "Remove extra padding above Wi-Fi picker, Pointer speed, Automatica date & time, Automatic timezone, Automatic 24-hour format, New notifications and App settings" into pi-dev
...
am: 721c58deb4
2018-03-22 05:26:10 +00:00
Shawn Ding
4d8b920c7e
Merge "Update "Vibrate on tap" string" into pi-dev
...
am: bad38a1940
2018-03-22 05:24:46 +00:00
Andreas Terzis
fa50690b29
Merge "Add back the data saver preference." into pi-dev
...
am: ce447d9191
2018-03-22 05:14:10 +00:00
TreeHugger Robot
721c58deb4
Merge "Remove extra padding above Wi-Fi picker, Pointer speed, Automatica date & time, Automatic timezone, Automatic 24-hour format, New notifications and App settings" into pi-dev
2018-03-22 05:05:21 +00:00
TreeHugger Robot
bad38a1940
Merge "Update "Vibrate on tap" string" into pi-dev
2018-03-22 05:03:38 +00:00
TreeHugger Robot
ce447d9191
Merge "Add back the data saver preference." into pi-dev
2018-03-22 04:56:35 +00:00
Fan Zhang
39256ded6e
Merge "use placeholder text for "turn on battery saver at x%" pref" into pi-dev
...
am: c15e8d3d09
2018-03-22 04:36:48 +00:00
TreeHugger Robot
c15e8d3d09
Merge "use placeholder text for "turn on battery saver at x%" pref" into pi-dev
2018-03-22 04:32:18 +00:00
Sundeep Ghuman
4166aa0757
Merge "Modify "Updated ..." text." into pi-dev
...
am: 119d95bae1
2018-03-22 03:05:26 +00:00
TreeHugger Robot
119d95bae1
Merge "Modify "Updated ..." text." into pi-dev
2018-03-22 02:58:41 +00:00
Andreas Terzis
446cd9db73
Add back the data saver preference.
...
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Ia39cb62ec021ae568a76fed04776b5e531e63b36
2018-03-21 19:23:05 -07:00
Maurice Lam
3e3b8a9618
Make GLIF theme default for confirm lock screen
...
Use GLIF theme as the default for confirm lock screen, even for
"external" launches of the screen. Renamed the theme from "internal"
to "normal" to reflect this change.
Dark theme code will be cleaned up later.
Test: Existing tests pass
Bug: 62573742
Change-Id: I86958eb3a440d7274807f1cf453c3e53c16c23e7
2018-03-21 18:21:04 -07:00
Fan Zhang
fff15d57c2
use placeholder text for "turn on battery saver at x%" pref
...
Change-Id: I63f0994bbcb050473c21c606337accd63cfcc46c
Fixes: 74120099
Test: reindex search
2018-03-21 17:38:30 -07:00
TreeHugger Robot
4ed1ed2465
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-03-22 00:23:30 +00:00
Lei Yu
6619f260db
Merge "Add string for adaptive brightness" into pi-dev
...
am: 6cc043ba06
2018-03-21 23:01:26 +00:00
Lei Yu
6cc043ba06
Merge "Add string for adaptive brightness" into pi-dev
2018-03-21 22:35:01 +00:00
Sundeep Ghuman
9bfbc3f1fd
Modify "Updated ..." text.
...
Use d/h/m "narrow" time formatting with no period.
Change font style when update is "old."
Bug: 70950124
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=DataUsageSummaryPreferenceTest
Change-Id: I25902c98eb0fdf4dd2f64c3f5d668b5efdcdff0c
2018-03-21 15:24:43 -07:00
Lei Yu
bfc77e7106
Merge "Add search index provider for bt page" into pi-dev
...
am: 9492aa546d
2018-03-21 22:08:24 +00:00
Salvador Martinez
81c8c0d80e
Merge "Update AP preference to not be master switch pref" into pi-dev
...
am: 24c104a16e
2018-03-21 22:02:04 +00:00
