OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to...
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]

10 years agoam f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 17:49:56 +0000 (17:49 +0000)]
am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev

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

10 years agoam dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 17:44:40 +0000 (17:44 +0000)]
am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev

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

10 years agoam 20bec39e: am f1517cc9: am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am...
Deepanshu Gupta [Tue, 13 May 2014 17:24:13 +0000 (17:24 +0000)]
am 20bec39e: am f1517cc9: am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

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

10 years agoam af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to...
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]

10 years agoresolved conflicts for merge of 520f585b to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 17:23:22 +0000 (10:23 -0700)]
resolved conflicts for merge of 520f585b to jb-mr1.1-dev

Change-Id: I3982d8cd6585e6d4a3a9cf5b1d78f01f0e4ced6b

10 years agoam f1517cc9: am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutl...
Deepanshu Gupta [Tue, 13 May 2014 17:18:58 +0000 (17:18 +0000)]
am f1517cc9: am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

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

10 years agoam 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev
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]

10 years agoam 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update...
Deepanshu Gupta [Tue, 13 May 2014 17:14:10 +0000 (17:14 +0000)]
am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

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

10 years agoam a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev
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]

10 years agoam 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon...
Deepanshu Gupta [Tue, 13 May 2014 17:12:27 +0000 (17:12 +0000)]
am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

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

10 years agoresolved conflicts for merge of 9c00e673 to jb-mr1.1-dev
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

10 years agoam 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to...
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]

10 years agoam 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
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]

10 years agoam 2cbe100a: am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutli...
Deepanshu Gupta [Tue, 13 May 2014 16:36:25 +0000 (16:36 +0000)]
am 2cbe100a: am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

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

10 years agoam 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status...
Deepanshu Gupta [Tue, 13 May 2014 16:36:22 +0000 (16:36 +0000)]
am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

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

10 years agoam 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT...
Deepanshu Gupta [Tue, 13 May 2014 16:31:23 +0000 (16:31 +0000)]
am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

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

10 years agoam 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO...
Deepanshu Gupta [Tue, 13 May 2014 16:31:20 +0000 (16:31 +0000)]
am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

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

10 years agoam 2fb139e0: resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev
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]

10 years agoam 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
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]

10 years agoam a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am...
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]

10 years agoam 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am...
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]

10 years agoam 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix...
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]

10 years agoam 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add...
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]

10 years agoresolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
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

10 years agoam 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastExcepti...
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]

10 years agoam 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation...
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]

10 years agoam 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rende...
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]

10 years agoam 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration...
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]

10 years agoam f20c9c66: am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE]
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]

10 years agoam 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView...
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]

10 years agoam 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib...
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]

10 years agoresolved conflicts for merge of 9f2f5e77 to jb-mr1-dev
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

10 years agoam 1ba310ca: am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit...
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]

10 years agoam 995c4d51: am b7bafba7: am 099f40a9: Support actionProviderClass attribute for...
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]

10 years agoam 59a0f746: am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO...
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]

10 years agoam a51ac1bd: am 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButt...
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]

10 years agoam 09a42524: am 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO...
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]

10 years agoam 80f2914b: am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO...
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]

10 years agoam e686fbce: am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutli...
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]

10 years agoam 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT...
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]

10 years agoam b172b780: am f3264738: am cc5340bc: Add missing dependency in layoutlib build...
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]

10 years agoam 71acfa6c: am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO...
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]

10 years agoam b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes...
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]

10 years agoam c2a6f3b1: am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO...
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]

10 years agoam 9b89fcc0: am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value...
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]

10 years agoam 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE]
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]

10 years agoam cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT...
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]

10 years agoam edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT...
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]

10 years agoam efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT...
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]

10 years agoam b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT...
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]

10 years agoam 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]
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]

10 years agoam 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT...
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]

10 years agoam 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE]
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]

10 years agoam b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]
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]

10 years agoam 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT...
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]

10 years agoam 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]
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]

