OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 35f9f310: am 5e6a2990: (-s ours) am 4d887ec3: am bcd50a7c: am 5712b5fc: Optimize...
Deepanshu Gupta [Fri, 2 May 2014 19:40:55 +0000 (19:40 +0000)]
am 35f9f310: am 5e6a2990: (-s ours) am 4d887ec3: am bcd50a7c: am 5712b5fc: Optimize layout rendering in layoutlib [DO NOT MERGE]

* commit '35f9f310178ca59e9480ed5190e5f7a1ef206380':
  Optimize layout rendering in layoutlib [DO NOT MERGE]

10 years agoam 95672929: am 73f9e467: (-s ours) am edd67cb1: am 7c02c6e2: am 02cde9ce: Add method...
Deepanshu Gupta [Fri, 2 May 2014 19:40:52 +0000 (19:40 +0000)]
am 95672929: am 73f9e467: (-s ours) am edd67cb1: am 7c02c6e2: am 02cde9ce: Add methods for Time_Delegate [DO NOT MERGE]

* commit '956729296af116e6f80214c7103c77cef8813e9e':
  Add methods for Time_Delegate [DO NOT MERGE]

10 years agoam ea18b2d6: am 95fd97aa: (-s ours) am 84e7a6b8: am 443372dd: am 9d7b5165: Add libpho...
Deepanshu Gupta [Fri, 2 May 2014 19:40:49 +0000 (19:40 +0000)]
am ea18b2d6: am 95fd97aa: (-s ours) am 84e7a6b8: am 443372dd: am 9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT MERGE]

* commit 'ea18b2d6549dc3a5b7fa8d1dbadccdd595690958':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]

10 years agoam fd581059: am 88a12f57: (-s ours) am 43034b54: am 62591cff: am 689c0dfe: Fix NPE...
Deepanshu Gupta [Fri, 2 May 2014 19:40:47 +0000 (19:40 +0000)]
am fd581059: am 88a12f57: (-s ours) am 43034b54: am 62591cff: am 689c0dfe: Fix NPE in layoutlib. [DO NOT MERGE]

* commit 'fd58105912a78ba2f21accb1b483fc0eee58780d':
  Fix NPE in layoutlib. [DO NOT MERGE]

10 years agoam f41ce157: am 43ed35da: (-s ours) am ce205d0a: am 600539c7: am 083d1562: Fix text...
Deepanshu Gupta [Fri, 2 May 2014 19:40:44 +0000 (19:40 +0000)]
am f41ce157: am 43ed35da: (-s ours) am ce205d0a: am 600539c7: am 083d1562: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit 'f41ce157727c19597dc5308282d09816c21e3459':
  Fix text size in Fake Action Bar. [DO NOT MERGE]

10 years agoam 071206b4: am aab9d9a7: (-s ours) am 1a434aa8: am 697c511d: am 80c668f2: Remove...
Deepanshu Gupta [Fri, 2 May 2014 19:40:42 +0000 (19:40 +0000)]
am 071206b4: am aab9d9a7: (-s ours) am 1a434aa8: am 697c511d: am 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]

* commit '071206b4b50ce94416042e6f5a0c838de43aace4':
  Remove references to non-std Java classes. [DO NOT MERGE]

10 years agoam c37f7c84: am d15bbac6: (-s ours) am a2b530fb: am e39de9ae: am 6335590a: Fix DatePi...
Deepanshu Gupta [Fri, 2 May 2014 19:40:38 +0000 (19:40 +0000)]
am c37f7c84: am d15bbac6: (-s ours) am a2b530fb: am e39de9ae: am 6335590a: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

* commit 'c37f7c84faaf245c5684da487c11967135b18f54':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

10 years agoam 8cc1d989: am 3e9bc262: (-s ours) am 9d209905: am 6f469e54: am 11ee746d: Layoutlib...
Deepanshu Gupta [Fri, 2 May 2014 19:40:35 +0000 (19:40 +0000)]
am 8cc1d989: am 3e9bc262: (-s ours) am 9d209905: am 6f469e54: am 11ee746d: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

* commit '8cc1d9891c23ef7717a384606531ffdcbd7acdd0':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

10 years agoam 5e6a2990: (-s ours) am 4d887ec3: am bcd50a7c: am 5712b5fc: Optimize layout renderi...
Deepanshu Gupta [Fri, 2 May 2014 19:36:24 +0000 (19:36 +0000)]
am 5e6a2990: (-s ours) am 4d887ec3: am bcd50a7c: am 5712b5fc: Optimize layout rendering in layoutlib [DO NOT MERGE]

* commit '5e6a2990805ec630fb97197910ecfbf7645bf8a6':
  Optimize layout rendering in layoutlib [DO NOT MERGE]

10 years agoam 73f9e467: (-s ours) am edd67cb1: am 7c02c6e2: am 02cde9ce: Add methods for Time_De...
Deepanshu Gupta [Fri, 2 May 2014 19:36:21 +0000 (19:36 +0000)]
am 73f9e467: (-s ours) am edd67cb1: am 7c02c6e2: am 02cde9ce: Add methods for Time_Delegate [DO NOT MERGE]

