Commit Graph

115286 Commits

Author SHA1 Message Date
Deepanshu Gupta
b1cf6a87e4 am a7ed116d: am 5dce0a4b: am a1191b46: am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev
* commit 'a7ed116d0f0b677f0986e0861d4beaf3d360a9d4':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
2014-05-13 18:16:50 +00:00
Deepanshu Gupta
a7ed116d0f am 5dce0a4b: am a1191b46: am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev
* commit '5dce0a4b3d933e5d7174ba487fd180b6165d2923':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
2014-05-13 18:11:14 +00:00
Deepanshu Gupta
5dce0a4b3d am a1191b46: am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev
* commit 'a1191b467d9687cd34e0cec2d4ac827f6020c160':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
2014-05-13 18:05:51 +00:00
Deepanshu Gupta
a1191b467d 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]
2014-05-13 18:01:00 +00:00
Deepanshu Gupta
74503f66e0 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]
2014-05-13 17:56:55 +00:00
Deepanshu Gupta
0c98ce5a08 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]
2014-05-13 17:49:56 +00:00
Deepanshu Gupta
862e64addc am bacf26f4: (-s ours) am 8b53c5b1: am ebcbb283: am 0b2f4a18: (-s ours) 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 'bacf26f44141ae8f861f96e3eb09da8b9e9a657a':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
2014-05-13 17:45:51 +00:00
Deepanshu Gupta
5fc8f945ee am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev
* commit 'b0f2ded5e9e84fb51ec5b2cb6b419b040b008276':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
2014-05-13 17:45:43 +00:00
Deepanshu Gupta
f75f33d33b 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]
2014-05-13 17:44:40 +00:00
Deepanshu Gupta
bacf26f441 am 8b53c5b1: am ebcbb283: am 0b2f4a18: (-s ours) 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 '8b53c5b16b612c35b3d3512e9dc726eceebab308':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
2014-05-13 17:39:17 +00:00
Deepanshu Gupta
b0f2ded5e9 am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev
* commit '40db4a13bc8389dd94cac2fd4c896e10b46c2499':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
2014-05-13 17:39:14 +00:00
Deepanshu Gupta
8b53c5b16b am ebcbb283: am 0b2f4a18: (-s ours) 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 'ebcbb28319bea2674455c978cc8fb85b252863b3':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
2014-05-13 17:35:04 +00:00
Deepanshu Gupta
40db4a13bc am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev
* commit '9ddb073bf72d9ca587ecc626dcc9721dd33447c9':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
2014-05-13 17:35:00 +00:00
Deepanshu Gupta
ebcbb28319 am 0b2f4a18: (-s ours) 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 '0b2f4a18cc1c38d04d2efc7b47762a312d99c987':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
2014-05-13 17:29:22 +00:00
Deepanshu Gupta
9ddb073bf7 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]
2014-05-13 17:29:13 +00:00
Deepanshu Gupta
0b2f4a18cc 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]
2014-05-13 17:24:13 +00:00
Deepanshu Gupta
c70ce72a98 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]
2014-05-13 17:24:10 +00:00
Deepanshu Gupta
dd8ebf1e15 resolved conflicts for merge of 520f585b to jb-mr1.1-dev
Change-Id: I3982d8cd6585e6d4a3a9cf5b1d78f01f0e4ced6b
2014-05-13 10:23:22 -07:00
Deepanshu Gupta
20bec39e3f 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]
2014-05-13 17:18:58 +00:00
Deepanshu Gupta
af9fde9680 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]
2014-05-13 17:18:55 +00:00
Deepanshu Gupta
f1517cc999 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]
2014-05-13 17:14:10 +00:00
Deepanshu Gupta
425addb944 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]
2014-05-13 17:14:07 +00:00
Deepanshu Gupta
69bae78787 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]
2014-05-13 17:12:27 +00:00
Deepanshu Gupta
3271adea10 am 6b0c4276: am dff29f73: am 5974d229: am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
* commit '6b0c427670606abf5539789299042dc04c67703e':
  Fix layoutlib [DO NOT MERGE]
2014-05-13 17:02:20 +00:00
Deepanshu Gupta
6b0c427670 am dff29f73: am 5974d229: am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
* commit 'dff29f73612799506739c8ef83e1313461f37a4b':
  Fix layoutlib [DO NOT MERGE]
2014-05-13 16:57:08 +00:00
Deepanshu Gupta
dff29f7361 am 5974d229: am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
* commit '5974d229f9af39df149c8b0c4081826f9a65ce8c':
  Fix layoutlib [DO NOT MERGE]
