LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,194 Commits 2 Branches 0 Tags
e88b659c2b5ad7dc142f73a5ddfe9e49c7ccb94c
Commit Graph

13194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
2c3e0af13c Merge "Add ICU jar to SDK" into jb-mr2-dev 2013-09-05 18:48:10 +00:00
Tom O'Neill
9fed64dead am 6ae72772: React to split of getStatus() into onGetSummary() and onGetEnabled() 
* commit '6ae72772c076b602eb71c3e0b680d6b514323c07':
  React to split of getStatus() into onGetSummary() and onGetEnabled()
 2013-09-05 10:37:35 -07:00
Tom O'Neill
6ae72772c0 React to split of getStatus() into onGetSummary() and onGetEnabled() 
- Part of b/10461474

Change-Id: I1dbee915692aab93d56d85203cee3133a8e0e058
 2013-09-05 08:17:40 -07:00
The Android Automerger
9f8fb0a043 merge in klp-release history after reset to klp-dev 2013-09-05 06:00:51 -07:00
Dirk Dougherty
494ae6239c am 79392cbf: am 97717b66: am 3186fb28: am 16f78acf: Add _index.jd files to a few test samples. 
* commit '79392cbf67fd250e1bfa23f9abcb408ae69f6a69':
  Add _index.jd files to a few test samples.
 2013-09-04 22:27:44 -07:00
Dirk Dougherty
79392cbf67 am 97717b66: am 3186fb28: am 16f78acf: Add _index.jd files to a few test samples. 
* commit '97717b6664d08e00e6a94715fd77cb01cf0ce7ae':
  Add _index.jd files to a few test samples.
 2013-09-04 22:25:42 -07:00
Dirk Dougherty
97717b6664 am 3186fb28: am 16f78acf: Add _index.jd files to a few test samples. 
* commit '3186fb282159f222abe20a804a24e7d49f4c81c0':
  Add _index.jd files to a few test samples.
 2013-09-04 22:23:35 -07:00
Dirk Dougherty
3186fb2821 am 16f78acf: Add _index.jd files to a few test samples. 
* commit '16f78acfe1f842881787401dfa8d2e72d13d19f1':
  Add _index.jd files to a few test samples.
 2013-09-04 22:20:29 -07:00
Dirk Dougherty
16f78acfe1 Add _index.jd files to a few test samples. 
Change-Id: Iffdc702c29319e03f22705d7c615ff2f0ff69e33
 2013-09-04 21:56:39 -07:00
Dianne Hackborn
3afdda6286 am 0a98bfed: Fix build -- undo manager not yet public. 
* commit '0a98bfeda6423533417e2eee5ae669e61651f818':
  Fix build -- undo manager not yet public.
 2013-09-04 19:08:30 -07:00
Dianne Hackborn
0a98bfeda6 Fix build -- undo manager not yet public. 
Change-Id: I2d1d59e27b1bbe499421aa2312d8220d12ba18fb
 2013-09-04 19:04:56 -07:00
Chet Haase
397a561724 am 916c2c60: Merge "New demo for transitions feature" into klp-dev 
* commit '916c2c6013f83a513351e0aa0c3cb2e0b0f1c6f3':
  New demo for transitions feature
 2013-09-04 16:49:37 -07:00
Chet Haase
916c2c6013 Merge "New demo for transitions feature" into klp-dev 2013-09-04 23:47:50 +00:00
Chet Haase
ea3e7cdb90 New demo for transitions feature 
New demo in ApiDemos: animations/Simple Transitions

Issue #10460684 KLP API Review: android.view.transition and android.animation

Change-Id: I2c376343c2b945240bc5f3619786e9354a8c1a10
 2013-09-04 14:20:20 -07:00
The Android Automerger
1e4dc2f08d merge in klp-release history after reset to klp-dev 2013-09-04 06:00:36 -07:00
Igor Murashkin
bc178c1f76 am 72c6392c: Merge "eclipse classpath: add external/hamcrest (used by mockito)" into klp-dev 
* commit '72c6392c13e4d03f4bb4db7fd1ee3b580bcc21c2':
  eclipse classpath: add external/hamcrest (used by mockito)
 2013-09-03 17:47:45 -07:00
Igor Murashkin
72c6392c13 Merge "eclipse classpath: add external/hamcrest (used by mockito)" into klp-dev 2013-09-04 00:44:51 +00:00
Tom O'Neill
b2d341fdee am de6b8986: Merge "Adapt to API constant changes" into klp-dev 
* commit 'de6b89866cf0785c2285ed85ad40b054f2cca692':
  Adapt to API constant changes
 2013-09-03 13:31:59 -07:00