* commit '73f9e4675c0ebc23dd977a51f248dd6e603f7e33':
  Add methods for Time_Delegate [DO NOT MERGE]

10 years agoam 95fd97aa: (-s ours) am 84e7a6b8: am 443372dd: am 9d7b5165: Add libphonenumber...
Deepanshu Gupta [Fri, 2 May 2014 19:36:18 +0000 (19:36 +0000)]
am 95fd97aa: (-s ours) am 84e7a6b8: am 443372dd: am 9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT MERGE]

* commit '95fd97aa820dae4ba5040b6c040408b66887fe73':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]

10 years agoam 88a12f57: (-s ours) am 43034b54: am 62591cff: am 689c0dfe: Fix NPE in layoutlib...
Deepanshu Gupta [Fri, 2 May 2014 19:36:16 +0000 (19:36 +0000)]
am 88a12f57: (-s ours) am 43034b54: am 62591cff: am 689c0dfe: Fix NPE in layoutlib. [DO NOT MERGE]

* commit '88a12f5744846511e1861cf0f2e311f642109012':
  Fix NPE in layoutlib. [DO NOT MERGE]

10 years agoam 43ed35da: (-s ours) am ce205d0a: am 600539c7: am 083d1562: Fix text size in Fake...
Deepanshu Gupta [Fri, 2 May 2014 19:36:13 +0000 (19:36 +0000)]
am 43ed35da: (-s ours) am ce205d0a: am 600539c7: am 083d1562: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit '43ed35da99e500182b176ea74f0cd051a3325f39':
  Fix text size in Fake Action Bar. [DO NOT MERGE]

10 years agoam aab9d9a7: (-s ours) am 1a434aa8: am 697c511d: am 80c668f2: Remove references to...
Deepanshu Gupta [Fri, 2 May 2014 19:36:10 +0000 (19:36 +0000)]
am aab9d9a7: (-s ours) am 1a434aa8: am 697c511d: am 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]

* commit 'aab9d9a75cac9f1ed8291a5820d676c2eadc8b4d':
  Remove references to non-std Java classes. [DO NOT MERGE]

10 years agoam d15bbac6: (-s ours) am a2b530fb: am e39de9ae: am 6335590a: Fix DatePicker and...
Deepanshu Gupta [Fri, 2 May 2014 19:36:07 +0000 (19:36 +0000)]
am d15bbac6: (-s ours) am a2b530fb: am e39de9ae: am 6335590a: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

* commit 'd15bbac6316bb7d3838489f7eaab58147479dc92':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

10 years agoam 3e9bc262: (-s ours) am 9d209905: am 6f469e54: am 11ee746d: Layoutlib: Update the...
Deepanshu Gupta [Fri, 2 May 2014 19:36:04 +0000 (19:36 +0000)]
am 3e9bc262: (-s ours) am 9d209905: am 6f469e54: am 11ee746d: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

* commit '3e9bc262105b9fe0d3f538a4ec0143606a7de0d1':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

10 years agoam 4d887ec3: am bcd50a7c: am 5712b5fc: Optimize layout rendering in layoutlib [DO...
Deepanshu Gupta [Fri, 2 May 2014 19:31:42 +0000 (19:31 +0000)]
am 4d887ec3: am bcd50a7c: am 5712b5fc: Optimize layout rendering in layoutlib [DO NOT MERGE]

* commit '4d887ec388da13c6b65455416a0b829d81e0160a':
  Optimize layout rendering in layoutlib [DO NOT MERGE]

10 years agoam edd67cb1: am 7c02c6e2: am 02cde9ce: Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:31:39 +0000 (19:31 +0000)]
am edd67cb1: am 7c02c6e2: am 02cde9ce: Add methods for Time_Delegate [DO NOT MERGE]

* commit 'edd67cb194b54bb7c6c25eb570d28614900446cf':
  Add methods for Time_Delegate [DO NOT MERGE]

10 years agoam 84e7a6b8: am 443372dd: am 9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT...
Deepanshu Gupta [Fri, 2 May 2014 19:31:36 +0000 (19:31 +0000)]
am 84e7a6b8: am 443372dd: am 9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT MERGE]

* commit '84e7a6b82303b52c7b44f1a2a295177361edf9ea':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]

10 years agoam 43034b54: am 62591cff: am 689c0dfe: Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:31:18 +0000 (19:31 +0000)]
am 43034b54: am 62591cff: am 689c0dfe: Fix NPE in layoutlib. [DO NOT MERGE]

* commit '43034b541cecd924b4b79a5caff850a53516ec26':
  Fix NPE in layoutlib. [DO NOT MERGE]

