Commit Graph

28019 Commits

Author SHA1 Message Date
Julia Reynolds
a9f6b69398 Merge \\"Prevent users from blocking system notifications.\\" into nyc-dev am: b2301cb4c2
am: f04499b2e1

Change-Id: I9253ee4788f3e3bf6918a98fc2a2c4927d920114
2016-06-14 22:33:34 +00:00
Julia Reynolds
f04499b2e1 Merge \"Prevent users from blocking system notifications.\" into nyc-dev
am: b2301cb4c2

Change-Id: I9d5f2f4957bdc86ab25e0436100f5b126cb97bb7
2016-06-14 22:30:19 +00:00
TreeHugger Robot
b2301cb4c2 Merge "Prevent users from blocking system notifications." into nyc-dev 2016-06-14 22:25:26 +00:00
Fan Zhang
88eeb056d9 Align text for conditions with text for other tiles.
am: cf605973b2

Change-Id: I1b978a1a6229017160840d87e6798b5218382eb3
2016-06-14 22:10:47 +00:00
Fan Zhang
cf605973b2 Align text for conditions with text for other tiles.
Bug: 29107343

Text should be 72dp from left of screen, not 76dp.

Change-Id: I86cb015ed2e574c3f16fb642d7c3653a6f2a017f
2016-06-14 12:44:48 -07:00
Fan Zhang
26904db4bc Merge \"Support tab UI polish.\" into nyc-mr1-dev
am: cac9227e16

Change-Id: I64062459148a6fd38f223eef92cc1680e38423c9
2016-06-14 19:31:15 +00:00
Fan Zhang
cac9227e16 Merge "Support tab UI polish." into nyc-mr1-dev 2016-06-14 19:26:29 +00:00
Android Build Merger (Role)
5806d78aa4 Merge "Fix bug in Sim Status Settings. am: fb87919fde am: be5fbd9954" into nyc-mr1-dev-plus-aosp 2016-06-14 18:07:23 +00:00
Sanket Padawe
30341d7924 Fix bug in Sim Status Settings. am: fb87919fde
am: 8b1acb7973

Change-Id: I8d8c7ef15e81530ce21849eb2ff034ea10b2ea13
2016-06-14 18:07:13 +00:00
Sanket Padawe
81ee27b6a9 Fix bug in Sim Status Settings. am: fb87919fde
am: be5fbd9954

Change-Id: Ib6d2df9f2374943a93d0e7dd0ee2cb1d405f9a13
2016-06-14 18:07:12 +00:00
Sanket Padawe
8b1acb7973 Fix bug in Sim Status Settings.
am: fb87919fde

Change-Id: I4bc932a15028e6e24bc62e21f7f5149ce7355899
2016-06-14 18:04:52 +00:00
Sanket Padawe
be5fbd9954 Fix bug in Sim Status Settings.
am: fb87919fde

Change-Id: I696fa92d6ae21a9df386c60287da0ed298f3615d
2016-06-14 18:04:52 +00:00
Fan Zhang
31405d0023 Support tab UI polish.
Bug: 29107343
Bug: 29101595

1) Changing the font weight of the tabs to Medium
2) Changing the tab indicator color
3) Increasing the padding on the top and bottom of the entire suggestion
space (from 6dp to 8dp)
4) Balancing the space of list components within their perspective list
heights
5) Adjusting the padding on the right side to improve alignment
6) Changing "Suggestions" and suggestions counter font weight and size
7) Removing the drop shadow on the bottom of the suggestion space
8) "More help" subheader has been removed
9) Use 54% #000000 as tint color for more help icons.

Change-Id: If3e1c5ce2701422fba6185e7fa340abccc9bd30c
2016-06-14 10:30:23 -07:00
Sanket Padawe
fb87919fde Fix bug in Sim Status Settings.
Bug: 29332493
Change-Id: Idd519e704ce6fdd0b92319948bdf02c0fa45ff34
2016-06-14 10:12:39 -07:00
Sunny Goyal
4dae8c2769 Merge \"Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config.\" into nyc-mr1-dev
am: fef6234ebc

