LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,793 Commits 2 Branches 0 Tags
12b751f1f8efdadf50731dd1ef6af6ac99d061cc
Commit Graph

18793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yohann Roussel
9e2e8392ae Merge "Pick installed Jack & Jill for the sdk" 2015-09-15 07:31:54 +00:00
Siva Velusamy
42cc98ea8c am a541aa65: resolved conflicts for 3f9d7b08 to stage-aosp-master 
* commit 'a541aa6559f314648153d0905445e3b256da3d42':
  platform tools version: replace alpha1 with rc1
 2015-09-15 00:22:26 +00:00
Siva Velusamy
a541aa6559 resolved conflicts for 3f9d7b08 to stage-aosp-master 
Change-Id: I3857d3ebdece7db356adfbc9b4f2ff3b1fc25825
 2015-09-14 17:14:28 -07:00
Siva Velusamy
3f9d7b0826 Merge "platform tools version: replace alpha1 with rc1" 2015-09-15 00:01:27 +00:00
Dake Gu
7b42f57cda Add example of vertical grid transition and GuidedStepFragment 
Added example of vertical grid transition

Added example of launching GuidedStepFragment from BrowseFragment.

Also fixed couple bug in GuidedStepActivity:
1. All fragment class should be public
2. Remove argument from constructor. Pass Arguments instead.

Bug: 23319507

Change-Id: Ia7b8d6669445be62f8f2a325cc460021ca392ded
 2015-09-14 16:09:33 -07:00
Siva Velusamy
a22f08db3a platform tools version: replace alpha1 with rc1 
The build scripts don't seem to accept alpha1 as the qualifier.
Earlier we've used rc1 so trying that.

Change-Id: I10c86fa2e727a840b8fdd16b3e7d3e311fb05831
 2015-09-14 14:56:06 -07:00
Siva Velusamy
f5ed55c37e resolved conflicts for 3ad4e29a to mnc-dr-dev-plus-aosp 
Change-Id: I03b93e109f0f6e6c0ded6bd7d6ebf0964f2d26ac
 2015-09-14 12:19:57 -07:00
Siva Velusamy
3ad4e29ac2 resolved conflicts for b1ead6e2 to stage-aosp-master 
Change-Id: I86c4af2fece33e94cf7fd8f3301f05a3fcdb642e
 2015-09-14 11:56:51 -07:00
Siva Velusamy
b1ead6e2de Merge "Update platform tools version to .1.0 alpha1" 2015-09-14 18:44:12 +00:00
Siva Velusamy
ad7321b975 Update platform tools version to .1.0 alpha1 
Change-Id: I6316ce33419d97e8a7138aa1db45f21af7c686e4
 2015-09-14 11:36:54 -07:00
bohu
c60faf600d Update system images to revision 4 
Change-Id: Ibdbc001c84f9a9c159ae76f657944e05941136f8
 2015-09-11 17:44:52 -07:00
Chris Banes
c2835b26eb am 8402e53c: Merge "Add snapping scroll example to SupportDesignDemos" into mnc-ub-dev 
* commit '8402e53c262cb4f8a18d883d5dabe8e8094dc68a':
  Add snapping scroll example to SupportDesignDemos
 2015-09-10 00:33:51 +00:00
Chris Banes
8402e53c26 Merge "Add snapping scroll example to SupportDesignDemos" into mnc-ub-dev 2015-09-10 00:25:10 +00:00
Tor Norbye
864403fa00 am 16d9874d: Update platform-tools version to 23.0.1 
* commit '16d9874d36785764fe1d73849f6d2ac2292063a4':
  Update platform-tools version to 23.0.1
 2015-09-09 19:09:12 +00:00
Tor Norbye
16d9874d36 Update platform-tools version to 23.0.1 
Change-Id: I7e2a9dd15793f3fde1be81b8eb987bc93746632e
 2015-09-09 18:56:49 +00:00
Mady Mellor
4cae3d4761 am 69bd278c: Add proguard configuration to support design demos sample app 
* commit '69bd278c0cb2cefe01e39ec9a8b12cb21222edb2':
  Add proguard configuration to support design demos sample app
 2015-09-09 18:44:46 +00:00