10 years agoam ce205d0a: am 600539c7: am 083d1562: Fix text size in Fake Action Bar. [DO NOT...
Deepanshu Gupta [Fri, 2 May 2014 19:31:15 +0000 (19:31 +0000)]
am ce205d0a: am 600539c7: am 083d1562: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit 'ce205d0a3b88e12127a8c717ff913fce2d59e36d':
  Fix text size in Fake Action Bar. [DO NOT MERGE]

10 years agoam 1a434aa8: am 697c511d: am 80c668f2: Remove references to non-std Java classes...
Deepanshu Gupta [Fri, 2 May 2014 19:31:11 +0000 (19:31 +0000)]
am 1a434aa8: am 697c511d: am 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]

* commit '1a434aa8fcc118df13bea58e112da081d47ae73b':
  Remove references to non-std Java classes. [DO NOT MERGE]

10 years agoam a2b530fb: am e39de9ae: am 6335590a: Fix DatePicker and Calendar widget in layoutli...
Deepanshu Gupta [Fri, 2 May 2014 19:31:08 +0000 (19:31 +0000)]
am a2b530fb: am e39de9ae: am 6335590a: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

* commit 'a2b530fb7a11e5d0490daf5e9fea56ead5181caa':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

10 years agoam 9d209905: am 6f469e54: am 11ee746d: Layoutlib: Update the wifi icon in the status...
Deepanshu Gupta [Fri, 2 May 2014 19:31:05 +0000 (19:31 +0000)]
am 9d209905: am 6f469e54: am 11ee746d: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

* commit '9d2099052d207a4ca3bf3e4ef021feadf20c260f':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

10 years agoam b22644fa: am 2bb672a2: (-s ours) am 582bb0dc: am fbb1561a: am 44bcd64e: Fix Calend...
Deepanshu Gupta [Fri, 2 May 2014 19:28:16 +0000 (19:28 +0000)]
am b22644fa: am 2bb672a2: (-s ours) am 582bb0dc: am fbb1561a: am 44bcd64e: Fix CalendarView to show the right labels. [DO NOT MERGE]

* commit 'b22644fa3c28a85c57566917f756ff5af0efba6e':
  Fix CalendarView to show the right labels. [DO NOT MERGE]

10 years agoam 789f7ada: am 27f0cf0b: (-s ours) am 10fd7f6b: am ca2c6307: am 87be67f9: Fix layout...
Deepanshu Gupta [Fri, 2 May 2014 19:28:14 +0000 (19:28 +0000)]
am 789f7ada: am 27f0cf0b: (-s ours) am 10fd7f6b: am ca2c6307: am 87be67f9: Fix layoutlib [DO NOT MERGE]

* commit '789f7ada71ba7c3c228027d26f4c24d8ee420d0c':
  Fix layoutlib [DO NOT MERGE]

10 years agoam cc5e933f: am 5c7a844c: (-s ours) am 23726255: am 77d1eca7: am 7b5d54f0: Fix ClassC...
Deepanshu Gupta [Fri, 2 May 2014 19:28:11 +0000 (19:28 +0000)]
am cc5e933f: am 5c7a844c: (-s ours) am 23726255: am 77d1eca7: am 7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit 'cc5e933f39ab07561edc46070d2fa94e322b0732':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]

10 years agoam ffba5739: am d60d0c1c: (-s ours) am f5512973: am fe675441: am ce22440d: Fix text...
Deepanshu Gupta [Fri, 2 May 2014 19:28:09 +0000 (19:28 +0000)]
am ffba5739: am d60d0c1c: (-s ours) am f5512973: am fe675441: am ce22440d: Fix text rendering [DO NOT MERGE]

* commit 'ffba573994c160f38a497ddc16552cfdc1f60063':
  Fix text rendering [DO NOT MERGE]

10 years agoam 519e77bb: am 44cc867f: (-s ours) am 9a1f13a4: am afc623e3: am bd9e181b: Fix layout...
Deepanshu Gupta [Fri, 2 May 2014 19:28:06 +0000 (19:28 +0000)]
am 519e77bb: am 44cc867f: (-s ours) am 9a1f13a4: am afc623e3: am bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]

* commit '519e77bbf26e0a6ea10f6e94c5b86c4c2d57c633':
  Fix layout rendering for RTL locales [DO NOT MERGE]

10 years agoam 64d1c57a: am 11976058: (-s ours) am b80247d3: am 811b331a: am d4875e19: Add orient...
Deepanshu Gupta [Fri, 2 May 2014 19:28:04 +0000 (19:28 +0000)]
am 64d1c57a: am 11976058: (-s ours) am b80247d3: am 811b331a: am d4875e19: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit '64d1c57a269002af44143dbe4619d30d96d434ca':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]

10 years agoam 175a1e60: am e821d0cc: (-s ours) am b27d8814: am 21cf9843: am d1084cc0: Add missin...
Deepanshu Gupta [Fri, 2 May 2014 19:27:54 +0000 (19:27 +0000)]
am 175a1e60: am e821d0cc: (-s ours) am b27d8814: am 21cf9843: am d1084cc0: Add missing native methods. [DO NOT MERGE]