Tom O'Neill
de6b89866c Merge "Adapt to API constant changes" into klp-dev 2013-09-03 20:26:24 +00:00
Xavier Ducrohet
6889aabbd8 am 06f88fa1: am fc54e384: (-s ours) am a179e05f: am 1bd3e863: Fix build-tools version. do not merge. 
* commit '06f88fa1d1f139a5e6b4cba355a760c1c43b1eed':
  Fix build-tools version. do not merge.
 2013-09-03 12:14:56 -07:00
Xavier Ducrohet
06f88fa1d1 am fc54e384: (-s ours) am a179e05f: am 1bd3e863: Fix build-tools version. do not merge. 
* commit 'fc54e384c1c84977bbb036195a6d76e7b35b2501':
  Fix build-tools version. do not merge.
 2013-09-03 12:12:51 -07:00
Xavier Ducrohet
fc54e384c1 am a179e05f: am 1bd3e863: Fix build-tools version. do not merge. 
* commit 'a179e05f4dc79e937c463ed6e5e746734edf0a9f':
  Fix build-tools version. do not merge.
 2013-09-03 12:10:27 -07:00
Xavier Ducrohet
a179e05f4d am 1bd3e863: Fix build-tools version. do not merge. 
* commit '1bd3e86304e6501b430df893b0155490f6579348':
  Fix build-tools version. do not merge.
 2013-09-03 12:09:29 -07:00
Xavier Ducrohet
1bd3e86304 Fix build-tools version. do not merge. 
Change-Id: I28bc6fe53b8cf92fde49845c7fc0ffeccf58b937
 2013-09-03 12:04:38 -07:00
Xavier Ducrohet
057d8177e0 am 61c7ea8e: am a9068afa: (-s ours) am fd8979ff: am f01dda32: Update platform revision. DO NOT MERGE. 
* commit '61c7ea8e1e0496910aee457b2ca08028899c302d':
  Update platform revision. DO NOT MERGE.
 2013-08-30 17:29:14 -07:00
Xavier Ducrohet
61c7ea8e1e am a9068afa: (-s ours) am fd8979ff: am f01dda32: Update platform revision. DO NOT MERGE. 
* commit 'a9068afa3cb338d9949a3a78d6062e58b2dbdb71':
  Update platform revision. DO NOT MERGE.
 2013-08-30 17:26:20 -07:00
Xavier Ducrohet
a9068afa3c am fd8979ff: am f01dda32: Update platform revision. DO NOT MERGE. 
* commit 'fd8979ff310f051df51931ab90c1540f15ab8714':
  Update platform revision. DO NOT MERGE.
 2013-08-30 10:21:52 -07:00
Xavier Ducrohet
fd8979ff31 am f01dda32: Update platform revision. DO NOT MERGE. 
* commit 'f01dda325b859f8c481dd434ce748c1c1558f8c0':
  Update platform revision. DO NOT MERGE.
 2013-08-30 10:18:26 -07:00
Xavier Ducrohet
f01dda325b Update platform revision. DO NOT MERGE. 
Change-Id: Id49c7f47e81b000255de8eb8a02d1c74146bfdad
 2013-08-30 10:13:32 -07:00
Andrew Hsieh
35a69bf738 am bd58d761: am 19c6555d: Merge "Update NDK\'s android headers" 
* commit 'bd58d761074cf88df09f10d7a07e0ed8dd470ae0':
  Update NDK's android headers
 2013-08-29 18:27:41 -07:00
Andrew Hsieh
bd58d76107 am 19c6555d: Merge "Update NDK\'s android headers" 
* commit '19c6555d9deed3fb77ac2a76b2861e49542533c9':
  Update NDK's android headers
 2013-08-29 18:24:50 -07:00
Andrew Hsieh
19c6555d9d Merge "Update NDK's android headers" 2013-08-30 01:23:01 +00:00
Michael Wright
f3c3a93bc4 Update NDK's android headers 
Change-Id: I2ae3b42dcbbdccbcae018f768dc7b56723416d21
 2013-08-29 18:17:46 -07:00
Tom O'Neill
3e01427b42 Adapt to API constant changes 
- Affects b/10461474

Change-Id: I08bf5e1bd389428233638b1a19ec06a10393380f
 2013-08-29 15:40:10 -07:00
