Commit Graph

107492 Commits

Author SHA1 Message Date
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
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
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
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
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
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
a7c0d02ad6 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]
2014-05-13 02:16:50 +00:00
Deepanshu Gupta
51ce58a7bb 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]
2014-05-13 02:16:48 +00:00
Deepanshu Gupta
888461c801 resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
Change-Id: I16a4ce0863576cca07b1753f0ad56d6e97015c78
2014-05-12 19:16:26 -07:00
Deepanshu Gupta
a8499a1648 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 'e4ea6a3067bfb99e90c59874dc7b5a8dede8742d':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
2014-05-13 02:14:50 +00:00
Deepanshu Gupta
7aaa59f00e am 74ae54e7: am 1d46a343: am 06a87027: (-s ours) am 995c4d51: am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '74ae54e7dc485a82edb1b4876bc1ceaa60a0f34e':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
2014-05-13 02:14:48 +00:00
Deepanshu Gupta
d5260dcc67 am d1f26941: am e69715b4: am 70b2be8e: (-s ours) am 59a0f746: am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit 'd1f269417ef7c85ca1b541675216700cdd36ba05':
  Fix class name for OverflowMenuButton [DO NOT MERGE]
2014-05-13 02:14:45 +00:00
Deepanshu Gupta
cbf9d672c6 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 '467305a4789023f903f55d931e8be91110aea92a':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
2014-05-13 02:14:42 +00:00
Deepanshu Gupta
51b8ae6d46 am de46e750: am d7f71e40: am c7a27371: (-s ours) am 09a42524: am 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE]
* commit 'de46e750511581fe4fd06dc1b6ef26e5fbe922f5':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
2014-05-13 02:14:38 +00:00
Deepanshu Gupta
40ef74dd1c am 512fd4c2: am 290b96f3: am 6f6989f3: (-s ours) am 80f2914b: am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '512fd4c2e4244b63a97b25e147525e42b590325f':
  Add view cookies for action bar menus. [DO NOT MERGE]
2014-05-13 02:14:35 +00:00
Deepanshu Gupta
4130946e38 am 321a3fbd: am 3dc756a4: am 6c600df6: (-s ours) am e686fbce: am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '321a3fbd5aec55b6c2792daebe37efbdfd789c0f':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
2014-05-13 02:14:32 +00:00
Deepanshu Gupta
99615109e7 am 839506fa: am 4a6ae03d: am e7c3ed44: (-s ours) am 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '839506fa6dd5775c43984487af462a23360c1a4c':
  Action bar rendering in layoutlib [DO NOT MERGE]
2014-05-13 02:14:29 +00:00
Deepanshu Gupta
36f8cb3e08 am c1172273: am 2f7d5d7c: am c88d4c57: (-s ours) am b172b780: am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]
* commit 'c117227346597a4911cac13359b3f3263d8f1916':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
2014-05-13 02:14:27 +00:00
Deepanshu Gupta
62d9390d26 am c61e53e7: am bdb583df: am 57c0cf45: (-s ours) am 71acfa6c: am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit 'c61e53e7e20a097342f461c1848f8a7c15898f44':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 02:14:24 +00:00
Deepanshu Gupta
c8ab510903 am fd119e4b: am ef15cd61: am 3195ff0a: (-s ours) am b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]
* commit 'fd119e4b7ce1c0dfbfce2a7694401c25cf4825ff':
  Remove references to non-std Java classes. [DO NOT MERGE]
2014-05-13 02:14:21 +00:00
Deepanshu Gupta
089b0d25f9 am 6c5f7556: am 4d23ae43: am 4654bfc1: (-s ours) am c2a6f3b1: am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '6c5f7556342f2462bdd1051f5524f0a1b7938bfe':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 02:14:18 +00:00
Deepanshu Gupta
8ef9e2f57e am 14569ecf: am e20ebd5a: am 863b49cc: (-s ours) am 9b89fcc0: am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '14569ecf72e1d77335ac6f90c65c794dab4df3a0':
  Layoutlib tests now check methods return value [DO NOT MERGE]
2014-05-13 02:14:15 +00:00
Deepanshu Gupta
0e50f1c2ca 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]
2014-05-13 02:12:15 +00:00
Deepanshu Gupta
37f43311e1 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]
2014-05-13 02:12:12 +00:00
Deepanshu Gupta
e4ea6a3067 am 1d5b9018: am 018da2e9: (-s ours) am 1ba310ca: am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '1d5b9018b208ad39fd3e00ae9d74d331e63e06a3':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
2014-05-13 02:09:55 +00:00