* commit '175a1e60366df522b3146d8ade9cb2b895a29cf9':
  Add missing native methods. [DO NOT MERGE]

10 years agoam bcd50a7c: am 5712b5fc: Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:27:03 +0000 (19:27 +0000)]
am bcd50a7c: am 5712b5fc: Optimize layout rendering in layoutlib [DO NOT MERGE]

* commit 'bcd50a7cf37bc87196a112a48294595dc47dd004':
  Optimize layout rendering in layoutlib [DO NOT MERGE]

10 years agoam 7c02c6e2: am 02cde9ce: Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:27:00 +0000 (19:27 +0000)]
am 7c02c6e2: am 02cde9ce: Add methods for Time_Delegate [DO NOT MERGE]

* commit '7c02c6e27f0154cc63c2ff0461d7e49c151c1328':
  Add methods for Time_Delegate [DO NOT MERGE]

10 years agoam 443372dd: am 9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:26:57 +0000 (19:26 +0000)]
am 443372dd: am 9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT MERGE]

* commit '443372ddf378b00621a284a9614b869fd9484ab4':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]

10 years agoam 62591cff: am 689c0dfe: Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:26:54 +0000 (19:26 +0000)]
am 62591cff: am 689c0dfe: Fix NPE in layoutlib. [DO NOT MERGE]

* commit '62591cffc758b2c77028e4b80d61086c135ef54b':
  Fix NPE in layoutlib. [DO NOT MERGE]

10 years agoam 600539c7: am 083d1562: Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:26:51 +0000 (19:26 +0000)]
am 600539c7: am 083d1562: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit '600539c7fff799f3c55c1d8f97ccfeec61f80a55':
  Fix text size in Fake Action Bar. [DO NOT MERGE]

10 years agoam 697c511d: am 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:26:49 +0000 (19:26 +0000)]
am 697c511d: am 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]

* commit '697c511d948cdc23682c82155b23eee56f91743f':
  Remove references to non-std Java classes. [DO NOT MERGE]

10 years agoam e39de9ae: am 6335590a: Fix DatePicker and Calendar widget in layoutlib. [DO NOT...
Deepanshu Gupta [Fri, 2 May 2014 19:26:46 +0000 (19:26 +0000)]
am e39de9ae: am 6335590a: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

* commit 'e39de9ae58ea80f27cd58853926b5b153c33ce0d':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

10 years agoam 6f469e54: am 11ee746d: Layoutlib: Update the wifi icon in the status bar. [DO...
Deepanshu Gupta [Fri, 2 May 2014 19:26:43 +0000 (19:26 +0000)]
am 6f469e54: am 11ee746d: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

* commit '6f469e5438dbb2213d26c41a5d410df3bed4d4ca':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

10 years agoam 5712b5fc: Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:24:03 +0000 (19:24 +0000)]
am 5712b5fc: Optimize layout rendering in layoutlib [DO NOT MERGE]

* commit '5712b5fc3fec0dc376e84f660f2fe0d1102c0cbb':
  Optimize layout rendering in layoutlib [DO NOT MERGE]

10 years agoam 465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:24:00 +0000 (19:24 +0000)]
am 465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

* commit '465cb53ba4b4a5edff9e9a63eb97d396b94d6568':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

10 years agoam 02cde9ce: Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:58 +0000 (19:23 +0000)]
am 02cde9ce: Add methods for Time_Delegate [DO NOT MERGE]

* commit '02cde9ceeb4c052ee273a5d809816dfd355ebb56':
  Add methods for Time_Delegate [DO NOT MERGE]

10 years agoam b5cdfd97: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:57 +0000 (19:23 +0000)]
am b5cdfd97: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

* commit 'b5cdfd97a5bbc2c52dec907467362550aff8afc4':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

10 years agoam 9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:56 +0000 (19:23 +0000)]
am 9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT MERGE]

* commit '9d7b5165576e3cf491fe47cf335feb6d204140b3':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]

10 years agoam 20e0695b: Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:54 +0000 (19:23 +0000)]
am 20e0695b: Action bar rendering in layoutlib [DO NOT MERGE]

* commit '20e0695b554e883b095f5223be10b6e1097db49f':
  Action bar rendering in layoutlib [DO NOT MERGE]

10 years agoam 689c0dfe: Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:53 +0000 (19:23 +0000)]
am 689c0dfe: Fix NPE in layoutlib. [DO NOT MERGE]

* commit '689c0dfe72a57c0555560012cbc6806375e7d4b7':
  Fix NPE in layoutlib. [DO NOT MERGE]

10 years agoam 083d1562: Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:50 +0000 (19:23 +0000)]
am 083d1562: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit '083d1562e00631630b5594462ce4a867a3508d8d':
  Fix text size in Fake Action Bar. [DO NOT MERGE]

10 years agoam 3c00b28b: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:50 +0000 (19:23 +0000)]
am 3c00b28b: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

