135824 2014-08-11 17:50:04 -0700 Improve look and feel of combined service menu. 2014-08-11 18:04:30 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Mac Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 enrica enrica oldest_to_newest 1028378 0 enrica 2014-08-11 17:50:04 -0700 Present phone numbers first, services next when combined. <rdar://problem/17936880> 1028380 1 236420 enrica 2014-08-11 17:54:41 -0700 Created attachment 236420 Patch 1028384 2 enrica 2014-08-11 18:04:30 -0700 Committed revision 172424. 236420 2014-08-11 17:54:41 -0700 2014-08-11 18:02:31 -0700 Patch newmenu.txt text/plain 5624 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MjQyMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA4LTExICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgSW1wcm92ZSBsb29rIGFuZCBm ZWVsIG9mIGNvbWJpbmVkIHNlcnZpY2UgbWVudS4uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU4MjQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE3 OTM2ODgwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZGluZyBzb21lIGxvY2FsaXphYmxlIHN0cmluZ3MuCisKKyAgICAgICAgKiBFbmdsaXNoLmxw cm9qL0xvY2FsaXphYmxlLnN0cmluZ3M6CisKIDIwMTQtMDgtMTEgIEplciBOb2JsZSAgPGplci5u b2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gPHZpZGVvPiBlbGVtZW50IHJlcXVlc3Rz IGFyZSBtaXNzaW5nIHNlc3Npb24gY29va2llczsgc29tZXRpbWVzIHBlcnNpc3RhbnQgY29va2ll cy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovTG9jYWxpemFibGUuc3RyaW5n cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL0xvY2FsaXphYmxl LnN0cmluZ3MJKHJldmlzaW9uIDE3MjQxNykKKysrIFNvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHBy b2ovTG9jYWxpemFibGUuc3RyaW5ncwkod29ya2luZyBjb3B5KQpAQCAtMTE4LDYgKzExOCw5IEBA CiAvKiBVbmRvIGFjdGlvbiBuYW1lICovCiAiQm9sZCAoVW5kbyBhY3Rpb24gbmFtZSkiID0gIkJv bGQiOwogCisvKiBtZW51IGl0ZW0gdGl0bGUgZm9yIHBob25lIG51bWJlciAqLworIkNhbGwgVXNp bmcgaVBob25lOiIgPSAiQ2FsbCBVc2luZyBpUGhvbmU6IjsKKwogLyogbWVudSBpdGVtIGZvciBt YWtpbmcgYSB0ZWxlcGhvbmUgY2FsbCB0byBhIHRlbGVwaG9uZSBudW1iZXIgKi8KICJDYWxsIOKA nCVA4oCdIFVzaW5nIGlQaG9uZSIgPSAiQ2FsbCDigJwlQOKAnSBVc2luZyBpUGhvbmUiOwogCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNzI0MjIpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMiBAQAorMjAxNC0wOC0xMSAgRW5yaWNhIENh c3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgorCisgICAgICAgIEltcHJvdmUgbG9vayBhbmQgZmVl bCBvZiBjb21iaW5lZCBzZXJ2aWNlIG1lbnUuLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1ODI0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNzkz Njg4MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisg ICAgICAgIFdoZW4gc2hvd2luZyB0aGUgY29tYmluZWQgbWVudSwgbGlzdCB0aGUgcGhvbmUgbnVt YmVycyBmaXJzdCwKKyAgICAgICAgZ3JvdXBlZCB1bmRlciBhIGNvbW1vbiBoZWFkZXIsIGZvbGxv d2VkIGJ5IHRoZSBlbnRyaWVzIHJlbGF0aXZlCisgICAgICAgIHRvIHRoZSBzZXJ2aWNlcy4KKwor ICAgICAgICAqIFBsYXRmb3JtL21hYy9NZW51VXRpbGl0aWVzLmg6CisgICAgICAgICogUGxhdGZv cm0vbWFjL01lbnVVdGlsaXRpZXMubW06CisgICAgICAgIChXZWJLaXQ6Om1lbnVJdGVtVGl0bGVG b3JUZWxlcGhvbmVOdW1iZXJHcm91cCk6CisgICAgICAgIChXZWJLaXQ6Om1lbnVJdGVtRm9yVGVs ZXBob25lTnVtYmVyKToKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJv eHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlNYWM6OnNldHVw U2VydmljZXNNZW51KToKKwogMjAxNC0wOC0xMSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9A YXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBQcml2YXRlIFdLUHJlZmVyZW5jZXMgQVBJIGZvciBk ZXZlbG9wZXIgZXh0cmFzIChzaG93IGluc3BlY3RvcikKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1Bs YXRmb3JtL21hYy9NZW51VXRpbGl0aWVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv UGxhdGZvcm0vbWFjL01lbnVVdGlsaXRpZXMuaAkocmV2aXNpb24gMTcyNDE3KQorKysgU291cmNl L1dlYktpdDIvUGxhdGZvcm0vbWFjL01lbnVVdGlsaXRpZXMuaAkod29ya2luZyBjb3B5KQpAQCAt MzQsNiArMzQsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKICNpZiBFTkFCTEUoVEVMRVBIT05FX05V TUJFUl9ERVRFQ1RJT04pICYmIFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01J Tl9SRVFVSVJFRCA+PSAxMDEwMDAKIE5TTWVudUl0ZW0gKm1lbnVJdGVtRm9yVGVsZXBob25lTnVt YmVyKGNvbnN0IFN0cmluZyYgdGVsZXBob25lTnVtYmVyU3RyaW5nKTsKIE5TQXJyYXkgKm1lbnVJ dGVtc0ZvclRlbGVwaG9uZU51bWJlcihjb25zdCBTdHJpbmcmIHRlbGVwaG9uZU51bWJlcik7CitO U1N0cmluZyAqbWVudUl0ZW1UaXRsZUZvclRlbGVwaG9uZU51bWJlckdyb3VwKCk7CiAjZW5kaWYK IAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9t YWMvTWVudVV0aWxpdGllcy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9y bS9tYWMvTWVudVV0aWxpdGllcy5tbQkocmV2aXNpb24gMTcyNDE3KQorKysgU291cmNlL1dlYktp dDIvUGxhdGZvcm0vbWFjL01lbnVVdGlsaXRpZXMubW0JKHdvcmtpbmcgY29weSkKQEAgLTU4LDYg KzU4LDExIEBAIHN0YXRpYyBOU1N0cmluZyAqbWVudUl0ZW1UaXRsZUZvclRlbGVwaG8KICAgICBy ZXR1cm4gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6V0VCX1VJX1NUUklORygiQ2FsbCDigJwl QOKAnSBVc2luZyBpUGhvbmUiLCAibWVudSBpdGVtIGZvciBtYWtpbmcgYSB0ZWxlcGhvbmUgY2Fs bCB0byBhIHRlbGVwaG9uZSBudW1iZXIiKSwgZm9ybWF0dGVkUGhvbmVOdW1iZXJTdHJpbmcodGVs ZXBob25lTnVtYmVyKV07CiB9CiAKK05TU3RyaW5nICptZW51SXRlbVRpdGxlRm9yVGVsZXBob25l TnVtYmVyR3JvdXAoKQoreworICAgIHJldHVybiBXRUJfVUlfU1RSSU5HKCJDYWxsIFVzaW5nIGlQ aG9uZToiLCAibWVudSBpdGVtIHRpdGxlIGZvciBwaG9uZSBudW1iZXIiKTsKK30KKwogTlNNZW51 SXRlbSAqbWVudUl0ZW1Gb3JUZWxlcGhvbmVOdW1iZXIoY29uc3QgU3RyaW5nJiB0ZWxlcGhvbmVO dW1iZXIpCiB7CiAgICAgTlNBcnJheSAqcHJvcG9zZWRNZW51ID0gW1tnZXREREFjdGlvbnNNYW5h Z2VyQ2xhc3MoKSBzaGFyZWRNYW5hZ2VyXSBtZW51SXRlbXNGb3JWYWx1ZTooTlNTdHJpbmcgKil0 ZWxlcGhvbmVOdW1iZXIgdHlwZTpnZXREREJpbmRlclBob25lTnVtYmVyS2V5KCkgc2VydmljZTpu aWwgY29udGV4dDpuaWxdOwpAQCAtNzEsNyArNzYsNyBAQCBOU01lbnVJdGVtICptZW51SXRlbUZv clRlbGVwaG9uZU51bWJlcihjCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBpZiAo W2FjdGlvbk9iamVjdC5hY3Rpb25VVEkgaGFzUHJlZml4OkAiY29tLmFwcGxlLmRpYWwiXSkgewot ICAgICAgICAgICAgaXRlbS50aXRsZSA9IG1lbnVJdGVtVGl0bGVGb3JUZWxlcGhvbmVOdW1iZXIo dGVsZXBob25lTnVtYmVyKTsKKyAgICAgICAgICAgIGl0ZW0udGl0bGUgPSBmb3JtYXR0ZWRQaG9u ZU51bWJlclN0cmluZyh0ZWxlcGhvbmVOdW1iZXIpOwogICAgICAgICAgICAgcmV0dXJuIGl0ZW07 CiAgICAgICAgIH0KICAgICB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dl YkNvbnRleHRNZW51UHJveHlNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tCShyZXZpc2lvbiAxNzI0MTcpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0J KHdvcmtpbmcgY29weSkKQEAgLTQwNywxMiArNDA3LDE4IEBAIHZvaWQgV2ViQ29udGV4dE1lbnVQ cm94eU1hYzo6c2V0dXBTZXJ2aWMKICAgICBjb25zdCBWZWN0b3I8U3RyaW5nPiYgc2VsZWN0ZWRU ZWxlcGhvbmVOdW1iZXJzID0gY29udGV4dC5zZWxlY3RlZFRlbGVwaG9uZU51bWJlcnMoKTsKICAg ICBpZiAoIXNlbGVjdGVkVGVsZXBob25lTnVtYmVycy5pc0VtcHR5KCkpIHsKICAgICAgICAgaWYg KG1fc2VydmljZXNNZW51KQotICAgICAgICAgICAgW21fc2VydmljZXNNZW51IGFkZEl0ZW06W05T TWVudUl0ZW0gc2VwYXJhdG9ySXRlbV1dOworICAgICAgICAgICAgW21fc2VydmljZXNNZW51IGlu c2VydEl0ZW06W05TTWVudUl0ZW0gc2VwYXJhdG9ySXRlbV0gYXRJbmRleDowXTsKICAgICAgICAg ZWxzZQogICAgICAgICAgICAgbV9zZXJ2aWNlc01lbnUgPSBhZG9wdE5TKFtbTlNNZW51IGFsbG9j XSBpbml0XSk7CisgICAgICAgIGludCBpdGVtUG9zaXRpb24gPSAwOworICAgICAgICBOU01lbnVJ dGVtICpncm91cEVudHJ5ID0gW1tOU01lbnVJdGVtIGFsbG9jXSBpbml0V2l0aFRpdGxlOm1lbnVJ dGVtVGl0bGVGb3JUZWxlcGhvbmVOdW1iZXJHcm91cCgpIGFjdGlvbjpuaWwga2V5RXF1aXZhbGVu dDpAIiJdOworICAgICAgICBbZ3JvdXBFbnRyeSBzZXRFbmFibGVkOk5PXTsKKyAgICAgICAgW21f c2VydmljZXNNZW51IGluc2VydEl0ZW06Z3JvdXBFbnRyeSBhdEluZGV4Oml0ZW1Qb3NpdGlvbisr XTsKICAgICAgICAgZm9yIChhdXRvJiB0ZWxlcGhvbmVOdW1iZXIgOiBzZWxlY3RlZFRlbGVwaG9u ZU51bWJlcnMpIHsKLSAgICAgICAgICAgIGlmIChOU01lbnVJdGVtICppdGVtID0gbWVudUl0ZW1G b3JUZWxlcGhvbmVOdW1iZXIodGVsZXBob25lTnVtYmVyKSkKLSAgICAgICAgICAgICAgICBbbV9z ZXJ2aWNlc01lbnUgYWRkSXRlbTppdGVtXTsKKyAgICAgICAgICAgIGlmIChOU01lbnVJdGVtICpp dGVtID0gbWVudUl0ZW1Gb3JUZWxlcGhvbmVOdW1iZXIodGVsZXBob25lTnVtYmVyKSkgeworICAg ICAgICAgICAgICAgIFtpdGVtIHNldEluZGVudGF0aW9uTGV2ZWw6MV07CisgICAgICAgICAgICAg ICAgW21fc2VydmljZXNNZW51IGluc2VydEl0ZW06aXRlbSBhdEluZGV4Oml0ZW1Qb3NpdGlvbisr XTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KIAo=