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

122855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
32cfe2bbc7 am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 
* commit 'd37afa37452d5e5dab3704ecab0ab7cebb3da292':
  docs: Unbuntu troubleshooting link to CamelCase ID
 2014-10-03 18:00:37 +00:00
Ricardo Cervera
d37afa3745 Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 2014-10-03 17:55:36 +00:00
Ricardo Cervera
43c758b4ce docs: Unbuntu troubleshooting link to CamelCase ID 
Change-Id: I705d17346c470563c350df9bb17d23f3fda5fbc5
 2014-10-03 09:44:25 -07:00
Rich Slogar
46d8d0cdb3 am c470faab: docs:ADT 23.0.4 doc updates 
* commit 'c470faab3ee47b5643ee6b0a97c925c8f0f587fa':
  docs:ADT 23.0.4 doc updates
 2014-10-02 22:47:15 +00:00
Rich Slogar
c470faab3e docs:ADT 23.0.4 doc updates 
Change-Id: Ibf412802e7c98ed3beff6c61394f1b3962254d9a
 2014-10-02 15:31:04 -07:00
Joe Fernandez
d36dbe09a1 am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs 
* commit 'e961d0b521bc25caf964258e75fef3d3ea22e4ac':
  Revert "docs: Update for Android 23.0.4"
 2014-10-02 21:14:59 +00:00
Joe Fernandez
e961d0b521 Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs 2014-10-02 21:08:27 +00:00
Joe Fernandez
65ba319742 Revert "docs: Update for Android 23.0.4" 
This reverts commit f34d0e69033165b7a6e9c73b99f4ef6ac36b3896.

Change-Id: I4d521392733f1b028c72d4623d6d69a4c5910bc4
 2014-10-02 21:07:49 +00:00
Ricardo Cervera
957f45c328 am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '680092c5987e701043ff0fa0d2c5390e829412c0':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:07:53 +00:00
Ricardo Cervera
680092c598 Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 2014-10-02 18:04:42 +00:00
Ricardo Cervera
4ffffb8e8c docs: Provide direct link to Ubuntu troubleshooting. 
Change-Id: I6a9f8c3f3ef01abcfdaf95730139156ba443a4be
 2014-10-02 10:57:39 -07:00
Rich Slogar
b15cd52966 am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'c074c3a4074791ae1270e3177e2299f31b9bb5a1':
  docs: Update for Android 23.0.4
 2014-10-02 17:38:35 +00:00
Rich Slogar
c074c3a407 Merge "docs: Update for Android 23.0.4" into klp-modular-docs 2014-10-02 17:31:05 +00:00
Rich Slogar
f34d0e6903 docs: Update for Android 23.0.4 
Change-Id: I7025dcf9bbfd03b555f7f5059d0e35f67f836dcf
 2014-10-02 10:19:17 -07:00
Deepanshu Gupta
fca5e5577f Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:32:28 +00:00
Deepanshu Gupta
76aff1f6ab Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:49 +00:00
Deepanshu Gupta
5793383457 Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:43 +00:00
Deepanshu Gupta
52af468b5e Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:38 +00:00
Deepanshu Gupta
891f38d181 Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:32 +00:00
Deepanshu Gupta
a2f088b677 Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:22 +00:00
Deepanshu Gupta
541e6e5d47 Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:08 +00:00
Deepanshu Gupta
2d77fad26b Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:03 +00:00
Deepanshu Gupta
ffa4115a0e Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:25:44 +00:00
Deepanshu Gupta
bae6442159 Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:25:37 +00:00
Deepanshu Gupta
60f3676e08 Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:25:32 +00:00
Jeff Hao
a67c6f0162 Mark constructor as accessible in LayoutInflater. [DO NOT MERGE] 
Needed to bypass new access checks for fields, methods, and
constructors.

Change-Id: I8ff0b44a6cb4f4af1c72734bca366d8b89528030
(cherry picked from commit e3abd2ccbef4c50b48df3605c65d732fa49a980b)
 2014-10-01 12:47:40 -07:00
Deepanshu Gupta
409bd3d774 Resource resolution bug fix. [DO NOT MERGE] 
Fix a bug where "?attr/foo" in framework resources wasn't resolved
properly.

Change-Id: I9a56974f526774fde79685f668f01021136d68f1
(cherry picked from commit 19c7842082d831ad432abe906f4c37c6ed08e414)
 2014-10-01 12:45:26 -07:00
Deepanshu Gupta
fea51feb5c Fix Tests after cherry picks. [DO NOT MERGE] 
1. Updated the intelliJ run configuration for the layoutlib_create tool.
2. Updated the code to search for the platform.dir.
3. Update tests to use AppTheme and Target SDK 19

Change-Id: I6f1cc6ff2a53e4474c746537029c7f89c6dd6dc1
(cherry picked from commit 8592eeafd01370d1a17e34602290becf7f611c75)
 2014-10-01 12:44:24 -07:00
Deepanshu Gupta
98a03e771e Update intelliJ copyright profile [DO NOT MERGE] 
Change-Id: Ib9386b686cb24e1f187d0b636b59b4b13d59bbcd
(cherry picked from commit 91fa62ac67a5e294124b5bfb70b35addc7687c34)
 2014-10-01 12:44:14 -07:00
Deepanshu Gupta
039d5849ea Build layoutlib create tests as part of sdk build. [DO NOT MERGE] 
LayoutLib Create tests are now built whenever LayoutLib create is built.

