Jason Monk
deec78d0ca
Merge \\"Fix SimStatus updatePhoneInfos\\" into nyc-dev am: b53117f55c
...
am: 2f4c80f3c7
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
2016-06-15 16:59:09 +00:00
Jason Monk
4edb76127c
Merge \\"Fix SimStatus updatePhoneInfos\\" into nyc-dev am: b53117f55c
...
am: e3eaa08742
2016-06-15 16:58:59 +00:00
Jason Monk
e3eaa08742
Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
...
am: b53117f55c
2016-06-15 16:53:55 +00:00
Ricky Wai
f9e63acdc1
Merge \\\"Remove work fingerprints when primary profile lock is removed\\\" into nyc-dev am: 42cbbc3052 am: 0f747c979d
...
am: 100f9e3f94
2016-06-15 16:52:53 +00:00
Jason Monk
db0f2487a2
Merge \\\"Make linkify handle emptys urls better DO NOT MERGE\\\" into nyc-dev am: f4ad4434f1 am: 4904ba543e
...
am: d506266338
2016-06-15 16:52:52 +00:00
Ricky Wai
c40c60841c
Merge \\\"Remove work fingerprints when primary profile lock is removed\\\" into nyc-dev am: 42cbbc3052 am: 5ec65517a6
...
am: ea25035866
2016-06-15 16:52:50 +00:00
Jason Monk
9e560413c6
Merge \\"resolve merge conflicts of f4ad443 to nyc-mr1-dev\\" into nyc-mr1-dev am: b2e2007766
...
am: 359c8343dd
2016-06-15 16:52:48 +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
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
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
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
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
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
Chris Wren
1753dfd5cd
log as counters instead of histograms
...
this will interoperate better with UMA
Bug: 26687914
Change-Id: Ie63b2be2d457054c96b070ada3bb92141ab1fb5a
2016-06-15 12:36:38 -04:00
Fan Zhang
2c1e5b1ba5
Merge \\"Remove forum link from support tab.\\" into nyc-mr1-dev am: 1c6674dbb2
...
am: b7e08a4fc6
2016-06-15 16:25:27 +00:00
Fan Zhang
b7e08a4fc6
Merge \"Remove forum link from support tab.\" into nyc-mr1-dev
...
am: 1c6674dbb2
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
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
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