* commit '3c00b28bf60ab01b449e16df045238f4bae4d700':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]

10 years agoam 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:47 +0000 (19:23 +0000)]
am 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]

* commit '80c668f2a076e91d887dbf77776cd503ff88b0b4':
  Remove references to non-std Java classes. [DO NOT MERGE]

10 years agoam b85d30a2: Add missing dependency in layoutlib build file [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:47 +0000 (19:23 +0000)]
am b85d30a2: Add missing dependency in layoutlib build file [DO NOT MERGE]

* commit 'b85d30a2c88b6a23e251347b14a75456c4daeca9':
  Add missing dependency in layoutlib build file [DO NOT MERGE]

10 years agoam f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:44 +0000 (19:23 +0000)]
am f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

* commit 'f8144032d1fb7319bfd24914b12597505cfcc91f':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

10 years agoam 6335590a: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:43 +0000 (19:23 +0000)]
am 6335590a: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

* commit '6335590aa8997944cc7fb358a315dbb9b789f87f':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

10 years agoam 2bb672a2: (-s ours) am 582bb0dc: am fbb1561a: am 44bcd64e: Fix CalendarView to...
Deepanshu Gupta [Fri, 2 May 2014 19:23:42 +0000 (19:23 +0000)]
am 2bb672a2: (-s ours) am 582bb0dc: am fbb1561a: am 44bcd64e: Fix CalendarView to show the right labels. [DO NOT MERGE]

* commit '2bb672a20800c5372e16b9a1fd72e2c0a444992f':
  Fix CalendarView to show the right labels. [DO NOT MERGE]

10 years agoam 89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:42 +0000 (19:23 +0000)]
am 89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE]

* commit '89fdc0c556cf0fe2562fb8f0476e03cd51045164':
  Layoutlib tests now check methods return value [DO NOT MERGE]

10 years agoam 11ee746d: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:40 +0000 (19:23 +0000)]
am 11ee746d: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

* commit '11ee746dc5e77f4f33aac45ac9e344444223012d':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

10 years agoam 27f0cf0b: (-s ours) am 10fd7f6b: am ca2c6307: am 87be67f9: Fix layoutlib [DO NOT...
Deepanshu Gupta [Fri, 2 May 2014 19:23:39 +0000 (19:23 +0000)]
am 27f0cf0b: (-s ours) am 10fd7f6b: am ca2c6307: am 87be67f9: Fix layoutlib [DO NOT MERGE]

* commit '27f0cf0b135917b52fea14406e806b35e721949e':
  Fix layoutlib [DO NOT MERGE]

10 years agoam d4f0073f: Remove references to java package class Objects. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:39 +0000 (19:23 +0000)]
am d4f0073f: Remove references to java package class Objects. [DO NOT MERGE]

* commit 'd4f0073f4805cd1036218f243d9b7c7c5bb90e41':
  Remove references to java package class Objects. [DO NOT MERGE]

10 years agoam 5c7a844c: (-s ours) am 23726255: am 77d1eca7: am 7b5d54f0: Fix ClassCastException...
Deepanshu Gupta [Fri, 2 May 2014 19:23:36 +0000 (19:23 +0000)]
am 5c7a844c: (-s ours) am 23726255: am 77d1eca7: am 7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit '5c7a844ca19873a03bac861ed021bdeea3712ca8':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]

10 years agoam d60d0c1c: (-s ours) am f5512973: am fe675441: am ce22440d: Fix text rendering...
Deepanshu Gupta [Fri, 2 May 2014 19:23:33 +0000 (19:23 +0000)]
am d60d0c1c: (-s ours) am f5512973: am fe675441: am ce22440d: Fix text rendering [DO NOT MERGE]

* commit 'd60d0c1ce70a83263daa91d7c4c44d73878e6696':
  Fix text rendering [DO NOT MERGE]

10 years agoam 44cc867f: (-s ours) am 9a1f13a4: am afc623e3: am bd9e181b: Fix layout rendering...
Deepanshu Gupta [Fri, 2 May 2014 19:23:29 +0000 (19:23 +0000)]
am 44cc867f: (-s ours) am 9a1f13a4: am afc623e3: am bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]

* commit '44cc867f7d4ca212b7003057148b8cdabb8f85fb':
  Fix layout rendering for RTL locales [DO NOT MERGE]

10 years agoam 11976058: (-s ours) am b80247d3: am 811b331a: am d4875e19: Add orientation to...
Deepanshu Gupta [Fri, 2 May 2014 19:23:26 +0000 (19:23 +0000)]
am 11976058: (-s ours) am b80247d3: am 811b331a: am d4875e19: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit '1197605876d8c3029238ca9b93a95f9c41ed3266':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]

10 years agoam e821d0cc: (-s ours) am b27d8814: am 21cf9843: am d1084cc0: Add missing native...
Deepanshu Gupta [Fri, 2 May 2014 19:23:23 +0000 (19:23 +0000)]
am e821d0cc: (-s ours) am b27d8814: am 21cf9843: am d1084cc0: Add missing native methods. [DO NOT MERGE]