10 years agoam f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT...
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]

10 years agoam 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
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]

10 years agoam de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]
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]

10 years agoam 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
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]

10 years agoam ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT...
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]

10 years agoam 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:52:32 +0000 (01:52 +0000)]
am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

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

10 years agoam 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:52:28 +0000 (01:52 +0000)]
am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

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

10 years agoam 2d82586b: Fix CalendarView to show the right labels. [DO NOT MERGE]
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]

10 years agoam 64dc0380: Fix layoutlib [DO NOT MERGE]
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]

10 years agoam a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]
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]

10 years agoam 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]
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]

10 years agoam 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
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]

10 years agoam 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]
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]

10 years agoam 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]
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]

10 years agoam 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE]
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]

10 years agoam 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE]
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]

10 years agoam 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]
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]

10 years agoam 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
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]

10 years agoam fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]
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]

10 years agoam cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]
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]

10 years agoam 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
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]

10 years agoam 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]
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]

10 years agoam 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
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]

10 years agoam 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]
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]

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 6335590aa8997944cc7fb358a315dbb9b789f87f)

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 11ee746dc5e77f4f33aac45ac9e344444223012d)

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

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

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

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

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

10 years agoSupport actionProviderClass attribute for menus [DO NOT MERGE]
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)

10 years agoFix class name for OverflowMenuButton [DO NOT MERGE]
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)

10 years agoAdd special system view cookie to OverflowButton. [DO NOT MERGE]
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)

10 years agoFix style warnings in RenderSessionImpl [DO NOT MERGE]
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)

10 years agoAdd view cookies for action bar menus. [DO NOT MERGE]
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)

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)

10 years agoAction bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Thu, 12 Dec 2013 20:16:24 +0000 (12:16 -0800)]
Action bar rendering in layoutlib [DO NOT MERGE]

This also makes a couple of changes to the framework:
1. ShareActionProvider - Use edit mode to execute activity chooser code.
2. ActionBarImpl - add a new constructor for use by layoutlib.

This also relies on some changes to the plugin to pass the correct params.

Change-Id: Ia30fef816afd91ec1e439734d56b59b1323bfee2
(cherry-picked from 20e0695b554e883b095f5223be10b6e1097db49f)

10 years agoAdd missing dependency in layoutlib build file [DO NOT MERGE]
Deepanshu Gupta [Mon, 31 Mar 2014 23:11:13 +0000 (16:11 -0700)]
Add missing dependency in layoutlib build file [DO NOT MERGE]

Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
(cherry-picked from commit b85d30a2c88b6a23e251347b14a75456c4daeca9)

10 years agoFix theme/style resolution in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 12 Mar 2014 01:02:44 +0000 (18:02 -0700)]
Fix theme/style resolution in Layoutlib [DO NOT MERGE]

Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit 3c00b28bf60ab01b449e16df045238f4bae4d700)

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]

This change adds a substitute for the Charsets class in java namespace.
The original cherry pick of the change had dropped this substitute. But
the substitute is required for bug b.android.com/59732

The original cherry-pick is 6335590aa8997944cc7fb358a315dbb9b789f87f and
the original change is 81f74f4bc96ea4266cebe1b785d095558f540800
The original Change-Id is Iac5b272652e2780c9bb72d19f415d150948ca589

Change-Id: I76c87c74ee088778b37d1a7a7d531e0fde5c758f

10 years agoFix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Tue, 1 Apr 2014 01:59:45 +0000 (18:59 -0700)]
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

The bug caused some classes to be missed when computing the dependencies
of the existing classes.

Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
(cherry-picked from 6f9baea47757fef4745de434e09bd552fddc1f03)

10 years agoLayoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 02:30:35 +0000 (19:30 -0700)]
Layoutlib tests now check methods return value [DO NOT MERGE]

The change is a cherry-pick from klp-dev.

The change also fixes the errors found by fixing the tests.

Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
(cherry-picked from commit 89fdc0c556cf0fe2562fb8f0476e03cd51045164)