Dan Willemsen
a81bc96be3 am 033ea23f: am 7ad271e7: Merge "Update windows sdk to build non-recursively" 
* commit '033ea23f59f78e253affbc0d2745083339ca1fd7':
  Update windows sdk to build non-recursively
 2015-09-09 18:25:42 +00:00
Dan Willemsen
033ea23f59 am 7ad271e7: Merge "Update windows sdk to build non-recursively" 
* commit '7ad271e7742a904485c8fdf51206ba068bf5160f':
  Update windows sdk to build non-recursively
 2015-09-09 18:19:05 +00:00
Dan Willemsen
7ad271e774 Merge "Update windows sdk to build non-recursively" 2015-09-09 18:13:21 +00:00
Mady Mellor
69bd278c0c Add proguard configuration to support design demos sample app 
Proguard was stripping out the coordinator layout behavior and the
linear layout manager classes.

Change-Id: Ibe72d5952bee20cf386e7384e261f46eea1cb67d
 2015-09-09 10:42:59 -07:00
Chris Banes
dd04e2673d am 063b68ed: Add DrawableCompat demo to Support4Demos 
* commit '063b68edf61dbf8bf1b3bf342b9fd16bb0cc49b2':
  Add DrawableCompat demo to Support4Demos
 2015-09-05 21:20:51 +00:00
Christopher Ferris
b95adaea28 am c6e26a7e: am a861beec: Merge "Update the stack script for apk handling." 
* commit 'c6e26a7ea7e45d49af817dc0fecd156348b4b5f4':
  Update the stack script for apk handling.
 2015-09-04 18:27:05 +00:00
Christopher Ferris
c6e26a7ea7 am a861beec: Merge "Update the stack script for apk handling." 
* commit 'a861beec5ca91342c976221762ac5dfb513d09c4':
  Update the stack script for apk handling.
 2015-09-04 18:16:20 +00:00
Christopher Ferris
a861beec5c Merge "Update the stack script for apk handling." 2015-09-04 18:09:58 +00:00
Christopher Ferris
ece64c4bd5 Update the stack script for apk handling. 
The dlopen of a shared library within an apk is not handled by
the stack tool. Modify to understand and search through the apk to
find the shared library associated with the offset. Then unzip
that shared library to use as the target of addr2line.

Change-Id: I404302f68dff45c35a1dc2a55547f42ea04f02bf
 2015-09-04 10:51:22 -07:00
Dan Willemsen
b51d51c4cd am 97ca1d01: am 1162db78: Merge "Stop checking HOST_OS" 
* commit '97ca1d015da938a1f2607abb910fd3205570dac4':
  Stop checking HOST_OS
 2015-09-04 03:09:57 +00:00
Dan Willemsen
97ca1d015d am 1162db78: Merge "Stop checking HOST_OS" 
* commit '1162db78ec2055097edbb1e8d30159dfaa51fc12':
  Stop checking HOST_OS
 2015-09-04 03:02:44 +00:00
Dan Willemsen
1162db78ec Merge "Stop checking HOST_OS" 2015-09-04 02:53:19 +00:00
Chris Banes
4e650fbf0b Add snapping scroll example to SupportDesignDemos 
BUG: 23792717
Change-Id: Ida0ba53fdf14534daa5a2a61ba5c035a1b782e82
 2015-09-04 11:19:45 +10:00
Chris Banes
063b68edf6 Add DrawableCompat demo to Support4Demos 
Change-Id: Ie00198b1d4dbc0c71084961eee2387a68e39505f
 2015-09-04 07:27:28 +10:00
Chris Craik
264843a896 am 7126aedf: am 8ae499e1: Merge "Support new systrace file structure after switching to catapult" 
* commit '7126aedfb2f907e34b14ed63d90eb24326ed7521':
  Support new systrace file structure after switching to catapult
 2015-09-02 17:32:01 +00:00
Chris Craik
7126aedfb2 am 8ae499e1: Merge "Support new systrace file structure after switching to catapult" 
* commit '8ae499e1d3bf7915cd53b410eb8debda66595b86':
  Support new systrace file structure after switching to catapult
 2015-09-02 17:23:20 +00:00
Chris Craik
8ae499e1d3 Merge "Support new systrace file structure after switching to catapult" 2015-09-02 17:17:30 +00:00
Dan Willemsen
7604e6dff4 am 00821385: am a55701c0: Merge "Remove USE_MINGW, whitelist modules for windows" 
* commit '00821385196b40987d4ca45b0add9c6f7c02a4a2':
  Remove USE_MINGW, whitelist modules for windows
 2015-09-01 16:49:43 +00:00
