207 Commits

Author SHA1 Message Date
Deepanshu Gupta
8a4f39351f am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '48bf7b49bb361a4084e5fb4c6d0ae497a606c700':
  Add methods for Time_Delegate [DO NOT MERGE]
2014-05-13 16:36:36 +00:00
Deepanshu Gupta
5f61e9b4ef am ed98abec: am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp
* commit 'ed98abecad359ab1765ac1f698c8ba06dbd00745':
  Remove references to non-std Java classes. [DO NOT MERGE]
2014-05-13 16:36:28 +00:00
Deepanshu Gupta
9053261a54 am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '052e0c589e5cf714ca71bc8d7b3ce8b3f6c4cb96':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 16:32:02 +00:00
Deepanshu Gupta
5594616c4f am 9602fc1c: am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '9602fc1c00e5e5cdf26cdc3fe22022ffcd115361':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 16:31:59 +00:00
Deepanshu Gupta
48bf7b49bb am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '69b3115e1c02f2b22165b93bd9bcc5c90ec69b12':
  Add methods for Time_Delegate [DO NOT MERGE]
2014-05-13 16:31:38 +00:00
Deepanshu Gupta
ed98abecad am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp
* commit '8a70bcef5a724906e3c35c58cb2266ee9c9e1b78':
  Remove references to non-std Java classes. [DO NOT MERGE]
2014-05-13 16:31:28 +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
1677a9bdeb Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 2014-05-13 02:32:31 +00:00
Deepanshu Gupta
51cce0ec42 resolve conflicts for merge 5a7b3b65 correctly
Change-Id: I832b7ee50002bcd1429bf431cc91f12e60d19f84
2014-05-12 19:31:25 -07:00
Deepanshu Gupta
0df5ae65a9 am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '0f209967bfc4a6f1eec46cc34a39cfe8af9f8af9':
  Add view cookies for action bar menus. [DO NOT MERGE]
2014-05-13 02:20:42 +00:00
Deepanshu Gupta
6d3c4ab245 am 43b15371: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '43b15371f9f1da7d97fe0500eb1536d981097e31':
  Action bar rendering in layoutlib [DO NOT MERGE]
2014-05-13 02:20:23 +00:00
Deepanshu Gupta
052e0c589e am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '770e40f839f059e1e3a15a2b14157c7cbb3b0553':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 02:20:20 +00:00
Deepanshu Gupta
9602fc1c00 am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '87665388466812897e888680c0b2a1d7db1b9cbd':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 02:20:16 +00:00
Deepanshu Gupta
69b3115e1c am e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit 'e183855c1eb7baf750c67bb20e70fb887eba7af6':
  Add methods for Time_Delegate [DO NOT MERGE]
2014-05-13 02:19:52 +00:00
Deepanshu Gupta
2fb139e02c resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev
Change-Id: Id8cb5e2e9d0c41bdaf767563ebd6e3951ae68a3c
2014-05-12 19:01:41 -07:00
Deepanshu Gupta
6f6989f353 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]
2014-05-13 02:00:17 +00:00
Deepanshu Gupta
e7c3ed4427 am 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '21404483adbd4f26b5a2c7ebee7c09e83f42607e':
  Action bar rendering in layoutlib [DO NOT MERGE]