Change-Id: I602f81cfeea807b3c63799eb7b9985e0053ed583
2016-06-14 17:00:56 +00:00
Sunny Goyal
fef6234ebc Merge "Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config." into nyc-mr1-dev 2016-06-14 16:51:09 +00:00
Sunny Goyal
0bf6f94c58 Changing the WallpaperSuggestionActivity to redirect to the actual
wallpaper picker component defined in the config.

Bug: 28554244
Change-Id: Iebd38b8fee13608e060acb2b52332014c5c3d87e
2016-06-14 09:44:10 -07:00
Anna Galusza
d2961ede2e Merge \"Remove \"Help & feedback\" from toggle screen for accessibility services to prevent confusion when users are trying to submit feedback for a specific accessibility service (accessibility services can place their own \"Help & feedabck\" in their apks and route it appropriately). Bug: 29278252\" into nyc-mr1-dev
am: 78a0197320

Change-Id: I0b6ba08845b6e58e1ecd314ff1e59c08be0c7beb
2016-06-14 16:18:18 +00:00
Anna Galusza
78a0197320 Merge "Remove "Help & feedback" from toggle screen for accessibility services to prevent confusion when users are trying to submit feedback for a specific accessibility service (accessibility services can place their own "Help & feedabck" in their apks and route it appropriately). Bug: 29278252" into nyc-mr1-dev 2016-06-14 16:09:24 +00:00
Bill Yi
2760d9e325 Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 7221f5b6b4 -s ours
am: fee9c49fb2  -s ours

Change-Id: I7e0f8077871dddd2dc8f88039414abf238455600
2016-06-14 12:29:03 +00:00
Bill Yi
a7e57bd908 Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 35b37f1c2e  -s ours

Change-Id: I0b7a42353b31b2db08b2ef8bf619a3ef88c6b1d2
2016-06-14 12:24:37 +00:00
Bill Yi
d9aa440def Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 7221f5b6b4 -s ours
am: 1779cc363d  -s ours

Change-Id: Iea765783c5bbedcca58813728bd6da88f06320e5
2016-06-14 12:21:51 +00:00
Bill Yi
1779cc363d Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 7221f5b6b4  -s ours

Change-Id: I2c5809787112d866890e24f35d315c2f944af610
2016-06-14 12:09:38 +00:00
Bill Yi
fee9c49fb2 Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 7221f5b6b4  -s ours

Change-Id: I638873a702599a87476abd1ef92734099dca3c76
2016-06-14 12:09:38 +00:00
TreeHugger Robot
35b37f1c2e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-14 12:04:54 +00:00
TreeHugger Robot
7221f5b6b4 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-14 11:47:34 +00:00
Bill Yi
aba253e6c7 Import translations. DO NOT MERGE
Change-Id: I06952539cefb81ca62a8fde4455f1f3e3ba92f67
Auto-generated-cl: translation import
2016-06-14 03:33:30 -07:00
Bill Yi
0f30207710 Import translations. DO NOT MERGE
Change-Id: I4dca3edd37931754e3ba3d6152bde6fe235e7b42
Auto-generated-cl: translation import
2016-06-14 03:17:02 -07:00
Julia Reynolds
0df18a6a40 DND header should be translated. am: 5a67d5f6f0
am: 9850695bfc

Change-Id: I9e7538ba2ed31e374db6c6192d1faa00ba20f1ee
2016-06-14 02:02:35 +00:00
Julia Reynolds
fdf4255ced DND header should be translated. am: 5a67d5f6f0
am: 46298697ce

Change-Id: I9a3302467a75fae2ec01a63871ffcbefe08a58ff
2016-06-14 02:02:07 +00:00
Julia Reynolds
46298697ce DND header should be translated.
am: 5a67d5f6f0

Change-Id: Ia9ce4e1465fa20a769b7f66e5cb1ae3577525875
2016-06-14 01:58:02 +00:00
Julia Reynolds
9850695bfc DND header should be translated.
am: 5a67d5f6f0

Change-Id: I238ebd6abe78925fde071b3fb09b27690e6d6311
2016-06-14 01:57:37 +00:00
Julia Reynolds
5a67d5f6f0 DND header should be translated.
Change-Id: Iac764d71e91f5a0dc1b58bfca8a38d823f0598b9
Fixes: 29123731
2016-06-14 01:47:05 +00:00
Doris Ling
71e6b9a4d9 Merge \"Added new setting for gestures.\" into nyc-mr1-dev
am: 8b8a012913

