Commit Graph

28046 Commits

Author SHA1 Message Date
Maurice Lam
b2f98a37c0 Merge \"Fingerprint string updates\" into nyc-mr1-dev
am: e33872772c

Change-Id: I9e330926b8160d434605233d5b8c50a0026ebad3
2016-06-15 17:59:20 +00:00
Jason Monk
deec78d0ca Merge \\"Fix SimStatus updatePhoneInfos\\" into nyc-dev am: b53117f55c
am: 2f4c80f3c7

Change-Id: I4332b2af62ab8e416136302a4d4b2582a0ae5e54
2016-06-15 17:07:30 +00:00
Maurice Lam
e33872772c Merge "Fingerprint string updates" into nyc-mr1-dev 2016-06-15 17:07:27 +00:00
Jason Monk
2f4c80f3c7 Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
am: b53117f55c

Change-Id: I49ceb02471844e719da35f1939c329f317b6953b
2016-06-15 16:59:09 +00:00
Jason Monk
4edb76127c Merge \\"Fix SimStatus updatePhoneInfos\\" into nyc-dev am: b53117f55c
am: e3eaa08742

Change-Id: I891dcc41ec37a1de641beeb3690695fdab385e66
2016-06-15 16:58:59 +00:00
Jason Monk
e3eaa08742 Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
am: b53117f55c

Change-Id: I8214420cb1a2c7f9d462650908c1546adcc3b950
2016-06-15 16:53:55 +00:00
TreeHugger Robot
b53117f55c Merge "Fix SimStatus updatePhoneInfos" into nyc-dev 2016-06-15 16:48:45 +00:00
Ricky Wai
100f9e3f94 Merge \\"Remove work fingerprints when primary profile lock is removed\\" into nyc-dev am: 42cbbc3052
am: 0f747c979d

Change-Id: I71dbdaa0d7ee011398987f9a86338b584938391d
2016-06-15 16:42:45 +00:00
Jason Monk
d506266338 Merge \\"Make linkify handle emptys urls better DO NOT MERGE\\" into nyc-dev am: f4ad4434f1
am: 4904ba543e

Change-Id: I478b632a2cf7990b15791def468bf981593ca79c
2016-06-15 16:42:45 +00:00
Ricky Wai
ea25035866 Merge \\"Remove work fingerprints when primary profile lock is removed\\" into nyc-dev am: 42cbbc3052
am: 5ec65517a6

Change-Id: Iaf25d93b2926b985d8cad2c9e9923c819486d21e
2016-06-15 16:42:05 +00:00
Jason Monk
359c8343dd Merge \"resolve merge conflicts of f4ad443 to nyc-mr1-dev\" into nyc-mr1-dev
am: b2e2007766

Change-Id: I1c135d7ff2977d5f5f5855e8fa7649303deef565
2016-06-15 16:42:04 +00:00
Ricky Wai
5ec65517a6 Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
am: 42cbbc3052

Change-Id: Ia46cdcee9c65d7394896e34e216f19dc1e7a5d31
2016-06-15 16:38:28 +00:00
Jason Monk
b2e2007766 Merge "resolve merge conflicts of f4ad443 to nyc-mr1-dev" into nyc-mr1-dev 2016-06-15 16:37:16 +00:00
Fan Zhang
b7e08a4fc6 Merge \"Remove forum link from support tab.\" into nyc-mr1-dev
am: 1c6674dbb2

Change-Id: I35349cfef2f68057dbd80ea04a8851f5fc54860a
2016-06-15 16:17:20 +00:00
Fan Zhang
1c6674dbb2 Merge "Remove forum link from support tab." into nyc-mr1-dev 2016-06-15 16:15:54 +00:00
Ricky Wai
0f747c979d Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
am: 42cbbc3052

Change-Id: I736dcaa1c92c0557559719054f0177eb9cf1fc24
2016-06-15 16:04:41 +00:00
Ricky Wai
42cbbc3052 Merge "Remove work fingerprints when primary profile lock is removed" into nyc-dev 2016-06-15 16:02:18 +00:00
Jason Monk
90bde71e20 resolve merge conflicts of f4ad443 to nyc-mr1-dev
Change-Id: I1d8a3f1cb62ee7d5f39e120c613ae45d495f0fb7
2016-06-15 11:31:14 -04:00
Jason Monk
4904ba543e Merge \"Make linkify handle emptys urls better DO NOT MERGE\" into nyc-dev
am: f4ad4434f1

Change-Id: Ic52d42c920c29942dbcca880fa70bdde69cb1960
2016-06-15 15:03:26 +00:00
Jason Monk
c7959f91d5 Fix SimStatus updatePhoneInfos
Looks like we got updatePhoneInfos in the right place for IccLockSettings
but not SimStatus.

Also return the right view in onCreateView

Change-Id: Ifd4cbd93351bb05571ed5a9873e9352c7c3a2357
Fixes: 29335528
2016-06-15 10:54:33 -04:00
Jason Monk
f4ad4434f1 Merge "Make linkify handle emptys urls better DO NOT MERGE" into nyc-dev 2016-06-15 14:53:43 +00:00
Maurice Lam
4659661821 Fingerprint string updates
Bug: 29119674
Change-Id: I22489507b3c215bac6cf1b3d4e201448be1dc999
2016-06-14 19:14:37 -07:00
Julia Reynolds
c9eae19abc Merge \\"Prevent users from blocking system notifications.\\" into nyc-dev am: b2301cb4c2
am: 7803e3f76b

Change-Id: I37cdd1d3c124c7e639958e482e88f52f78c405ba
2016-06-14 22:33:55 +00:00
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
7803e3f76b Merge \"Prevent users from blocking system notifications.\" into nyc-dev
am: b2301cb4c2

Change-Id: I43783338afaf01a3c22ab409a3c8836f6a36550f
2016-06-14 22:30:33 +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
156453c0ad Remove forum link from support tab.
Bug: 29356288
Change-Id: I95c737d8249eb5689f09e037016832e25bbf9244
2016-06-14 13:01:45 -07: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
be5fbd9954 Fix bug in Sim Status Settings.
am: fb87919fde

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

Change-Id: I4bc932a15028e6e24bc62e21f7f5149ce7355899
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
Ricky Wai
dae1ac5cb0 Remove work fingerprints when primary profile lock is removed
Bug: 29264034
Change-Id: Ia4043e8a4f4481ff72b8d7069fd139a381158083
2016-06-14 14:43:00 +01: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