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

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

am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:24:10 +0000 (17:24 +0000)]

am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

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

commit | commitdiff | tree

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

am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

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

commit | commitdiff | tree

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

am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

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

commit | commitdiff | tree

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

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

Change-Id: I4ab1b0a71b99692458efc3a67c8a8da3690afb7b

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:46:48 +0000 (16:46 +0000)]

am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev

* commit '0cbfde12fde85713f87d8c5ac0cc137c143dfd27':
Fix layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:41:50 +0000 (16:41 +0000)]

am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev

* commit '40b54563743c3bab92ee7086f8a2b159ecef5453':
Fix layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:38 +0000 (16:36 +0000)]

am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev

* commit '07f8da65e231142e6915d9aa7853dd4d772112a0':
Fix layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:05 +0000 (16:31 +0000)]

am 2fb139e0: resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:02 +0000 (16:31 +0000)]

am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev

* commit '888461c801b531f31b2ef34617d333d781d93010':
Fix layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:27:24 +0000 (02:27 +0000)]

am b5b4d6eb: (-s ours) am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 977ede48: (-s ours) am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

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

commit | commitdiff | tree

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

am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:16:50 +0000 (02:16 +0000)]

am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:16:48 +0000 (02:16 +0000)]

am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:16:26 +0000 (19:16 -0700)]

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

Change-Id: I16a4ce0863576cca07b1753f0ad56d6e97015c78

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:12:15 +0000 (02:12 +0000)]

am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:07:25 +0000 (02:07 +0000)]

am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:58 +0000 (02:04 +0000)]

am 018da2e9: (-s ours) am 1ba310ca: am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:55 +0000 (02:04 +0000)]

am 06a87027: (-s ours) am 995c4d51: am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:52 +0000 (02:04 +0000)]

am 70b2be8e: (-s ours) am 59a0f746: am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]

* commit '70b2be8e0d9aecd1215210b9e253680192e486bc':
Fix class name for OverflowMenuButton [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:49 +0000 (02:04 +0000)]

am 0fef2d24: (-s ours) am a51ac1bd: am 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:46 +0000 (02:04 +0000)]

am c7a27371: (-s ours) am 09a42524: am 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:43 +0000 (02:04 +0000)]

am 6f6989f3: (-s ours) am 80f2914b: am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:41 +0000 (02:04 +0000)]

am 6c600df6: (-s ours) am e686fbce: am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

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

am e7c3ed44: (-s ours) am 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

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

am c88d4c57: (-s ours) am b172b780: am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:31 +0000 (02:04 +0000)]

am 57c0cf45: (-s ours) am 71acfa6c: am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 3195ff0a: (-s ours) am b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:25 +0000 (02:04 +0000)]

am 4654bfc1: (-s ours) am c2a6f3b1: am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:22 +0000 (02:04 +0000)]

am 863b49cc: (-s ours) am 9b89fcc0: am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]

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

commit | commitdiff | tree

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

am f20c9c66: am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:01:41 +0000 (19:01 -0700)]

resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev

Change-Id: Id8cb5e2e9d0c41bdaf767563ebd6e3951ae68a3c

commit | commitdiff | tree

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

am 1ba310ca: am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 995c4d51: am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 59a0f746: am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]

* commit '59a0f746eb9de9086048419a5aec3dedc7ec9d94':
Fix class name for OverflowMenuButton [DO NOT MERGE]

commit | commitdiff | tree

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

am a51ac1bd: am 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 09a42524: am 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 80f2914b: am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]

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

commit | commitdiff | tree

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

am e686fbce: am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

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

am b172b780: am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 71acfa6c: am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

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

am b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:59:58 +0000 (01:59 +0000)]

am c2a6f3b1: am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 9b89fcc0: am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:57:25 +0000 (01:57 +0000)]

am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE]

* commit '06c4f23d737082717f37f5f3583d9c12f4b64bf2':
Fix layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:57:22 +0000 (01:57 +0000)]

am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

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

commit | commitdiff | tree

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

am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

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

commit | commitdiff | tree

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

am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:55:07 +0000 (01:55 +0000)]

am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:55:04 +0000 (01:55 +0000)]

am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]

* commit '51dd8878cb401128d730aecf9fe18c1e06221ac4':
Fix class name for OverflowMenuButton [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:55:02 +0000 (01:55 +0000)]

am 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE]

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

commit | commitdiff | tree

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

am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

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

am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

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

am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

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

commit | commitdiff | tree

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

am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:52:25 +0000 (01:52 +0000)]

