Fan Zhang
1d44df7ca0
Update string char limits am: d017f22372
...
am: 2700a3148f
2017-04-11 16:42:14 +00:00
Fan Zhang
2700a3148f
Update string char limits
...
am: d017f22372
2017-04-11 16:27:17 +00:00
Evan Laird
b8ddcd4fb4
Merge "Add "Current screen saver" string" into oc-dev am: 42a1cb9e12
...
am: 5c51987432
2017-04-11 16:11:10 +00:00
Fan Zhang
d017f22372
Update string char limits
...
Fix: 36852178
Fix: 36851715
Fix: 36657781
Fix: 36700992
Fix: 36650008
Fix: 36657636
Test: builds and robotests
Change-Id: I14c21b2cb37b911c14dff40343fa094d7150f201
2017-04-11 09:09:23 -07:00
Evan Laird
5c51987432
Merge "Add "Current screen saver" string" into oc-dev
...
am: 42a1cb9e12
2017-04-11 15:55:18 +00:00
TreeHugger Robot
42a1cb9e12
Merge "Add "Current screen saver" string" into oc-dev
2017-04-11 15:44:30 +00:00
Doris Ling
759c9cb5ea
Merge "Update text for security preference." into oc-dev am: 74eee7838c
...
am: 47a44f0fea
2017-04-11 15:36:44 +00:00
Doris Ling
47a44f0fea
Merge "Update text for security preference." into oc-dev
...
am: 74eee7838c
2017-04-11 15:31:43 +00:00
Doris Ling
74eee7838c
Merge "Update text for security preference." into oc-dev
2017-04-11 15:24:44 +00:00
Esteban Talavera
3ff052c089
Merge "Show when work profile notifications are blocked for listener"
2017-04-11 13:32:30 +00:00
Paul Stewart
bc95b6ee68
Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev am: 6d7f210c0b
...
am: 14633029d2
2017-04-11 08:03:48 +00:00
Paul Stewart
14633029d2
Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev
...
am: 6d7f210c0b
2017-04-11 07:47:36 +00:00
TreeHugger Robot
6d7f210c0b
Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev
2017-04-11 07:22:52 +00:00
Sean Stout
79065d5a3c
Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev am: e4c73c24bc
...
am: 2fcca5a647
2017-04-11 02:17:24 +00:00
Sean Stout
2fcca5a647
Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev
...
am: e4c73c24bc
2017-04-11 02:05:52 +00:00
TreeHugger Robot
e4c73c24bc
Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev
2017-04-11 01:24:09 +00:00
TreeHugger Robot
4cf2523795
Merge "Add placeholder summary to stablize app info pref height"
2017-04-11 01:07:29 +00:00
Jack He
0ff39bc114
Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2 am: 9e1e430f06 am: 336a7ccca7
...
am: 075ee6109f
2017-04-10 23:32:11 +00:00
Fan Zhang
6fabfc1f1d
Add placeholder summary to stablize app info pref height
...
Change-Id: I6a62a94bb02271cdde9873745432aa829d6d4460
Fix: 36900036
Test: rebuild and existing robotests
2017-04-10 23:24:34 +00:00
Sean Stout
40067bee4d
Remove Night Light suggestion. DO NOT MERGE
...
Test: make ROBOTEST_FILTER=SettingsSuggestionsTest RunSettingsRoboTests
Bug: 37207263
Change-Id: Ieeb660abdcbe07cb66f1ae3b6e86d8fd27a26478
2017-04-10 16:22:01 -07:00
Jack He
075ee6109f
Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2 am: 9e1e430f06
...
am: 336a7ccca7
2017-04-10 23:20:34 +00:00
Jack He
336a7ccca7
Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2
...
am: 9e1e430f06
2017-04-10 23:11:42 +00:00
Doris Ling
ca95a90c11
Update text for security preference.
...
Swap location to screen lock in title and summary.
Bug: 37161482
Test: builds
Change-Id: Ie95f1d8c984587bf3898a431edde0868b0e17fce
2017-04-10 15:21:18 -07:00
Evan Laird
044001f991
Add "Current screen saver" string
...
This one was missed originally.
Test: none
Bug:35031991
Change-Id: I9b1bff9a9c834c306fe03e4405950bc1ac3ac3ac
2017-04-10 16:35:45 -04:00
TreeHugger Robot
99475b4c24
Merge "Import translations. DO NOT MERGE"
2017-04-08 08:19:01 +00:00
TreeHugger Robot
4c4f2a7c4c
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-08 08:06:37 +00:00
Lei Yu
e57622d5a4
Merge "Extend the translation limit to 60" into oc-dev am: 2a3a92b513
...
am: 451964a124
2017-04-07 21:11:53 +00:00
Lei Yu
451964a124
Merge "Extend the translation limit to 60" into oc-dev
...
am: 2a3a92b513
2017-04-07 21:08:11 +00:00
Lei Yu
2a3a92b513
Merge "Extend the translation limit to 60" into oc-dev
2017-04-07 21:03:16 +00:00
Doris Ling
0ec7d2eb0d
Merge "Add summary text to Lock screen preferences." into oc-dev am: a258e424a2
...
am: f8dead2f40
2017-04-07 20:12:28 +00:00
Doris Ling
f8dead2f40
Merge "Add summary text to Lock screen preferences." into oc-dev
...
am: a258e424a2
2017-04-07 20:07:55 +00:00
Andrew Sapperstein
11400c5e81
Merge "Increase char limit for adaptive brightness text." into oc-dev am: a9acbd924a
...
am: e6db78a2f1
2017-04-07 20:06:36 +00:00
TreeHugger Robot
a258e424a2
Merge "Add summary text to Lock screen preferences." into oc-dev
2017-04-07 20:03:36 +00:00
Andrew Sapperstein
e6db78a2f1
Merge "Increase char limit for adaptive brightness text." into oc-dev
...
am: a9acbd924a
2017-04-07 20:02:37 +00:00
TreeHugger Robot
a9acbd924a
Merge "Increase char limit for adaptive brightness text." into oc-dev
2017-04-07 19:55:54 +00:00
Daniel Nishi
27d8d2b46e
Merge "Update the automatic storage management preferences." into oc-dev am: 7badf46542
...
am: af587b0cfc
2017-04-07 19:50:05 +00:00
Daniel Nishi
af587b0cfc
Merge "Update the automatic storage management preferences." into oc-dev
...
am: 7badf46542
2017-04-07 19:46:05 +00:00
Daniel Nishi
7badf46542
Merge "Update the automatic storage management preferences." into oc-dev
2017-04-07 19:38:27 +00:00
TreeHugger Robot
0226581110
Merge "Fix encryption interstitial string"
2017-04-07 19:17:48 +00:00
Doris Ling
cee83e4bbf
Add summary text to Lock screen preferences.
...
Each time we refresh the security preference page, get the current
summary text from "On the lock screen" and populate to Lock screen
preferences summary.
Bug: 36540633
Test: make RunSettingsRoboTests
Change-Id: I317e3892b35b30981b62f7b7aee9cfdacd04a3ed
2017-04-07 11:11:45 -07:00
Maurice Lam
d034f261af
Fix encryption interstitial string
...
Test: Manual
Bug: 36801908
Change-Id: Ib5a06cc557458a451a6aec645e8331e75850cb2e
2017-04-07 10:35:39 -07:00
jackqdyulei
145cb81c21
Extend the translation limit to 60
...
Bug: 36830908
Test: Build
Change-Id: Ib7664ac4e625701d928359104ef5e75d158e74ee
2017-04-07 10:29:58 -07:00
Paul Stewart
9b26496d03
Allow user to specify EAP-SIM under PEAP
...
Allow the user to select EAP-SIM methods as a second phase after
an outer PEAP authentication. This hides the "identity" and
"password" fields if one of these methods is selected.
Bug: 34835771
Test: Manual: Connect to PEAP/EAP-SIM AP
Change-Id: I7e448fbebd352a4b0facbfafa74afaff6b704386
2017-04-07 10:28:49 -07:00
Andrew Sapperstein
12bdb22400
Increase char limit for adaptive brightness text.
...
Change-Id: I4bab996d94812cf9a2a148ef3dc1119c5dab7a8e
Fixes: 37014409
Test: string change
2017-04-07 17:23:30 +00:00
Bill Yi
2de5bb8291
Import translations. DO NOT MERGE
...
Change-Id: Ibe3f320c6df848eea67091636daf2edeab020c51
Auto-generated-cl: translation import
2017-04-07 09:27:04 -07:00
Bill Yi
4f1d3edfe6
Import translations. DO NOT MERGE
...
Change-Id: Iaa73edb3d34b6be32ce3d4e905883ea8dbd167cd
Auto-generated-cl: translation import
2017-04-07 09:10:36 -07:00
Esteban Talavera
ee349792dd
Show when work profile notifications are blocked for listener
...
Bug: 36657192
Test: m RunSettingsRoboTests
Change-Id: If6a8715b9a5a9ea893728c8ce7708e4c4154fb80
2017-04-07 15:52:31 +01:00
TreeHugger Robot
d4bfa472a8
Merge "Import translations. DO NOT MERGE"
2017-04-07 03:56:26 +00:00
Doris Ling
17d103e9d3
Merge "Add summary text for Encryption & credential." into oc-dev am: 65682e7fa5
...
am: 64c8244524
2017-04-07 02:55:03 +00:00
Doris Ling
64c8244524
Merge "Add summary text for Encryption & credential." into oc-dev
...
am: 65682e7fa5
2017-04-07 02:47:53 +00:00
