git.osdn.net Git - android-x86/frameworks-base.git/log

Deepanshu Gupta [Tue, 13 May 2014 21:07:40 +0000 (21:07 +0000)]

am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

* commit '900954e3cd135bf43db975961056e7661f26a6c6':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:07:38 +0000 (21:07 +0000)]

am 7b9cc710: (-s ours) am 9c7e3064: am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]

* commit '7b9cc71063869a98f35b49c2e072750dfa46e0b9':
Support actionProviderClass attribute for menus [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:07:35 +0000 (21:07 +0000)]

am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev

* commit 'b7e1bef1835bdb224d6ed09c3c219662e1db1f56':
Add special system view cookie to OverflowButton. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:07:31 +0000 (21:07 +0000)]

am 22dabb52: (-s ours) am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:07:28 +0000 (21:07 +0000)]

am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev

* commit '919ce2051595dfa5dd047660946038d23fa688f4':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:02:19 +0000 (21:02 +0000)]

am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

* commit '2100476ace68858bc7b7356b33aa525e38795592':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:02:17 +0000 (21:02 +0000)]

am 9c7e3064: am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]

* commit '9c7e3064469e51a10503cfdf3d0215a62a3b6c8d':
Support actionProviderClass attribute for menus [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:02:14 +0000 (21:02 +0000)]

am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev

* commit 'b607cb82e0883a755fa6c6f9f5ec573cd79a731b':
Add special system view cookie to OverflowButton. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:02:11 +0000 (21:02 +0000)]

am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:02:08 +0000 (21:02 +0000)]

am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev

* commit '03bf747fec291b355af531bf0b04a2b1669bf92e':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:00:19 +0000 (21:00 +0000)]

am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

* commit '31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:00:16 +0000 (21:00 +0000)]

am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]

* commit '1b0f605667dc286b1a1f423b43c4b6957993daaf':
Support actionProviderClass attribute for menus [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 21:00:13 +0000 (21:00 +0000)]

am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev

* commit '27c9b568ed6b24f68aeee0f2a1d7b3fa83bcc056':
Add special system view cookie to OverflowButton. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:56:33 +0000 (20:56 +0000)]

am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:56:31 +0000 (20:56 +0000)]

am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev

* commit '858ab06a38769aaa05a4b87a600739c9294b382d':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:56:04 +0000 (20:56 +0000)]

am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

* commit '964023c5dcd0334cdcf624eff26d791d9c9617a8':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:56:01 +0000 (20:56 +0000)]

am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]

* commit 'c1847b54a391857f0871a15e97fbaae0fef0ff33':
Support actionProviderClass attribute for menus [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:55:59 +0000 (20:55 +0000)]

am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev

* commit 'e969ee5e5ddc112df4759b308e3e1eafc9cbcf84':
Add special system view cookie to OverflowButton. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:54:20 +0000 (20:54 +0000)]

am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev

* commit 'e5c518cbd0544a44bae8cb2a0b90d18bb91c5b8a':
Add view cookies for action bar menus. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:54:12 +0000 (20:54 +0000)]

am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

* commit '8bf73eae6c98532c8a597b885b948b9878555441':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:54:09 +0000 (20:54 +0000)]

am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]

* commit '5454be00b182b206bbc9dcd35b88da63631f7e8e':
Support actionProviderClass attribute for menus [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:51:14 +0000 (20:51 +0000)]

am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:51:11 +0000 (20:51 +0000)]

am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev

* commit 'ec1b4df6d2ccfe35c251344b43a29af65c3b56e1':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:50:23 +0000 (13:50 -0700)]

resolved conflicts for merge of d388afad to jb-mr1.1-dev

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:49:25 +0000 (20:49 +0000)]

am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]

* commit 'a312214f736638486983874b4f266bb537bab723':
Add missing layout params to xlarge action bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:49:22 +0000 (20:49 +0000)]

am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:49:06 +0000 (20:49 +0000)]

am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev

* commit '4e8b055b2ad23f6e336872f775058bcf18c46dfd':
Add view cookies for action bar menus. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:48:06 +0000 (20:48 +0000)]

am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:43:51 +0000 (20:43 +0000)]

am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev

* commit '6dad59e146dc16a2386124a5cd3b28411c024c4f':
Add view cookies for action bar menus. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:43:18 +0000 (20:43 +0000)]

am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]

* commit '9358cf04dc0db493a8702a4a8051f9839e9de6d7':
Add missing layout params to xlarge action bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:43:16 +0000 (20:43 +0000)]

am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:41:24 +0000 (20:41 +0000)]

am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:40:14 +0000 (13:40 -0700)]

resolved conflicts for merge of b161d6ba to jb-mr1.1-dev

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:38:17 +0000 (20:38 +0000)]

am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]

* commit 'ccf6b34799efb14e5883ed4901ff03bf75ac4c1c':
Add missing layout params to xlarge action bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:38:15 +0000 (20:38 +0000)]

am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:38:12 +0000 (20:38 +0000)]

am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev

* commit '85b751949b3d383494523bb98b016157d76787f3':
Add view cookies for action bar menus. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:36:24 +0000 (20:36 +0000)]

am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev

* commit '8c19c6a17d8a019086a36988937462acfb6b830f':
Action bar rendering in layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:33:33 +0000 (20:33 +0000)]

am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]

* commit 'a154687620a6d53f17c7abc36d419884cd6df2b7':
Add missing layout params to xlarge action bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:33:30 +0000 (20:33 +0000)]

am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:32:59 +0000 (13:32 -0700)]

resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:31:33 +0000 (20:31 +0000)]

am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]