2014-05-13 16:51:51 +00:00
Deepanshu Gupta
a43aaf00b5 resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev
Change-Id: I4ab1b0a71b99692458efc3a67c8a8da3690afb7b
2014-05-13 09:49:18 -07:00
Deepanshu Gupta
5974d229f9 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]
2014-05-13 16:46:48 +00:00
Deepanshu Gupta
0cbfde12fd am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
* commit '40b54563743c3bab92ee7086f8a2b159ecef5453':
  Fix layoutlib [DO NOT MERGE]
2014-05-13 16:41:50 +00:00
Deepanshu Gupta
40b5456374 am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
* commit '07f8da65e231142e6915d9aa7853dd4d772112a0':
  Fix layoutlib [DO NOT MERGE]
2014-05-13 16:36:38 +00:00
Deepanshu Gupta
520f585bc6 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]
2014-05-13 16:36:25 +00:00
Deepanshu Gupta
2c167d0f6a 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]
2014-05-13 16:36:22 +00:00
Deepanshu Gupta
2cbe100a9b 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]
2014-05-13 16:31:23 +00:00
Deepanshu Gupta
632c9e2dab 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]
2014-05-13 16:31:20 +00:00
Deepanshu Gupta
9c00e6739c am 2fb139e0: resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev
* commit '2fb139e02c1e9d2d7c92acf813445a063e73d94f':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
2014-05-13 16:31:05 +00:00
Deepanshu Gupta
07f8da65e2 am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
* commit '888461c801b531f31b2ef34617d333d781d93010':
  Fix layoutlib [DO NOT MERGE]
2014-05-13 16:31:02 +00:00
Deepanshu Gupta
663a1c7484 am 9e0593fb: (-s ours) am 513bf25d: am 5b42e1ae: 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 '9e0593fbb57339143779f760fff6314bdf9c839b':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
2014-05-13 02:41:18 +00:00
Deepanshu Gupta
83d33e0603 am ffb18143: (-s ours) am 0d90b43b: am cb240066: 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 'ffb181431cdfe389911cf02de76badde05e46112':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
2014-05-13 02:41:14 +00:00
Deepanshu Gupta
9e0593fbb5 am 513bf25d: am 5b42e1ae: 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 '513bf25d7a794b850f5d791269db55b7744ee618':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
2014-05-13 02:37:20 +00:00
Deepanshu Gupta
ffb181431c am 0d90b43b: am cb240066: 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 '0d90b43b58bca53a096d646ed555c4ecb40d40d2':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
2014-05-13 02:37:17 +00:00
Deepanshu Gupta
513bf25d7a am 5b42e1ae: 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 '5b42e1ae5576f95d9d561a15674e392657f64120':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
2014-05-13 02:31:40 +00:00
Deepanshu Gupta
0d90b43b58 am cb240066: 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 'cb2400661a6019cfc6f2fef75d92767f6d7547b6':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
2014-05-13 02:31:38 +00:00
Deepanshu Gupta
5b42e1ae55 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]
2014-05-13 02:27:24 +00:00
Deepanshu Gupta
cb2400661a 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]
2014-05-13 02:27:21 +00:00
Deepanshu Gupta
b5b4d6eb79 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]
2014-05-13 02:21:57 +00:00
Deepanshu Gupta
977ede48a2 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]
2014-05-13 02:21:54 +00:00
Deepanshu Gupta
83b43dc0c9 am a8499a16: (-s ours) am e4ea6a30: am 1d5b9018: am 018da2e9: (-s ours) am 1ba310ca: am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit 'a8499a1648d47f1b49df6c0a01681c085f9372e2':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
2014-05-13 02:19:50 +00:00
Deepanshu Gupta
59889153ba am 7aaa59f0: (-s ours) am 74ae54e7: am 1d46a343: am 06a87027: (-s ours) am 995c4d51: am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '7aaa59f00ed277fdea2fed7ea23a8d24ee219cd2':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
2014-05-13 02:19:48 +00:00
Deepanshu Gupta
b0d4ca6916 am d5260dcc: (-s ours) am d1f26941: am e69715b4: am 70b2be8e: (-s ours) am 59a0f746: am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit 'd5260dcc67a862bf7936ababe01e27383ea91e31':
  Fix class name for OverflowMenuButton [DO NOT MERGE]
2014-05-13 02:19:45 +00:00
Deepanshu Gupta
cabb028c3f am cbf9d672: (-s ours) am 467305a4: am 70875517: am 0fef2d24: (-s ours) am a51ac1bd: am 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE]
* commit 'cbf9d672c687d8754823737245e2851516aab783':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
2014-05-13 02:19:42 +00:00