Change-Id: I3bec17fcf1130c4948abeef256a169105d7ad464
2016-06-13 22:29:14 +00:00
Daniel Nishi
08ba377569 Merge \"Use Settings.Secure for days to retain.\" into nyc-mr1-dev
am: 584320adb8

Change-Id: Ifd3f1542b9feb2747a54f380ff7047868e563251
2016-06-13 22:28:38 +00:00
TreeHugger Robot
8b8a012913 Merge "Added new setting for gestures." into nyc-mr1-dev 2016-06-13 22:01:45 +00:00
Daniel Nishi
584320adb8 Merge "Use Settings.Secure for days to retain." into nyc-mr1-dev 2016-06-13 21:18:29 +00:00
Doris Ling
9136523a43 Added new setting for gestures.
Added a new entry to the top level Settings' Device section to
enable/disable gestures.

Bug: 28565958

Change-Id: Icf642b6a3058c692fb2be9914579996598f03b7d
2016-06-13 13:13:21 -07:00
宋凯伦
69118dc9b1 resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp
am: 89b8babe6a

Change-Id: I5918f6a061ab0d5f3d81b99174d5517cd44e389c
2016-06-13 20:10:42 +00:00
Robert Greenwalt
89b8babe6a resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp
Change-Id: Ie6a95224a62023a2a19054aa95382d24365124f5
2016-06-13 13:01:36 -07:00
宋凯伦
b34cf8647f Merge \"Fix the memory leak in TetherSettings\"
am: 03393c4109

Change-Id: Iec6e2b02efe28491c988a530f401350f8ee5b52f
2016-06-13 18:46:19 +00:00
Robert Greenwalt
03393c4109 Merge "Fix the memory leak in TetherSettings" 2016-06-13 18:35:32 +00:00
Daniel Nishi
776c9eca39 Use Settings.Secure for days to retain.
Previously, we used Shared Preferences, which worked when the
storage manager was localized to Settings. Now that it is in
its own separate APK, we need to use a separate setting to configure
it.

Bug: 28965462
Change-Id: I073859ef1a764679bbc63d3c0cd96af82306212e
2016-06-13 10:47:23 -07:00
Android Build Merger (Role)
fe91143d71 Merge "Merge \\"Remove \\'You can choose to either trust or remove this certificate\\' from Check certificate dialog\\" into nyc-dev am: 86c9894f04 am: b57c55d42c" into nyc-mr1-dev-plus-aosp 2016-06-13 17:44:32 +00:00
Michal Karpinski
5b57a8991c Merge \\"Remove \\'You can choose to either trust or remove this certificate\\' from Check certificate dialog\\" into nyc-dev am: 86c9894f04
am: b57c55d42c

Change-Id: If4c300dab4de45c86a7b4719b64cb32937e125b2
2016-06-13 17:44:24 +00:00
Michal Karpinski
c0832141a0 Merge \\"Remove \\'You can choose to either trust or remove this certificate\\' from Check certificate dialog\\" into nyc-dev am: 86c9894f04
am: 8532049946

Change-Id: I46c26216d66aa9478d4c8d71cbe7baf4a47de50e
2016-06-13 17:44:09 +00:00
Michal Karpinski
b57c55d42c Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev
am: 86c9894f04

Change-Id: I7d2252a50b54c765e2c2a9837ca181861a7bae35
2016-06-13 17:40:13 +00:00
Michal Karpinski
8532049946 Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev
am: 86c9894f04

Change-Id: Iee44fadb2563a162aa097bf101aea2045564277e
2016-06-13 17:40:12 +00:00
TreeHugger Robot
86c9894f04 Merge "Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog" into nyc-dev 2016-06-13 17:29:22 +00:00
Julia Reynolds
cdd1a26465 Prevent users from blocking system notifications.
Change-Id: I1864d54b01e4db03393078504b8f592ee41ed1c2
Fixes: 29191134
2016-06-13 12:49:45 -04:00