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

125624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
a21ca34494 am a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev 
* commit 'a2f088b6775f0cd0a8b7e3b35e16f13de3f67b01':
  Add layoutlib tests to DIST_DIR [DO NOT MERGE]
 2014-10-02 03:34:06 +00:00
Deepanshu Gupta
93bf0696e7 am 541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev 
* commit '541e6e5d47b928f3cd73f9e8f1da83ff722892c8':
  Build layoutlib_create tests. [DO NOT MERGE]
 2014-10-02 03:34:01 +00:00
Deepanshu Gupta
ddbd9bec76 am 2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev 
* commit '2d77fad26b0fa2203366d08aeccec9b564a70647':
  Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
 2014-10-02 03:33:57 +00:00
Deepanshu Gupta
1cbf17f765 am ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev 
* commit 'ffa4115a0ed065d816171c68609cd738672f5e51':
  Get filename from File faster [DO NOT MERGE]
 2014-10-02 03:33:53 +00:00
Deepanshu Gupta
d332ff3e3f am bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev 
* commit 'bae6442159838206d826775bcebf92fa86f64a93':
  Add testing framework to LayoutLib. [DO NOT MERGE]
 2014-10-02 03:33:48 +00:00
Deepanshu Gupta
c2ffb54fe2 am 60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev 
* commit '60f3676e087db7baa8e67b9cbd18cffc90c4ac09':
  Add tests to the layoutlib eclipse project. [DO NOT MERGE]
 2014-10-02 03:33:42 +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
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
bf6f081cda am 37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev 
* commit '37185d90a2036ece55991f416fcf7948a2198d97':
  DO NOT MERGE Hide the volume panel for watches for now
 2014-10-01 18:00:45 +00: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
d1ba4c13d0 am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit 'ae3bd63bc5ef8106a0d1c2ac15d872517bded5c3':
  Doc update: Update preprod (staging) instructions.
 2014-10-01 17:25:38 +00: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
e906b38b7e am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit '781c988a767eabf9b1b03b4a74f21e3b687902b6':
  docs: ADT beginner text fix
 2014-10-01 03:08:30 +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
6287a65cca am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit '294d534787e139119d30eb7a5b4dd1532312018e':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-09-30 00:39:49 +00:00
Ricardo Cervera
6ea34ddfde am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit '9f48394158bce2984a19fe504b7a7f1f673866f3':
  docs: Fixed path for build output.
 2014-09-30 00:39:39 +00:00
Justin Koh
92ffd6b5fe am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev 
* commit '28d01e677c05edaa45456a26dff22d1b0fc28164':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
 2014-09-30 00:39:16 +00: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
cdc494512e am 5913f406: am 6373718b: Merge "Doc change: Add new index page for games stories." into klp-modular-docs 
* commit '5913f40618494a361b4cc0c79aebdd2f0a9170da':
  Doc change: Add new index page for games stories.
 2014-09-27 05:20:38 +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
Dirk Dougherty
6373718b88 Merge "Doc change: Add new index page for games stories." into klp-modular-docs 2014-09-27 03:16:53 +00:00
Dirk Dougherty
eb81afbe29 Doc change: Add new index page for games stories. 
Change-Id: Icd9de0715c8a77333fd73a46f31c3ad81d0b951b
 2014-09-26 17:43:14 -07:00
Dirk Dougherty
dea43111e1 am 8d03b0b9: am afbe165a: Doc change: Add IAB v2 deprecation notice. 
* commit '8d03b0b987172e70d0bd6522fadc7505a3ff2b1d':
  Doc change: Add IAB v2 deprecation notice.
 2014-09-27 00:27:26 +00:00
Dirk Dougherty
8d03b0b987 am afbe165a: Doc change: Add IAB v2 deprecation notice. 
* commit 'afbe165aecb00b74f8228314cc60b28af089e8e3':
  Doc change: Add IAB v2 deprecation notice.
 2014-09-27 00:22:41 +00:00
Justin Koh
267874622e DO NOT MERGE Disable vibration from notificationmanagerservice when on watch 
This is a hack for this version: in a future framework version, there is an API
to do this.

Bug: 17646502
Change-Id: I7b46c0894c5a21189eb82efa04f2ce50ef1f927c
 2014-09-26 22:23:33 +00:00
Ricardo Cervera
b9c000e090 docs: Fixed path for build output. 
http://b.android.com/76374

Change-Id: I950174eba961e2bf31600671e438e2b85176a9d4
 2014-09-26 13:25:02 -07:00
Kevin Ma
938ff081a6 am 18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev 
* commit '18037f14e8ee8eea7247c03a9cb27e2a8878fd05':
  Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
 2014-09-26 19:43:39 +00:00
Kevin Ma
18037f14e8 Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev 2014-09-26 18:52:25 +00:00
Kevin Ma
8174879e09 Revert "Revert "DO NOT MERGE Fix race condition between binder deaths"" 
This reverts commit 04c6d73fd0e4472505275688ef8497bc6697647c.

Bug: 17286687
Change-Id: Ic11d1e35198accb5a05cd419f5a522bc39fc789b
 2014-09-26 18:51:16 +00:00
Dirk Dougherty
afbe165aec Doc change: Add IAB v2 deprecation notice. 
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1

Conflicts:
	docs/html/google/play/billing/index.jd
 2014-09-26 11:09:12 -07:00
Deepanshu Gupta
f0ebe2fa14 am f202365e: am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'f202365ecca0b6ed637f679c8dd3a36ff850ddfe':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 06:15:55 +00:00