* commit 'e821d0cc549923d0e3d2535acfa5b70fc89a1ebe':
  Add missing native methods. [DO NOT MERGE]

10 years agoam 582bb0dc: am fbb1561a: am 44bcd64e: Fix CalendarView to show the right labels...
Deepanshu Gupta [Fri, 2 May 2014 19:19:55 +0000 (19:19 +0000)]
am 582bb0dc: am fbb1561a: am 44bcd64e: Fix CalendarView to show the right labels. [DO NOT MERGE]

* commit '582bb0dc7498997f441c5209b1558a4640b5a107':
  Fix CalendarView to show the right labels. [DO NOT MERGE]

10 years agoam 10fd7f6b: am ca2c6307: am 87be67f9: Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:19:52 +0000 (19:19 +0000)]
am 10fd7f6b: am ca2c6307: am 87be67f9: Fix layoutlib [DO NOT MERGE]

* commit '10fd7f6b4192fdbd847106fb0d9ec87095092ee3':
  Fix layoutlib [DO NOT MERGE]

10 years agoam 23726255: am 77d1eca7: am 7b5d54f0: Fix ClassCastException when rendering ListView...
Deepanshu Gupta [Fri, 2 May 2014 19:19:48 +0000 (19:19 +0000)]
am 23726255: am 77d1eca7: am 7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit '237262558b818ce52ec53281f2270be3e4f1ee28':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]

10 years agoam f5512973: am fe675441: am ce22440d: Fix text rendering [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:19:46 +0000 (19:19 +0000)]
am f5512973: am fe675441: am ce22440d: Fix text rendering [DO NOT MERGE]

* commit 'f55129731005f6939d40d7c8a0c0f8c93b472f98':
  Fix text rendering [DO NOT MERGE]

10 years agoam 9a1f13a4: am afc623e3: am bd9e181b: Fix layout rendering for RTL locales [DO NOT...
Deepanshu Gupta [Fri, 2 May 2014 19:19:42 +0000 (19:19 +0000)]
am 9a1f13a4: am afc623e3: am bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]

* commit '9a1f13a47bfe29e344efc05f0ecabbfcb5671e06':
  Fix layout rendering for RTL locales [DO NOT MERGE]

10 years agoam b80247d3: am 811b331a: am d4875e19: Add orientation to configuration for layoutlib...
Deepanshu Gupta [Fri, 2 May 2014 19:19:39 +0000 (19:19 +0000)]
am b80247d3: am 811b331a: am d4875e19: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit 'b80247d351b88f69192260a661dbf3d4d71e9527':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]

10 years agoam b27d8814: am 21cf9843: am d1084cc0: Add missing native methods. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:19:36 +0000 (19:19 +0000)]
am b27d8814: am 21cf9843: am d1084cc0: Add missing native methods. [DO NOT MERGE]

* commit 'b27d881467869539a5c8ec2510e8415912abb617':
  Add missing native methods. [DO NOT MERGE]

10 years agoam fbb1561a: am 44bcd64e: Fix CalendarView to show the right labels. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:59 +0000 (19:15 +0000)]
am fbb1561a: am 44bcd64e: Fix CalendarView to show the right labels. [DO NOT MERGE]

* commit 'fbb1561a483b455aa840c69c391c3bbd1a529981':
  Fix CalendarView to show the right labels. [DO NOT MERGE]

10 years agoam ca2c6307: am 87be67f9: Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:56 +0000 (19:15 +0000)]
am ca2c6307: am 87be67f9: Fix layoutlib [DO NOT MERGE]

* commit 'ca2c6307263b3857ba688c80277fef402215db18':
  Fix layoutlib [DO NOT MERGE]

10 years agoam 77d1eca7: am 7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT...
Deepanshu Gupta [Fri, 2 May 2014 19:15:52 +0000 (19:15 +0000)]
am 77d1eca7: am 7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit '77d1eca7d2acf68f246970e59a50e8a6e1c03e20':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]

10 years agoam fe675441: am ce22440d: Fix text rendering [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:50 +0000 (19:15 +0000)]
am fe675441: am ce22440d: Fix text rendering [DO NOT MERGE]

* commit 'fe67544161d44d54c8462c44c78fe290f2195f2e':
  Fix text rendering [DO NOT MERGE]

10 years agoam afc623e3: am bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:46 +0000 (19:15 +0000)]
am afc623e3: am bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]

* commit 'afc623e34e5a2bd375da00a52c3c393d5049a1d1':
  Fix layout rendering for RTL locales [DO NOT MERGE]

10 years agoam 811b331a: am d4875e19: Add orientation to configuration for layoutlib. [DO NOT...
Deepanshu Gupta [Fri, 2 May 2014 19:15:43 +0000 (19:15 +0000)]
am 811b331a: am d4875e19: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit '811b331ae2334161c6082f666d7b3bab788f69a3':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]