am 2d82586b: Fix CalendarView to show the right labels. [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 64dc0380: Fix layoutlib [DO NOT MERGE]

* commit '64dc0380127047ffcf135b6848c9150aa8dbed85':
Fix layoutlib [DO NOT MERGE]

commit | commitdiff | tree

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

am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:52:15 +0000 (01:52 +0000)]

am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:57 +0000 (01:49 +0000)]

am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:55 +0000 (01:49 +0000)]

am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]

* commit '60b52ee929c8765c2d99f1b1e35d326e03895ba0':
Fix class name for OverflowMenuButton [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:52 +0000 (01:49 +0000)]

am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:50 +0000 (01:49 +0000)]

am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:42 +0000 (01:49 +0000)]

am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:39 +0000 (01:49 +0000)]

am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:37 +0000 (01:49 +0000)]

am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:34 +0000 (01:49 +0000)]

am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:31 +0000 (01:49 +0000)]

am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:49:28 +0000 (01:49 +0000)]

am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

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

commit | commitdiff | tree

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

am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]

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

commit | commitdiff | tree

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 44bcd64e5b9fd211dd56b0598693a0559f65dc1a)

commit | commitdiff | tree

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 87be67f91719234cbd381ff0242b5efc8b6aa257)

commit | commitdiff | tree

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 7b5d54f05be61a7ab40021644a91c466e2897627)

commit | commitdiff | tree

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 d4875e19f5b7c69226783b0a6590831466159f84)

commit | commitdiff | tree

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
(cherry picked from commit 465cb53ba4b4a5edff9e9a63eb97d396b94d6568)

commit | commitdiff | tree

Deepanshu Gupta [Thu, 1 May 2014 23:18:34 +0000 (16:18 -0700)]

Support actionProviderClass attribute for menus [DO NOT MERGE]

The change adds support for view cookies for actionProviderClasses (for
example, ShareActionProvider) in the action bar menus.

This also provides a more robust search for the overflowMenuButton.

Change-Id: I316c8b9a69e2e337b41ba0fe4e61af9fe850f750
(cherry picked from commit 7f56beb8403b597a676faf12643fef585a31007e)

commit | commitdiff | tree

Deepanshu Gupta [Wed, 30 Apr 2014 02:37:01 +0000 (19:37 -0700)]

Fix class name for OverflowMenuButton [DO NOT MERGE]

Change-Id: Ie3e709e7aadb2193397df8befef0c55624d7e4e3
(cherry picked from commit f61bd0020642cf0868486d307f2e68c8c02d6102)

commit | commitdiff | tree

Deepanshu Gupta [Fri, 25 Apr 2014 18:07:19 +0000 (11:07 -0700)]

Add special system view cookie to OverflowButton. [DO NOT MERGE]

Add a special view cookie to enable the IDE to identify the overflow
menu button in the Action Bar.

Change-Id: Ida3ed776afb8c9fa8af23b73d4cf6d47eef0ab87
(cherry picked from commit d558ebdb433af498a87e25673f7dd828a0e7439a)

commit | commitdiff | tree

Deepanshu Gupta [Wed, 23 Apr 2014 00:22:32 +0000 (17:22 -0700)]

Fix style warnings in RenderSessionImpl [DO NOT MERGE]

Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c
(cherry-picked from commit a98121ef5251b5ebdb8c1b0b6780d570844284b2)

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Apr 2014 19:32:38 +0000 (12:32 -0700)]

Add view cookies for action bar menus. [DO NOT MERGE]

The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.

The change also contains a bugfix where a method wasn't renamed
properly.

Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(cherry-picked from commit 7704837947455909f295b088a3d15a20e107dbd7)

commit | commitdiff | tree

Deepanshu Gupta [Thu, 1 May 2014 23:18:34 +0000 (16:18 -0700)]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 30 Apr 2014 02:37:01 +0000 (19:37 -0700)]

Fix class name for OverflowMenuButton [DO NOT MERGE]

Change-Id: Ie3e709e7aadb2193397df8befef0c55624d7e4e3
(cherry picked from commit 4b5fa4d318e7efaffdc678e0cb8953ffc78c2b1e)

commit | commitdiff | tree

Deepanshu Gupta [Fri, 25 Apr 2014 18:07:19 +0000 (11:07 -0700)]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 23 Apr 2014 00:22:32 +0000 (17:22 -0700)]

Fix style warnings in RenderSessionImpl [DO NOT MERGE]

Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c
(cherry-picked from commit fbfeb1a90b6f8f3966c60a69d50ce8f608d9d861)

commit | commitdiff | tree

Deepanshu Gupta [Fri, 18 Apr 2014 19:32:38 +0000 (12:32 -0700)]

commit | commitdiff | tree

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)