2014-05-13 02:00:11 +00:00
Deepanshu Gupta
57c0cf454a 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]
2014-05-13 02:00:06 +00:00
Deepanshu Gupta
3195ff0afa 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]
2014-05-13 02:00:03 +00:00
Deepanshu Gupta
4654bfc14c am c2a6f3b1: am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit 'c2a6f3b1eda89365eec2508aec4a3a5024c140e5':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 01:59:58 +00:00
Deepanshu Gupta
8a70bcef5a resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp
Change-Id: I6bafdb9c6a8dfc6f55a4d9adf67f447661137eb8
2014-05-12 18:57:34 -07:00
Deepanshu Gupta
9f2f5e776a am 2d82586b: Fix CalendarView to show the right labels. [DO NOT MERGE]
* commit '2d82586b96593b1b3b5280d77d5ae9a09df9d1fd':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
2014-05-13 01:52:25 +00:00
Deepanshu Gupta
0f209967bf 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 094fd8ecb6f4b666be6c9e7332679bce28fdc3ca)
2014-05-07 18:09:46 -07:00
Deepanshu Gupta
43b15371f9 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 fe38489f6734fefd0a216e9cfe12f8f978ff371f)
2014-05-06 14:02:48 -07:00
Deepanshu Gupta
770e40f839 Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit 76dccb7f436565136ff5e15b1ca57530940f5642)
2014-05-06 14:02:47 -07:00
Deepanshu Gupta
8766538846 Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
The bug caused some classes to be missed when computing the dependencies
of the existing classes.

This change includes the new mock_android.jar compiled from the mock
sources again.

Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
(cherry-picked from 6136af326e64037184a7a2a3ae60c399f04d631f)
2014-05-06 14:02:47 -07:00
Deepanshu Gupta
e183855c1e Add methods for Time_Delegate [DO NOT MERGE]
Bug: http://b.android.com/65359
Change-Id: I7c2d09286d6bcd9899444aaa5a4a5a342e39d923
(cherry-picked from 02cde9ceeb4c052ee273a5d809816dfd355ebb56)
2014-05-06 14:02:45 -07:00
Deepanshu Gupta
5a7b3b65b6 Remove references to non-std Java classes. [DO NOT MERGE]
Do not add the non-standard Java classes. Updates the references to all
non-standard classes to new classes in
com.android.tools.layoulib.create package. This also treats
java.lang.AutoCloseable which is part of Java 7 similarly so that we can
still run on Java 6.

This also adapts the cherrypick for this branch by updating references
to the non-standard Java classes present in this branch. This also
includes the following change that includes some changes that the
original cherrypick missed.
Change-Id: I76c87c74ee088778b37d1a7a7d531e0fde5c758f
commit: 1ed75bde09275c9f2bd1f81830e381ea864ac7f5

Change-Id: Iac5b272652e2780c9bb72d19f415d150948ca589
(cherry picked from 80c668f2a076e91d887dbf77776cd503ff88b0b4)
2014-05-06 13:55:56 -07:00
Deepanshu Gupta
2d82586b96 Fix CalendarView to show the right labels. [DO NOT MERGE]
Change-Id: I95431f1054678d4192bd1621c1f69b29268f55e9
(cherry picked from commit 44bcd64e5b9fd211dd56b0598693a0559f65dc1a)
2014-05-05 18:32:04 -07:00
Deepanshu Gupta
094fd8ecb6 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)
2014-05-04 13:29:14 -07:00
Deepanshu Gupta
7704837947 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 5ba2f230faa355eb9bc1e90f6c48eeeb437f390c)
2014-05-02 17:33:05 -07:00
Deepanshu Gupta
fe38489f67 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)
2014-05-02 16:23:14 -07:00
Deepanshu Gupta
76dccb7f43 Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit 3c00b28bf60ab01b449e16df045238f4bae4d700)
2014-05-02 16:23:13 -07:00
Deepanshu Gupta
1ed75bde09 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
2014-05-02 16:22:14 -07:00
Deepanshu Gupta
6136af326e 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)
2014-05-02 15:38:42 -07:00
Deepanshu Gupta
495c14d8b8 am 47ad22ed: am 961e3281: am 6df2860b: Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
* commit '47ad22edb7df502356598d417adbce0b0ce35616':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
2014-05-02 19:31:59 +00:00
Deepanshu Gupta
73f9e4675c am edd67cb1: am 7c02c6e2: am 02cde9ce: Add methods for Time_Delegate [DO NOT MERGE]
* commit 'edd67cb194b54bb7c6c25eb570d28614900446cf':
  Add methods for Time_Delegate [DO NOT MERGE]