10 years agoam 21cf9843: am d1084cc0: Add missing native methods. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:15:40 +0000 (19:15 +0000)]
am 21cf9843: am d1084cc0: Add missing native methods. [DO NOT MERGE]

* commit '21cf98438b77ab58d6c781e09aecb8ad0f682042':
  Add missing native methods. [DO NOT MERGE]

10 years agoam 44bcd64e: Fix CalendarView to show the right labels. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:34 +0000 (19:12 +0000)]
am 44bcd64e: Fix CalendarView to show the right labels. [DO NOT MERGE]

* commit '44bcd64e5b9fd211dd56b0598693a0559f65dc1a':
  Fix CalendarView to show the right labels. [DO NOT MERGE]

10 years agoam 87be67f9: Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:30 +0000 (19:12 +0000)]
am 87be67f9: Fix layoutlib [DO NOT MERGE]

* commit '87be67f91719234cbd381ff0242b5efc8b6aa257':
  Fix layoutlib [DO NOT MERGE]

10 years agoam 7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:27 +0000 (19:12 +0000)]
am 7b5d54f0: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit '7b5d54f05be61a7ab40021644a91c466e2897627':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]

10 years agoam ce22440d: Fix text rendering [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:23 +0000 (19:12 +0000)]
am ce22440d: Fix text rendering [DO NOT MERGE]

* commit 'ce22440d4ca94009a4fb22c3d4f924cfbf422a66':
  Fix text rendering [DO NOT MERGE]

10 years agoam bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:18 +0000 (19:12 +0000)]
am bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]

* commit 'bd9e181b291af34f9d70db42715136f3c16ddbde':
  Fix layout rendering for RTL locales [DO NOT MERGE]

10 years agoam d4875e19: Add orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:16 +0000 (19:12 +0000)]
am d4875e19: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit 'd4875e19f5b7c69226783b0a6590831466159f84':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]

10 years agoam d1084cc0: Add missing native methods. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:12:12 +0000 (19:12 +0000)]
am d1084cc0: Add missing native methods. [DO NOT MERGE]

* commit 'd1084cc02549dc9ee67c879f78ae929095ec19b6':
  Add missing native methods. [DO NOT MERGE]

10 years agoOptimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 21 Jan 2014 01:02:37 +0000 (17:02 -0800)]
Optimize layout rendering in layoutlib [DO NOT MERGE]

The height of a layout should be zero if it is assigned a layout_weight.
This way, the layout is measured only once and prevents spurious errors.

Bug: https://code.google.com/p/android/issues/detail?id=58398
Change-Id: If49a7480e5eb82cb86780e00f2f5b65ee053fc2a
(cherry-picked from 9e5e993c7969ad60ff70cfdcf707247f38a705a1)

10 years agoAdd methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Sat, 1 Feb 2014 03:03:48 +0000 (19:03 -0800)]
Add methods for Time_Delegate [DO NOT MERGE]

Bug: http://b.android.com/65359
Change-Id: I7c2d09286d6bcd9899444aaa5a4a5a342e39d923
(cherry-picked from ddb7f3273c3c00e6520794dcaabdaad20fd98e26)

10 years agoAdd libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Wed, 13 Nov 2013 11:52:22 +0000 (17:22 +0530)]
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]

Issue: http://b.android.com/59497
Change-Id: Ief11e602703b6041db66241f1699cc1de72e65a5
(cherry picked from commit 317f304893c58c5e50255bd712448ca233ae5cec)

10 years agoFix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 12 Nov 2013 13:03:17 +0000 (18:33 +0530)]
Fix NPE in layoutlib. [DO NOT MERGE]

Change-Id: I36623304d83b344ea078044001577b8005a63c02
(cherry picked from commit 80c55109b6351049498df294234dc0a75e75ec44)

10 years agoFix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 8 Nov 2013 11:13:07 +0000 (16:43 +0530)]
Fix text size in Fake Action Bar. [DO NOT MERGE]

The density multiplier was being applied twice to the title text in
the fake action bar.

Bug: 11436018
Change-Id: Id74c11037cb43d01f6cd79126623c84edfc37aaf
(cherry-picked from 0b7d80765c21dbd9294a0245f92a655fdd61514e)

10 years agoRemove references to non-std Java classes. [DO NOT MERGE]
Deepanshu Gupta [Tue, 10 Sep 2013 22:41:21 +0000 (15:41 -0700)]
Remove references to non-std Java classes. [DO NOT MERGE]

Do not add the non-standard Java classes. Updates the references to all
non-standard classes to new classes in
com.android.tools.layoulib.create package. This also treats
java.lang.AutoCloseable which is part of Java 7 similarly so that we can
still run on Java 6.

This also adapts the cherrypick for this branch by updating references
to the non-standard Java classes present in this branch.

