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
Matthew Fritze
78bc33c327
Merge "Reindex on OTA and locale change" into oc-dev am: f84c8d3480
...
am: 5bb64aeb59
2017-04-11 00:37:41 +00:00
Matthew Fritze
5bb64aeb59
Merge "Reindex on OTA and locale change" into oc-dev
...
am: f84c8d3480
2017-04-11 00:19:36 +00:00
TreeHugger Robot
f84c8d3480
Merge "Reindex on OTA and locale change" into oc-dev
2017-04-10 23:54:55 +00:00
Honglu Yin
1872bdef43
Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a am: 4604741c51 am: b9b563d243
...
am: 381570cda2
2017-04-10 23:35:51 +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
Honglu Yin
381570cda2
Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a am: 4604741c51
...
am: b9b563d243
2017-04-10 23:23:44 +00:00
Honglu Yin
b9b563d243
Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a
...
am: 4604741c51
2017-04-10 23:22:49 +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
Honglu Yin
4604741c51
Merge "Title is different after tapping "Memory used by apps""
...
am: 7d9146e10a
2017-04-10 23:04:57 +00:00
Jack He
9e1e430f06
Merge "Add developer menu entry to enable Bluetooth inband ringing"
...
am: 3d08bedba2
2017-04-10 23:00:11 +00:00
Treehugger Robot
7d9146e10a
Merge "Title is different after tapping "Memory used by apps""
2017-04-10 22:53:09 +00:00
Jack He
3d08bedba2
Merge "Add developer menu entry to enable Bluetooth inband ringing"
2017-04-10 22:47:55 +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
Matthew Fritze
a0d03178d0
Reindex on OTA and locale change
...
When the user gets an OTA or changes language, settings
will clear the database and reindex it.
Test: make RunSettingsRoboTests
Change-Id: I379ece86b2d41d673bbbffbcf947774f3ccd4cb9
Fixes: 36859162
2017-04-10 14:28:39 -07:00
Garfield Tan
a614491061
Merge "Fix the intent to launch storage details." into oc-dev am: 66871d8531
...
am: cea8a43a92
2017-04-10 21:05:13 +00:00
Garfield Tan
cea8a43a92
Merge "Fix the intent to launch storage details." into oc-dev
...
am: 66871d8531
2017-04-10 20:41:47 +00: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
Garfield Tan
66871d8531
Merge "Fix the intent to launch storage details." into oc-dev
2017-04-10 20:24:20 +00:00
TreeHugger Robot
3349b62388
Merge "Use InstrumentedFragment for EncryptionInterstitial"
2017-04-10 19:10:30 +00:00
Daniel Nishi
84aba27da4
Merge "Add user icon to the other user preferences." into oc-dev am: b1c336de5f
...
am: f4af2774ee
2017-04-10 17:37:54 +00:00
Daniel Nishi
f4af2774ee
Merge "Add user icon to the other user preferences." into oc-dev
...
am: b1c336de5f
2017-04-10 17:32:27 +00:00
Daniel Nishi
b1c336de5f
Merge "Add user icon to the other user preferences." into oc-dev
2017-04-10 17:27:25 +00:00
Lei Yu
cce44a57bf
Merge "Add log for BatteryUtils" into oc-dev am: 27dc9b69ac
...
am: 964de0d7be
2017-04-10 17:17:52 +00:00
Lei Yu
964de0d7be
Merge "Add log for BatteryUtils" into oc-dev
...
am: 27dc9b69ac
2017-04-10 17:13:22 +00:00
Lei Yu
27dc9b69ac
Merge "Add log for BatteryUtils" into oc-dev
2017-04-10 17:06:45 +00:00
Bill Yi
4672147bdf
Merge "Import translations. DO NOT MERGE" into oc-dev am: 4c4f2a7c4c -s ours
...
am: dc41538fcc
2017-04-08 08:27:35 +00:00
Bill Yi
dc41538fcc
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 4c4f2a7c4c
2017-04-08 08:19:51 +00: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
Garfield Tan
973cddcb1b
Fix the intent to launch storage details.
...
Test: Manual tests & robo tests.
Bug: 37164357
Change-Id: Ia73a6286edadb9c9e1691dcc0c9e391ce2981dee
2017-04-07 19:08:29 -07:00