2014-05-02 19:31:39 +00:00
Deepanshu Gupta
95fd97aa82 am 84e7a6b8: am 443372dd: am 9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
* commit '84e7a6b82303b52c7b44f1a2a295177361edf9ea':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
2014-05-02 19:31:36 +00:00
Deepanshu Gupta
aab9d9a75c am 1a434aa8: am 697c511d: am 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]
* commit '1a434aa8fcc118df13bea58e112da081d47ae73b':
  Remove references to non-std Java classes. [DO NOT MERGE]
2014-05-02 19:31:11 +00:00
Deepanshu Gupta
2bb672a208 am 582bb0dc: am fbb1561a: am 44bcd64e: Fix CalendarView to show the right labels. [DO NOT MERGE]
* commit '582bb0dc7498997f441c5209b1558a4640b5a107':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
2014-05-02 19:19:55 +00:00
Deepanshu Gupta
6df2860b23 Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Change-Id: I8102da6c1c4625e887293a8823770d199521c53f
(cherry-picked from 8a16f8e29a67c383e065ba9c47d5d1e80d7d2db9)
2014-05-02 12:03:46 -07:00
Deepanshu Gupta
02cde9ceeb Add methods for Time_Delegate [DO NOT MERGE]
Bug: http://b.android.com/65359
Change-Id: I7c2d09286d6bcd9899444aaa5a4a5a342e39d923
(cherry-picked from ddb7f3273c3c00e6520794dcaabdaad20fd98e26)
2014-05-02 11:46:40 -07:00
Deepanshu Gupta
9d7b516557 Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Issue: http://b.android.com/59497
Change-Id: Ief11e602703b6041db66241f1699cc1de72e65a5
(cherry picked from commit 317f304893c58c5e50255bd712448ca233ae5cec)
2014-05-02 11:46:40 -07:00
Deepanshu Gupta
80c668f2a0 Remove references to non-std Java classes. [DO NOT MERGE]
Do not add the non-standard Java classes. Updates the references to all
non-standard classes to new classes in
com.android.tools.layoulib.create package. This also treats
java.lang.AutoCloseable which is part of Java 7 similarly so that we can
still run on Java 6.

This also adapts the cherrypick for this branch by updating references
to the non-standard Java classes present in this branch.

Change-Id: Iac5b272652e2780c9bb72d19f415d150948ca589
(cherry picked from 0b7d80765c21dbd9294a0245f92a655fdd61514e)
2014-05-02 11:46:39 -07:00
Deepanshu Gupta
44bcd64e5b Fix CalendarView to show the right labels. [DO NOT MERGE]
Change-Id: I95431f1054678d4192bd1621c1f69b29268f55e9
(cherry picked from commit 083e3caf66c21f7cc9511db479726c38d90e2d2f)
2014-05-02 11:46:37 -07:00
Deepanshu Gupta
20e0695b55 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 4ccc4bd54f85d86818f61d728c6361d2003ddd8e)
2014-04-25 19:22:14 -07:00
Deepanshu Gupta
3c00b28bf6 Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Cherry picked from klp-dev from
Change-Id: If1e7187645f0b0388f7b97d742395efd228b347a which was
cherrypicked from master with the following

Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit f1e7187645f0b0388f7b97d742395efd228b347a)
2014-04-25 18:58:15 -07:00
Deepanshu Gupta
f8144032d1 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)
2014-04-25 18:53:38 -07:00
Deepanshu Gupta
d4f0073f48 Remove references to java package class Objects. [DO NOT MERGE]
Remove references to Java 7 class java.util.Objects and replace it with
a new class that can be loaded on Java 6.

Change-Id: Ibbd9b20b8bc89e247f1d0c48d743d06d1a4f0704
(cherry-picked from commit 45f5cd49fa898a59484edfd8e291dbe10df82db2)
2014-04-25 18:49:40 -07:00
Deepanshu Gupta
6aaea1bd4a Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev 2014-04-24 01:21:46 +00:00