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
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
Maurice Lam
52ae1eb04b
Update UI style for GLIF buttons
...
Bug: 29105355
Change-Id: I9dfb8b6fb40242298bf1d7caa18cd7fbd2f62725
2016-06-14 18:35:37 -07:00
Julia Reynolds
d0ebd5738f
Merge \\\"Prevent users from blocking system notifications.\\\" into nyc-dev am: b2301cb4c2 am: 7803e3f76b
...
am: c9eae19abc
2016-06-14 22:46:19 +00:00
Julia Reynolds
7860cb0d0a
Merge \\\"Prevent users from blocking system notifications.\\\" into nyc-dev am: b2301cb4c2 am: f04499b2e1
...
am: a9f6b69398
2016-06-14 22:46:19 +00:00
Fan Zhang
7423626849
Align text for conditions with text for other tiles. am: cf605973b2
...
am: 88eeb056d9
2016-06-14 22:46:18 +00:00
Julia Reynolds
c9eae19abc
Merge \\"Prevent users from blocking system notifications.\\" into nyc-dev am: b2301cb4c2
...
am: 7803e3f76b
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
2016-06-14 22:33:34 +00:00
Julia Reynolds
7803e3f76b
Merge \"Prevent users from blocking system notifications.\" into nyc-dev
...
am: b2301cb4c2
2016-06-14 22:30:33 +00:00
Julia Reynolds
f04499b2e1
Merge \"Prevent users from blocking system notifications.\" into nyc-dev
...
am: b2301cb4c2
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
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
700a38625f
Merge \\"Support tab UI polish.\\" into nyc-mr1-dev am: cac9227e16
...
am: 26904db4bc
2016-06-14 19:33:35 +00:00
Fan Zhang
26904db4bc
Merge \"Support tab UI polish.\" into nyc-mr1-dev
...
am: cac9227e16
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
Sanket Padawe
c3cc82a88c
Merge \"Fix bug in Sim Status Settings. am: fb87919fde am: be5fbd9954\" into nyc-mr1-dev-plus-aosp
...
am: 5806d78aa4
2016-06-14 18:09:47 +00:00
Sanket Padawe
58cc43a80a
Fix bug in Sim Status Settings. am: fb87919fde am: 8b1acb7973
...
am: 30341d7924
2016-06-14 18:09:47 +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
Sudheer Shanka
29056b98f8
Make guest field unselectable only if it is not disabled by admin.
...
Change-Id: I01c45b686477615134e98428b673fe9bb2ab7b0b
Fixes: 29178926
2016-06-14 18:07:15 +00:00
Sanket Padawe
30341d7924
Fix bug in Sim Status Settings. am: fb87919fde
...
am: 8b1acb7973
2016-06-14 18:07:13 +00:00
Sanket Padawe
81ee27b6a9
Fix bug in Sim Status Settings. am: fb87919fde
...
am: be5fbd9954
2016-06-14 18:07:12 +00:00
Sanket Padawe
be5fbd9954
Fix bug in Sim Status Settings.
...
am: fb87919fde
2016-06-14 18:04:52 +00:00
Sanket Padawe
8b1acb7973
Fix bug in Sim Status Settings.
...
am: fb87919fde
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
110d3485c9
Merge \\"Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config.\\" into nyc-mr1-dev am: fef6234ebc
...
am: 4dae8c2769
2016-06-14 17:06:14 +00: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
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
6513ace408
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
...
am: d2961ede2e
2016-06-14 16:22:52 +00: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
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
2aa57f5bbc
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 7221f5b6b4 -s ours am: fee9c49fb2 -s ours
...
am: 2760d9e325
2016-06-14 12:30:31 +00:00
Bill Yi
b7a1ae485c
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 35b37f1c2e -s ours
...
am: a7e57bd908
2016-06-14 12:30:29 +00:00
Bill Yi
0c14bd264e
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 7221f5b6b4 -s ours am: 1779cc363d -s ours
...
am: d9aa440def
2016-06-14 12:30:28 +00:00
Bill Yi
2760d9e325
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 7221f5b6b4 -s ours
...
am: fee9c49fb2
2016-06-14 12:29:03 +00:00
Bill Yi
a7e57bd908
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: 35b37f1c2e
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
2016-06-14 12:21:51 +00:00
Bill Yi
1779cc363d
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: 7221f5b6b4
2016-06-14 12:09:38 +00:00
Bill Yi
fee9c49fb2
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: 7221f5b6b4
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
TreeHugger Robot
56cc4f9cce
Merge "Import translations. DO NOT MERGE"
2016-06-14 11:43:03 +00:00