* commit '7ef276450f3157cc68f714b0d5805319e6f4c555':
Add missing layout params to xlarge action bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:30:39 +0000 (20:30 +0000)]

am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev

* commit '16f3a6167bdcbd49e47d843fcb43fe9ffd461531':
Action bar rendering in layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:29:07 +0000 (13:29 -0700)]

resolved conflicts for merge of 9978c036 to jb-mr1.1-dev

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 20:27:46 +0000 (20:27 +0000)]

am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:51:50 +0000 (18:51 +0000)]

am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:51:47 +0000 (18:51 +0000)]

am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:47:30 +0000 (18:47 +0000)]

am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:47:27 +0000 (18:47 +0000)]

am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:43:45 +0000 (11:43 -0700)]

resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:42:00 +0000 (18:42 +0000)]

am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:41:57 +0000 (18:41 +0000)]

am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:36:14 +0000 (18:36 +0000)]

am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:36:12 +0000 (18:36 +0000)]

am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:30:46 +0000 (18:30 +0000)]

am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:21:13 +0000 (18:21 +0000)]

am 0d76fd64: (-s ours) am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:21:10 +0000 (18:21 +0000)]

am 0c11327b: (-s ours) am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]

* commit '0c11327b3c2053cfbc0ee267708df9affa4dbb41':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:21:07 +0000 (18:21 +0000)]

am 8a505e5c: (-s ours) am 74d2a533: am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

* commit '8a505e5c6f8b677addca3bb27602416df95b66da':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:21:04 +0000 (18:21 +0000)]

am 5db08e87: (-s ours) am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]

* commit '5db08e87a1f3e2f7b2bac9dc55c81e84133923c1':
Fix a bug in Nine Patch library. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:21:01 +0000 (18:21 +0000)]

am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:16:12 +0000 (18:16 +0000)]

am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:16:09 +0000 (18:16 +0000)]

am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]

* commit 'd4d66df6054ccd515cf5029bd5bd3b40de340883':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:16:06 +0000 (18:16 +0000)]

am 74d2a533: am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

* commit '74d2a533a4d815e1ef5c709837cc8f8484b715d4':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:16:03 +0000 (18:16 +0000)]

am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]

* commit 'ce68e782e8cdfa8007b88b2461dd6e78bccc6fe9':
Fix a bug in Nine Patch library. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:16:00 +0000 (18:16 +0000)]

am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:14:14 +0000 (18:14 +0000)]

am 81ac665c: (-s ours) am 060836bd: am fed25eb8: am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:14:11 +0000 (18:14 +0000)]

am fd8af673: (-s ours) am 9e614b25: am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:14:09 +0000 (18:14 +0000)]

am be0c94ea: (-s ours) am be2184e4: am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:14:06 +0000 (18:14 +0000)]

am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:11:28 +0000 (18:11 +0000)]

am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:11:25 +0000 (18:11 +0000)]

am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]

* commit '26dd61c55ad515c0d4b14b8f799723a0f9985972':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:11:23 +0000 (18:11 +0000)]

am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

* commit 'bb7cfa1e1984342d896e664d0c8e2ed654e838cc':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:11:20 +0000 (18:11 +0000)]

am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]

* commit 'e535ff28728ad8edce7587110860963c0e571791':
Fix a bug in Nine Patch library. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:11:17 +0000 (18:11 +0000)]

am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:09:09 +0000 (18:09 +0000)]

am 060836bd: am fed25eb8: am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:09:06 +0000 (18:09 +0000)]

am 9e614b25: am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:09:02 +0000 (18:09 +0000)]

am be2184e4: am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:08:59 +0000 (18:08 +0000)]

am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:05:48 +0000 (18:05 +0000)]

am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:05:46 +0000 (18:05 +0000)]

am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]

* commit '07009057fee65896114a3c83bd762f6b22e1b645':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:05:44 +0000 (18:05 +0000)]

am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

* commit '85c5cdcd587c64a9e80ac51beb134d9547faae54':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:05:41 +0000 (18:05 +0000)]

am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]

* commit '488f624798837cf4fa441dce8675da7e8cb67788':
Fix a bug in Nine Patch library. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:05:39 +0000 (18:05 +0000)]

am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:04:29 +0000 (11:04 -0700)]

resolved conflicts for merge of 727ad350 to jb-mr1.1-dev

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:03:44 +0000 (18:03 +0000)]

am fed25eb8: am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:03:41 +0000 (18:03 +0000)]

am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:03:38 +0000 (18:03 +0000)]

am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:03:36 +0000 (18:03 +0000)]

am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:02:38 +0000 (18:02 +0000)]

am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:02:35 +0000 (18:02 +0000)]

am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]

* commit 'effef17297dffc05511597ccc0f437deb278647f':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:02:32 +0000 (18:02 +0000)]

am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

* commit 'c3a0c9f679cf18a512ca194e14a74dde852af831':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:02:29 +0000 (18:02 +0000)]

am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]

* commit '835cbaa192f324ec14361afc700cc44a6bfa47b7':
Fix a bug in Nine Patch library. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:01:00 +0000 (18:01 +0000)]

am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:58:14 +0000 (17:58 +0000)]

am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

* commit '0ad4f2cedde037c2b09a7f09c5f95f0984267c64':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:57:58 +0000 (17:57 +0000)]

am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:57:56 +0000 (17:57 +0000)]

am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:57:52 +0000 (17:57 +0000)]

am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:57:41 +0000 (17:57 +0000)]

am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:56:55 +0000 (17:56 +0000)]

am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:55:56 +0000 (10:55 -0700)]

resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev

Change-Id: I6d3a92e8d3853069c1d8cb3399d6dfcb5b58da83

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:54:29 +0000 (17:54 +0000)]

am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]

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