Igor Murashkin
8ac27eff4e eclipse classpath: add external/hamcrest (used by mockito) 
This fixes the "The hierarchy of the type is inconsistent" error
when using ArgumentMatcher from Mockito.

Change-Id: Ic5e74c7f7020a610fdb1c061a7eb3ecb4c487438
 2013-08-29 10:51:35 -07:00
The Android Automerger
5c3e54e1eb merge in klp-release history after reset to klp-dev 2013-08-28 06:00:19 -07:00
Tom O'Neill
1073385f86 am ed92f012: Merge "Test case where SettingsInjectorService.getStatus() errors out" into klp-dev 
* commit 'ed92f0123a23efa10c802a9023f51f46a2dcf2c1':
  Test case where SettingsInjectorService.getStatus() errors out
 2013-08-27 07:42:53 -07:00
Tom O'Neill
ed92f0123a Merge "Test case where SettingsInjectorService.getStatus() errors out" into klp-dev 2013-08-27 14:40:23 +00:00
The Android Automerger
843cefc2c0 merge in klp-release history after reset to klp-dev 2013-08-27 06:01:05 -07:00
Chong Zhang
424603a99e am 3e3d973c: am 21e0c25e: am 184f79db: Support7Demo: fix video playback on GB 
* commit '3e3d973c48a5d13ac616b92e70c186c2c6eab128':
  Support7Demo: fix video playback on GB
 2013-08-26 15:04:07 -07:00
Tom O'Neill
6154b800a9 am 7db79b35: Inject more settings for better testing of SettingsInjector 
* commit '7db79b35483922a07a3a144dd3354b1f0d0cc9b3':
  Inject more settings for better testing of SettingsInjector
 2013-08-26 15:03:55 -07:00
Tom O'Neill
f534ba3a12 Test case where SettingsInjectorService.getStatus() errors out 
- Also adapt to SettingsInjectorService intent rename

- Part of fix to b/10461474

Change-Id: If35325868ddd730924c4bb1c4543f31017e039f9
 2013-08-26 10:06:56 -07:00
Chong Zhang
3e3d973c48 am 21e0c25e: am 184f79db: Support7Demo: fix video playback on GB 
* commit '21e0c25efb54e5081434c1db07f55ed87ad4cd50':
  Support7Demo: fix video playback on GB
 2013-08-26 09:29:57 -07:00
Chong Zhang
21e0c25efb am 184f79db: Support7Demo: fix video playback on GB 
* commit '184f79db44846b492e2b8b3785b5b62df1f22479':
  Support7Demo: fix video playback on GB
 2013-08-26 09:28:22 -07:00
Chong Zhang
184f79db44 Support7Demo: fix video playback on GB 
Change-Id: I2d403832d82428746dd3ccdbe0cfd56315d72ed9
(cherry picked from commit dbcc746cb0d727ac9aed60bb4156b3bf9f4668aa)
 2013-08-26 16:25:45 +00:00
The Android Automerger
2bc68fdb60 merge in klp-release history after reset to klp-dev 2013-08-26 06:00:49 -07:00
Tom O'Neill
7db79b3548 Inject more settings for better testing of SettingsInjector 
- Test fix for b/10447517

Change-Id: Ifc579026a34d559093bb06f820d439a0876208b3
 2013-08-23 09:55:34 -07:00
Jeff Brown
008bfa7443 am cfa9cd0d: am 582f50f2: (-s ours) am 9299c6cd: Ensure sample runs on Gingerbread. (DO NOT MERGE) 
* commit 'cfa9cd0d85bb46cf2a47be8b0e137b3c3102bd02':
  Ensure sample runs on Gingerbread.  (DO NOT MERGE)
 2013-08-22 20:36:20 -07:00
Jeff Brown
cfa9cd0d85 am 582f50f2: (-s ours) am 9299c6cd: Ensure sample runs on Gingerbread. (DO NOT MERGE) 
* commit '582f50f2f6d4c1cf9a7ea5da9326aea157b0db3d':
  Ensure sample runs on Gingerbread.  (DO NOT MERGE)
 2013-08-22 20:34:41 -07:00
Jeff Brown
582f50f2f6 am 9299c6cd: Ensure sample runs on Gingerbread. (DO NOT MERGE) 
* commit '9299c6cdd8e5d084ef4c10e5b7f044e0ea590641':
  Ensure sample runs on Gingerbread.  (DO NOT MERGE)
 2013-08-22 20:28:01 -07:00