Lei Yu
44446f670b
Merge "Add textAlignment for preference_widget_summary" into oc-dev am: 8bb9f33c6f
...
am: af95b3d3c2
2017-04-11 19:46:46 +00:00
Daniel Nishi
d78cb7932e
Merge "Fix storage settings crash."
2017-04-11 18:13:07 +00:00
Lei Yu
af95b3d3c2
Merge "Add textAlignment for preference_widget_summary" into oc-dev
...
am: 8bb9f33c6f
2017-04-11 17:34:58 +00:00
Lei Yu
8bb9f33c6f
Merge "Add textAlignment for preference_widget_summary" into oc-dev
2017-04-11 17:10:08 +00:00
Daniel Nishi
c717b54e5f
Merge "Jostle the elements around in app storage settings."
2017-04-11 17:03:53 +00:00
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
jackqdyulei
adcedce4e0
Add textAlignment for preference_widget_summary
...
To make sure the text are aligned to the "viewEnd".
Bug: 37159537
Test: Screenshot
Change-Id: Ifab03dda6c9954d6b83ce4db0708303e0c5d32bd
2017-04-10 18:57:12 -07: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
Daniel Nishi
1075d16c59
Jostle the elements around in app storage settings.
...
This much more closely resembles the later mocks for
this page. The spacing, fonts, and colors are still off
and will be corrected once the final mocks land.
Bug: 34766830
Test: Manual
Change-Id: Id131e3596a0d08cb43c924a9f5cd9eb25329d7de
2017-04-10 16:14:33 -07: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
Daniel Nishi
89bec9c941
Fix storage settings crash.
...
It may crash if opened during the uninstall of an app. By catching
the exception which may occur, we can just skip the uninstalled app
and avoid crashing.
Change-Id: If556db7b5a299ba53a29baefbbe9709ba6d12190
Fixes: 36793223
Fixes: 36793372
Test: Settings unit test
2017-04-10 16:06:16 -07: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