Change-Id: Iac5b272652e2780c9bb72d19f415d150948ca589
(cherry picked from 0b7d80765c21dbd9294a0245f92a655fdd61514e)

10 years agoFix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Sun, 13 Oct 2013 01:37:19 +0000 (18:37 -0700)]
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

Issue: https://code.google.com/p/android/issues/detail?id=59732

Change-Id: I281b3fdad88c591281a3645592c84f3e2cb61d09
(cherry picked from commit 81f74f4bc96ea4266cebe1b785d095558f540800)

10 years agoLayoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Sun, 13 Oct 2013 04:28:50 +0000 (21:28 -0700)]
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

Issue: https://code.google.com/p/android/issues/detail?id=60993

Change-Id: Ia43ed40b42c79f67dcd5809b827d4fecbc823c25
(cherry picked from commit 9cb5f5b5233f2331748d108d71f4b685762f32a7)

10 years agoFix CalendarView to show the right labels. [DO NOT MERGE]
Deepanshu Gupta [Tue, 15 Oct 2013 01:14:58 +0000 (18:14 -0700)]
Fix CalendarView to show the right labels. [DO NOT MERGE]

Change-Id: I95431f1054678d4192bd1621c1f69b29268f55e9
(cherry picked from commit 083e3caf66c21f7cc9511db479726c38d90e2d2f)

10 years agoFix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Thu, 17 Oct 2013 03:27:51 +0000 (20:27 -0700)]
Fix layoutlib [DO NOT MERGE]

Fix a NPE.

The cherry-pick differs slightly from the original to remove changes not
relevant to the current branch.

Bug: 11140701
Change-Id: Id92fc5359acf6dde1bcdbc781aaf637fdb6eecbf
(cherry-picked from 28873c1f008f4fe24441923e14f30e55d6f0967a)

10 years agoFix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Tue, 10 Sep 2013 22:39:41 +0000 (15:39 -0700)]
Fix ClassCastException when rendering ListView [DO NOT MERGE]

Bug: b.android.com/59300
Change-Id: Ia350adb3308daa8170bff755302760790163c811
(cherry picked from commit 54d88f7678387a6eb871ec2dccd36af4ff35b1fe)

10 years agoFix text rendering [DO NOT MERGE]
Deepanshu Gupta [Fri, 12 Jul 2013 18:38:05 +0000 (11:38 -0700)]
Fix text rendering [DO NOT MERGE]

There are still some errors
1. Little vertical clippping for extra tall glyphs.
2. Breaking into scripts isn't perfect which results in incorrect layout
of text.

Change-Id: I54de3c05eca5e8affb1135c120eea24c3afe8a47
(cherry picked from commit 92a169fa2e1bab7d93089196c33c2de12f9eae82)

10 years agoFix layout rendering for RTL locales [DO NOT MERGE]
Deepanshu Gupta [Thu, 20 Jun 2013 00:29:12 +0000 (17:29 -0700)]
Fix layout rendering for RTL locales [DO NOT MERGE]

This changeset adds the framework resources for RTL locales and mirrors
the layout if the application is RTL aware.

Use ICU to check the character orientation of the locale - right to left
or left to right. Set the layout direction on the top level layout
accordingly. Also, load the RTL resources for Nav Bar when the locale is
RTL.

Change-Id: I1ed0d516ab64120a0abca413ba678036661508f8
(cherry picked from commit eee0ea7a0b85ea6345eb7b8da5dbf17306c7339c)

10 years agoAdd orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 12 Jul 2013 22:24:51 +0000 (15:24 -0700)]
Add orientation to configuration for layoutlib. [DO NOT MERGE]

Update the configuration with the device orientation before rendering.

Change-Id: Icd40901204fd13f90b18353e53a15e25e5b2176c
(cherry picked from commit d97d60c0fa4613a47d591d45736299702be1cc7a)

10 years agoAdd missing native methods. [DO NOT MERGE]
Deepanshu Gupta [Thu, 23 May 2013 22:20:04 +0000 (15:20 -0700)]
Add missing native methods. [DO NOT MERGE]

Also contains fixes for native methods specific to the branch.

Change-Id: I7b34e2ec0164520efc658053a80f307791a992b1
(cherry-picked from commit: 279c00e8e0abb20f7e10577c77937c058da080bf)

10 years agoUse ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Sat, 26 Apr 2014 03:47:16 +0000 (20:47 -0700)]
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

When running in edit mode, do not use the application info to get the
icon, since it will be null.

Change-Id: I174e6126ddca341d06c5f04939470ef52f0e771c

10 years agoOverflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Thu, 13 Feb 2014 01:37:46 +0000 (17:37 -0800)]
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

In addition to the cherrypicked changes, appropriate changes due to
changes to com.android.internal.widget.ActionBarView are made.

The icon used in the Action Bar may not always be the right one due to
the above resolution.

Change-Id: Ib7cc314079099c010f7d53849e204db36c410357
(cherry-picked from commit 1b87390c9426c4bc9119829e9375d712dfde11c3)