Change-Id: Id215e8690e435019579dba1734090a0d585f37e1
(cherry picked from commit 4efe6264f1251fa200427f54ea6f5dd4c4d03665)
 2014-10-01 12:44:05 -07:00
Deepanshu Gupta
6fb5fdc233 Add layoutlib tests to DIST_DIR [DO NOT MERGE] 
Add the layoutlib and layoutlib-create tests to DIST_DIR for sdk
targets. These can be used for continuous testing on the build server.

Change-Id: I747dddcddfd8009937668bec4d75cb99bf63235f
(cherry picked from commit f9c749c9901c459f77ffc6f4fbbc15f4142c6e0a)
 2014-10-01 12:43:52 -07:00
Deepanshu Gupta
bd4133133a Build layoutlib_create tests. [DO NOT MERGE] 
Change-Id: Ia13a090f8ec29b2b2a107825b6a13d7db77e6d61
(cherry picked from commit 2294f939bc79ce902a40db37def64cc28394d56b)
 2014-10-01 12:43:43 -07:00
Deepanshu Gupta
3f0e467a06 Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE] 
The variable is not actually needed and it makes working with different
API levels a lot easier since everything now depends on $PROJECT_DIR$.

This change also makes the tests more robust by improving the way it
tries to find the SDK.

Change-Id: I3502ad4a0ba85fd88b497e47964fddb2a89e520c
(cherry picked from commit 5377695d4ecf3cc6dc1abe59bbfca63f6137b722)
 2014-10-01 12:43:32 -07:00
Deepanshu Gupta
2f3715aaaa Get filename from File faster [DO NOT MERGE] 
Use the direct call from a File object to get the filename instead of
going through Path which depends on Java 7 making the LayoutLib tests
incompatible with Java 6.

Change-Id: I815895eedbc10245ee09bdb53b11e5548b076aad
(cherry picked from commit 7dbf91fee96790fbeb9858740be1bb375f29ecb5)
 2014-10-01 12:43:19 -07:00
Deepanshu Gupta
b6a37d897a Add testing framework to LayoutLib. [DO NOT MERGE] 
This change adds an end to end test which loads the framework resources
and a test app and ensures that no exceptions or warnings are thrown.

The change also adds project configuration for intelliJ.

Change-Id: I7b67c0f1a2af2dac95df7f3231cab537b9826d7d
(cherry picked from commit a8e9517470869fa29946ae1fa1ceeb24c7970391)
 2014-10-01 12:43:11 -07:00
Deepanshu Gupta
23f09423cb Add tests to the layoutlib eclipse project. [DO NOT MERGE] 
Specify the test folder in the layoutlib/bridge eclipse project.

Also add the sourcepath for layoutlib-api-prebuilt.jar

Change-Id: I194ed182618e564388d6df645e2de7f59897fa1e
(cherry picked from commit 36acf8baebc9ab72b3b5fe75d865399ddf7b0132)
 2014-10-01 12:42:49 -07:00
Justin Koh
37185d90a2 Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev 2014-10-01 17:58:01 +00:00
Justin Koh
0beee08646 DO NOT MERGE Hide the volume panel for watches for now 
Hide the volume panel: it's not usable. Need new design in a future release.

Bug: 17753651
Change-Id: I6f7b0683908407b2c1457379cc6641d25adc5c83
 2014-10-01 10:55:40 -07:00
kmccormick
ae3bd63bc5 am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit 'a1572ffc6b8df1f0da637fdb93b949322fcb3637':
  Doc update: Update preprod (staging) instructions.
 2014-10-01 17:08:13 +00:00
kmccormick
a1572ffc6b Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 2014-10-01 17:02:26 +00:00
Ricardo Cervera
781c988a76 am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit 'ae7b5dc49381e76c82cda928cc37a6a8b529da25':
  docs: ADT beginner text fix
 2014-10-01 02:57:29 +00:00
Ricardo Cervera
ae7b5dc493 Merge "docs: ADT beginner text fix" into klp-modular-docs 2014-10-01 02:07:15 +00:00
Ricardo Cervera
571e918345 docs: ADT beginner text fix 
Change-Id: I03cc08d5a4f12137a573c23d1ee07e048225c8f5
 2014-09-30 15:07:16 -07:00
kmccormick
76ab6c6290 Doc update: Update preprod (staging) instructions. 
Fix for:

b/17525318

Change-Id: Id93bd3e6e1fd5f203733121e3148cec8b24ab374
 2014-09-30 12:24:40 -07:00
Scott Rowe
294d534787 am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit '9d20628b4beb38470d4f7d10193ac5a7cc558d41':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-09-29 22:53:15 +00:00
Scott Rowe
9d20628b4b docs: b/16044763 Update IAB docs to give notice of v2 turndown 
Change-Id: I696c9b22707d34635ab65b392d90aa7406ab40d0
 2014-09-29 15:11:46 -07:00
Ricardo Cervera
9f48394158 am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit '808440cd5e1052f21b937cdcb60acecefd57f23c':
  docs: Fixed path for build output.
 2014-09-29 20:43:55 +00:00
Justin Koh
28d01e677c Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev 2014-09-29 18:24:04 +00:00
Ricardo Cervera
808440cd5e Merge "docs: Fixed path for build output." into klp-modular-docs 2014-09-29 14:56:30 +00:00
Dirk Dougherty
5913f40618 am 6373718b: Merge "Doc change: Add new index page for games stories." into klp-modular-docs 
* commit '6373718b883dd945c17987ac64925c0fdc30674d':
  Doc change: Add new index page for games stories.
 2014-09-27 05:14:05 +00:00