Commit Graph

34839 Commits

Author SHA1 Message Date
TreeHugger Robot
26f5848862 Merge "Import translations. DO NOT MERGE" 2017-04-11 23:15:29 +00:00
Jesse Evans
edfd92ee75 Merge "Fixes instant apps on the Opening links screen" into oc-dev am: 15f963bed9
am: 708a85065d

Change-Id: I3fe5f98c77b91364340d357e9c9c86737ee8cba5
2017-04-11 23:01:39 +00:00
Jesse Evans
708a85065d Merge "Fixes instant apps on the Opening links screen" into oc-dev
am: 15f963bed9

Change-Id: I21b6b40c9abb52c52e525000b1e5f063a1c4c475
2017-04-11 22:52:09 +00:00
TreeHugger Robot
15f963bed9 Merge "Fixes instant apps on the Opening links screen" into oc-dev 2017-04-11 22:36:31 +00:00
Julia Reynolds
a38202fb5e Merge "Sort channels and groups by id" into oc-dev am: 665c1ced58
am: 80f06dc54c

Change-Id: Ic8dbeaadda4f3f322f7afb60204fe817e19388fa
2017-04-11 19:47:16 +00:00
Hyunyoung Song
ad3843f4e4 Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev am: 9234a34a80
am: 71ba393033

Change-Id: I656587f889bdc4694cf0e8805a1f32feef7b8078
2017-04-11 19:47:01 +00:00
Lei Yu
44446f670b Merge "Add textAlignment for preference_widget_summary" into oc-dev am: 8bb9f33c6f
am: af95b3d3c2

Change-Id: I9f40f699a617dd889805bb71c5e6344e3f71ec2e
2017-04-11 19:46:46 +00:00
Julia Reynolds
80f06dc54c Merge "Sort channels and groups by id" into oc-dev
am: 665c1ced58

Change-Id: I3878ed917d63b9454b332f714ac83054452fab31
2017-04-11 19:43:06 +00:00
Hyunyoung Song
71ba393033 Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev
am: 9234a34a80

Change-Id: I25a0968edf534242130fdfda405bb6dfb8afc24a
2017-04-11 19:42:47 +00:00
Julia Reynolds
665c1ced58 Merge "Sort channels and groups by id" into oc-dev 2017-04-11 19:18:53 +00:00
Daniel Nishi
d78cb7932e Merge "Fix storage settings crash." 2017-04-11 18:13:07 +00:00
Hyunyoung Song
9234a34a80 Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev 2017-04-11 18:11:49 +00:00
Lei Yu
af95b3d3c2 Merge "Add textAlignment for preference_widget_summary" into oc-dev
am: 8bb9f33c6f

Change-Id: Icece4eeeeefa2da5ce0a0d9318757b1270dcfce6
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

Change-Id: I42c1e08c4c59c63b422749360333c168a2294096
2017-04-11 16:42:14 +00:00
Fan Zhang
2700a3148f Update string char limits
am: d017f22372

Change-Id: Ia91e931c93a53d77a1c1ad554d60982b0c0c084a
2017-04-11 16:27:17 +00:00
Evan Laird
b8ddcd4fb4 Merge "Add "Current screen saver" string" into oc-dev am: 42a1cb9e12
am: 5c51987432

Change-Id: I93566c8e18f1607ab91a514d5f9f0a9dd384456a
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

Change-Id: I411b6735ce8388274a120ea1a4097b1a7a618f27
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

Change-Id: Ie01fe04fce64d10fa0b6fdc04a68ed8e1623fc3d
2017-04-11 15:36:44 +00:00
Doris Ling
47a44f0fea Merge "Update text for security preference." into oc-dev
am: 74eee7838c

Change-Id: Ic09b5837c2fab9a5f11051c297f7571fe79ac7a1
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

Change-Id: I73e537e35502369ca54a0b00a790d562a397aec4
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

Change-Id: I37c91c9df8e2b8ff86cf4e11ffbc8bbbfb8ad9dd
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

Change-Id: Iad30a04550e10682772174b490ca7085f5846418
2017-04-11 02:17:24 +00:00
Sean Stout
2fcca5a647 Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev
am: e4c73c24bc

Change-Id: I87b734b9fc79d09f6e4aa847b06311d8c92b75a2
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
Bill Yi
ff7341385a Import translations. DO NOT MERGE
Change-Id: I9a5c7e15111d3ba93e697b8be910230b5cf58751
Auto-generated-cl: translation import
2017-04-10 18:52:23 -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

Change-Id: I5551e8502a162a40e80f0c1c5637fd22f5545094
2017-04-11 00:37:41 +00:00
Matthew Fritze
5bb64aeb59 Merge "Reindex on OTA and locale change" into oc-dev
am: f84c8d3480

Change-Id: Ia8730a65d7199eefc6054954d2f0f5923dd6aad0
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

Change-Id: Ifd8fbcfa5a4d0e5aa8598fb26b4158b01db230c3
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

Change-Id: I6f525a905f9472aae6f227de3f3b1dd1eac5fcaa
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

Change-Id: Id276fbc68b12985074393454f729f950612685ed
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

Change-Id: I1168d6d5862745210045efea402f6d0f1e85acab
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

Change-Id: I1a7ff476de330fbe0c0b48ce27c8dd363cd49c8f
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

Change-Id: I8fe93eebafb60a237bfbe1009652672e17411a3d
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

Change-Id: I26268a618800ffacec55f26830d0d2a265efe8f8
2017-04-10 23:04:57 +00:00
Jack He
9e1e430f06 Merge "Add developer menu entry to enable Bluetooth inband ringing"
am: 3d08bedba2

Change-Id: I70542c676f8c738e0d846dd119a9af4ebc293175
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