drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,943 Commits 1 Branch 0 Tags
Commit Graph

89943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
5e8b02dbaf 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]
 2014-05-13 02:07:28 +00:00
Deepanshu Gupta
9887703df2 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]
 2014-05-13 02:07:25 +00:00
Deepanshu Gupta
1103ece28c am f20c9c66: am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE] 
* commit 'f20c9c660edcce0fe90ba5f8464f726dcd51229e':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 02:02:56 +00:00
Deepanshu Gupta
42556c394b am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit '3990ec3490cc43a2690163f2a973b5ac6c4bdc46':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 02:02:54 +00:00
Deepanshu Gupta
202800b12d 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]
 2014-05-13 02:02:50 +00:00
Deepanshu Gupta
f20c9c660e am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE] 
* commit '06c4f23d737082717f37f5f3583d9c12f4b64bf2':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 01:57:25 +00:00
Deepanshu Gupta
3990ec3490 am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit 'cdb87d8d83e8a76a4cf78d24d5c49ee8548eba1f':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 01:57:22 +00:00
Deepanshu Gupta
4d69ca223b am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit 'edae4e69512a7c9df1076fde70de83e15053a30a':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 01:57:18 +00:00
Deepanshu Gupta
06c4f23d73 am 64dc0380: Fix layoutlib [DO NOT MERGE] 
* commit '64dc0380127047ffcf135b6848c9150aa8dbed85':
  Fix layoutlib [DO NOT MERGE]
 2014-05-13 01:52:21 +00:00
Deepanshu Gupta
cdb87d8d83 am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE] 
* commit 'a59c27dd6674a31c875b0baa86519caec628ca2d':
  Fix ClassCastException when rendering ListView [DO NOT MERGE]
 2014-05-13 01:52:18 +00:00
Deepanshu Gupta
edae4e6951 am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE] 
* commit '8a39c3afb29f2540b05319042e758dd4d5f73a1e':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]
 2014-05-13 01:52:15 +00:00
Deepanshu Gupta
efa5ffc883 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]
 2014-05-13 01:50:00 +00:00
Deepanshu Gupta
b7bafba7c6 am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '099f40a950a14b66005b17657d967ef080569a15':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 01:49:57 +00:00
Deepanshu Gupta
51dd8878cb am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE] 
* commit '60b52ee929c8765c2d99f1b1e35d326e03895ba0':
  Fix class name for OverflowMenuButton [DO NOT MERGE]
 2014-05-13 01:49:55 +00:00
Deepanshu Gupta
503aaa48e4 am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit '7c6f6481f46b8244406790604c5f8b3f712c369f':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 01:49:52 +00:00
Deepanshu Gupta
30db282f2a am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE] 
* commit '22de7c4c3d44e51aef6937e1b39540703ad01f5c':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 01:49:50 +00:00
Deepanshu Gupta
b67b1b450c am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '094fd8ecb6f4b666be6c9e7332679bce28fdc3ca':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 01:49:42 +00:00
Deepanshu Gupta
2c8fea2ad4 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]
 2014-05-13 01:49:39 +00:00
Deepanshu Gupta
0bb06b91e7 am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit 'fe38489f6734fefd0a216e9cfe12f8f978ff371f':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 01:49:37 +00:00
Deepanshu Gupta
f326473865 am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE] 
* commit 'cc5340bc6301f8d9bf2cdb6ad2036964a3d179f5':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-05-13 01:49:34 +00:00
Deepanshu Gupta
49d47a02e8 am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '76dccb7f436565136ff5e15b1ca57530940f5642':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 01:49:31 +00:00
Deepanshu Gupta
de3b2c06ab am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE] 
* commit '1ed75bde09275c9f2bd1f81830e381ea864ac7f5':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 01:49:28 +00:00
Deepanshu Gupta
2f94c1db0d am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
* commit '6136af326e64037184a7a2a3ae60c399f04d631f':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 01:49:25 +00:00
Deepanshu Gupta
ef9596a1ea am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '2bd65db15fa6a265ccc4023161611088bc791b4e':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 01:49:21 +00:00
Deepanshu Gupta
64dc038012 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)
 2014-05-05 18:23:15 -07:00
Deepanshu Gupta
a59c27dd66 Fix ClassCastException when rendering ListView [DO NOT MERGE] 
Bug: b.android.com/59300
Change-Id: Ia350adb3308daa8170bff755302760790163c811
(cherry picked from commit 7b5d54f05be61a7ab40021644a91c466e2897627)
 2014-05-05 18:21:41 -07:00
Deepanshu Gupta
8a39c3afb2 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)
 2014-05-05 18:17:13 -07:00
Deepanshu Gupta
90ce58ecfd 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)
 2014-05-04 13:31:10 -07:00
Deepanshu Gupta
099f40a950 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)
 2014-05-04 13:30:50 -07:00
Deepanshu Gupta
60b52ee929 Fix class name for OverflowMenuButton [DO NOT MERGE] 
Change-Id: Ie3e709e7aadb2193397df8befef0c55624d7e4e3
(cherry picked from commit f61bd0020642cf0868486d307f2e68c8c02d6102)
 2014-05-04 13:30:33 -07:00
Deepanshu Gupta
7c6f6481f4 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)
 2014-05-04 13:30:11 -07:00
Deepanshu Gupta
22de7c4c3d Fix style warnings in RenderSessionImpl [DO NOT MERGE] 
Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c
(cherry-picked from commit a98121ef5251b5ebdb8c1b0b6780d570844284b2)
 2014-05-04 13:29:51 -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
56759be896 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)
 2014-05-02 16:23:14 -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
cc5340bc63 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)
 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
2bd65db15f 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)
 2014-05-02 14:19:47 -07:00
Deepanshu Gupta
961e328176 am 6df2860b: Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE] 
* commit '6df2860b2316fb42e8686c3154b2156619c7777f':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-05-02 19:24:20 +00:00
Deepanshu Gupta
9e2dadaee0 am bcbeaf83: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit 'bcbeaf83ca75e4a819377938fdf3ec1e07fa30a7':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-02 19:24:17 +00:00
Deepanshu Gupta
cf3f108ee3 am 5be65fda: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '5be65fda15c6f66067da3cc623811427e9d541e4':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-02 19:24:15 +00:00
Deepanshu Gupta
d642de5827 am ec4623d0: Improve text rendering and measurement. [DO NOT MERGE] 
* commit 'ec4623d0d47734c21ee915ea6ec58e60f668bd2f':
  Improve text rendering and measurement. [DO NOT MERGE]
 2014-05-02 19:24:12 +00:00
Deepanshu Gupta
62a4a1f9e0 am 2a82a48f: Fix the measurement of text bounds. [DO NOT MERGE] 
* commit '2a82a48fefb7877f8162133db81788c12eae7582':
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-05-02 19:24:09 +00:00
Deepanshu Gupta
1830a58f54 am 5bb3414d: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit '5bb3414d148f1309dade9333fe9b89c8d1c2f308':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-02 19:24:06 +00:00