Dan Willemsen
0082138519 am a55701c0: Merge "Remove USE_MINGW, whitelist modules for windows" 
* commit 'a55701c0bed8cb4d968fea69f0e49d257c096c70':
  Remove USE_MINGW, whitelist modules for windows
 2015-09-01 16:37:15 +00:00
Tony Mantler
c2d8765eac am 3dd5d840: Fix typo in SDK generation 
* commit '3dd5d840f875e9a28e5b113e3bffc2efb343d653':
  Fix typo in SDK generation
 2015-09-01 16:08:29 +00:00
Tony Mantler
3dd5d840f8 Fix typo in SDK generation 
Change-Id: I5658bcfc1910562f17d094e81dc60a7c74a4467c
 2015-08-31 15:27:14 -07:00
Dan Willemsen
a55701c0be Merge "Remove USE_MINGW, whitelist modules for windows" 2015-08-31 19:26:19 +00:00
Tony Mantler
013441f296 resolved conflicts for merge of fab9a1f2 to mnc-dr-dev-plus-aosp 
Change-Id: I5cd69798c3880b835cdebf45dcaf90a8b26a1d4d
 2015-08-28 15:56:49 -07:00
Dan Willemsen
349f891d94 Update windows sdk to build non-recursively 
Now the build system can support a HOST_CROSS_OS to build both linux and
windows binaries at the same time.

Bug: 23566667
Change-Id: I82b497c2621fbfbe493d0568fca42863c5fe9433
 2015-08-28 13:30:16 -07:00
Tony Mantler
fab9a1f267 Add preference and recommendation libs to SDK build 
Change-Id: I00c716c42ffbd04b382b1b3016fcc19e9321ae48
 2015-08-28 13:29:54 -07:00
Dan Willemsen
d93269d03a Stop checking HOST_OS 
LOCAL_MODULE_HOST_OS is now enforced, so these can always be defined.

Bug: 23566667
Change-Id: I098aaa5e4d346ef346afff3fa641106870aab363
 2015-08-28 13:29:43 -07:00
Dan Willemsen
b2fa10bf9c Remove USE_MINGW, whitelist modules for windows 
Bug: 23566667
Change-Id: I944f48aea13abef0efa157c82ef7c91a63429eb5
 2015-08-28 13:29:35 -07:00
Zhen Wang
fe9acde0a2 Support new systrace file structure after switching to catapult 
Change-Id: Ib7e99ff8d5679e32673a62ada7a9e1d9ad2e75cb
Signed-off-by: Zhen Wang <zhenw@google.com>
 2015-08-28 12:43:01 -07:00
Jae Seo
0c5f4b63b9 am 7ec20820: Merge "MediaRouter: Remove uses of not-yet-public API" into mnc-ub-dev 
* commit '7ec208209a211271dd37b6749d8a93d963150a69':
  MediaRouter: Remove uses of not-yet-public API
 2015-08-28 01:12:02 +00:00
Jae Seo
7ec208209a Merge "MediaRouter: Remove uses of not-yet-public API" into mnc-ub-dev 2015-08-28 01:04:16 +00:00
Jae Seo
106e33404a MediaRouter: Remove uses of not-yet-public API 
Change-Id: I05949c75081fc963fe4b025f6f4db13d0255eeef
 2015-08-27 17:54:54 -07:00
Bill Yi
28f30d6684 am 7fd985f2: Merge commit \'7fa684064c0bfb6f7f27c4e03cda51aac5e930db\' into HEAD 
* commit '7fd985f2a57f8899b960269b3e508dc55597ed9c':
 2015-08-27 23:37:46 +00:00
Bill Yi
7fd985f2a5 Merge commit '7fa684064c0bfb6f7f27c4e03cda51aac5e930db' into HEAD 2015-08-27 15:09:33 -07:00
Yusuf Ozuysal
d0a7cb4a17 am 517a2f27: Revert "Add customtabs support lib to extras/android/support/" 
* commit '517a2f27bfd997a09679126a78e3d1a8a0e58dd1':
  Revert "Add customtabs support lib to extras/android/support/"
 2015-08-27 21:59:08 +00:00