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
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
Salvador Martinez
4e34fb2eae
Add extra strings for hidden network option
...
This CL adds strings to be used in a follow-up CL for labeling a
network as hidden/visible.
Test: None, is a string change
Bug: 29003359
Change-Id: Ia2822b8afbcd3bd806f8f8b204e5f29e97d94763
2018-03-22 18:42:36 -07:00
Julia Reynolds
58edda1230
Merge "Add a setting for the volume hush gesture" into pi-dev am: 395345c0ad
...
am: a7af991f37
Change-Id: Idb486a1f3216e13624020b047954e4e899034a50
2018-03-23 01:09:14 +00:00
Fan Zhang
da8e3cddaa
Merge "Misc string updates" into pi-dev am: 4aa9d5d2b4
...
am: 015c57a38e
Change-Id: I3ae44469dd99527af2464aaeac3d56fb2bd06c64
2018-03-23 01:07:28 +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
Doris Ling
09622934b9
Update battery saver condition text.
...
Change-Id: I0c0d4805c3d9163a1b98bac790719c361559d385
Fixes: 76172605
Test: build
2018-03-22 17:51:08 -07: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
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
Sean Callanan
4b2d7a3780
Merge "[Settings] Add strings for Natural and Automatic color modes"
2018-03-22 23:53:11 +00:00
Maurice Lam
fd3d72e48f
Merge "Make GLIF theme default for confirm lock screen" into pi-dev am: a82183849d
...
am: 731b049e32
Change-Id: Iaa2a51e585097b81a6f379f97fa5bfef84be4e62
2018-03-22 23:11:11 +00: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
Salvador Martinez
a913537b5d
Add strings for mobile hotspot bands
...
This CL simply adds some strings that are needed for a follow-up CL
that allows users to select the band for their AP.
Test: None, just adds strings
Bug: 73102003
Change-Id: I3d1389b64e035056d55b7dda0687976ae757971c
2018-03-22 15:21:11 -07: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
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
Sean Callanan
e8f9bf5f68
[Settings] Add strings for Natural and Automatic color modes
...
These strings are not properly reflected in the UI yet. Automatic and
Saturated currently map to the same display setting (and the UI reflects
this by checking both).
Bug: 75982435
Test: Modified the existing testcases to reflect the new string.
Change-Id: Iaef08599c0233e018eaafaf89d60eab92e102782
2018-03-22 13:05:32 -07: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
8debb12ed0
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
...
am: a396fdb580
Change-Id: I8e0f26ee2b5addb0d87a3c545b31fe76f62e81a8
2018-03-22 05:34:31 +00:00
Shawn Ding
50d98df148
Merge "Update "Vibrate on tap" string" into pi-dev am: bad38a1940
...
am: 4d8b920c7e
Change-Id: I975e9eba3cf8723f03ddd5350398432bf3232c72
2018-03-22 05:33:52 +00:00
Andreas Terzis
7130de5fb6
Merge "Add back the data saver preference." into pi-dev am: ce447d9191
...
am: fa50690b29
Change-Id: If8fee16cc05372badda44582d78bd4304c6356f1
2018-03-22 05:29:10 +00: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
Change-Id: Ic4f554008ff72ed97de423b628a37332108c3f1e
2018-03-22 05:26:10 +00:00
Shawn Ding
4d8b920c7e
Merge "Update "Vibrate on tap" string" into pi-dev
...
am: bad38a1940
Change-Id: I5a8496c10351fa99004e71753659deeb96fe19d0
2018-03-22 05:24:46 +00:00
Andreas Terzis
fa50690b29
Merge "Add back the data saver preference." into pi-dev
...
am: ce447d9191
Change-Id: I1f58e870faea97ec0cf6b73aebb076ac2d9cf3b4
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
dad7af995b
Merge "use placeholder text for "turn on battery saver at x%" pref" into pi-dev am: c15e8d3d09
...
am: 39256ded6e
Change-Id: I9247609d8fc029686abbe58edd44924d5d5ede82
2018-03-22 04:43:16 +00:00
Fan Zhang
39256ded6e
Merge "use placeholder text for "turn on battery saver at x%" pref" into pi-dev
...
am: c15e8d3d09
Change-Id: I9247c14adb18887984ff759da0c5927189ae7d2a
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
372a7996fd
Merge "Modify "Updated ..." text." into pi-dev am: 119d95bae1
...
am: 4166aa0757
Change-Id: Ied53957deefc6ffb7e5cfb363c2a8ff7ffbd14d4
2018-03-22 03:11:57 +00:00
Sundeep Ghuman
4166aa0757
Merge "Modify "Updated ..." text." into pi-dev
...
am: 119d95bae1
Change-Id: If1b339d684f14d76427a6830d0c5eb3d95a74488
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
44a327d2a1
Merge "Add string for adaptive brightness" into pi-dev am: 6cc043ba06
...
am: 6619f260db
Change-Id: I01708c4ea069c104d73e3a986b6cd8790289cfce
2018-03-22 00:07:37 +00:00
Lei Yu
0861b33763
Merge "Add search index provider for bt page" into pi-dev am: 9492aa546d
...
am: bfc77e7106
Change-Id: Ia173dfe64eda2148e5d8d17f8708ab788b2c68e0
2018-03-21 23:33:39 +00:00
Salvador Martinez
69fb4439ed
Merge "Update AP preference to not be master switch pref" into pi-dev am: 24c104a16e
...
am: 81c8c0d80e
Change-Id: I7b7940b4a14b342627e7e3aa623fed0aee9fdf95
2018-03-21 23:22:21 +00:00
Lei Yu
6619f260db
Merge "Add string for adaptive brightness" into pi-dev
...
am: 6cc043ba06
Change-Id: I19ed4d100add055cf280d6c704c1e148a722f92e
2018-03-21 23:01:26 +00:00
Shawn Ding
5939fd8360
Merge "Correct typo for "Redirect vibration"" into pi-dev am: 757b3d48e3
...
am: e80f1d0789
Change-Id: I2ff1aebad47bdb583d9142c8fe91444b6b070490
2018-03-21 22:52:20 +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
Change-Id: Ia06828d5c36f14cc419800bba15f376c3701b917
2018-03-21 22:08:24 +00:00