LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,723 Commits 2 Branches 0 Tags
56d2cb15b332fc44ccd755693a644c007e616dc4
Commit Graph

12723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
1716bb09a7 merge in klp-release history after reset to klp-dev 2013-09-09 06:00:57 -07:00
Jeff Sharkey
34c8fae561 Add DocumentsUI tests. 
Bug: 10514613
Change-Id: I1375a8ee421153178f86a1842ebbe572858bf94c
 2013-09-06 13:56:45 -07:00
Dirk Dougherty
73762c8de9 am 17b152d9: am 60880978: am fe32c3ad: Adjust tags format in _index.jd files. 
* commit '17b152d9a273987645fa97b0df00a35378efc85a':
  Adjust tags format in _index.jd files.
 2013-09-05 19:34:14 -07:00
Dirk Dougherty
17b152d9a2 am 60880978: am fe32c3ad: Adjust tags format in _index.jd files. 
* commit '60880978e61a43624e50a3537819e827a24ff2ae':
  Adjust tags format in _index.jd files.
 2013-09-05 19:33:05 -07:00
Dirk Dougherty
60880978e6 am fe32c3ad: Adjust tags format in _index.jd files. 
* commit 'fe32c3ad53be328d445e8c5ce1d3b1f2bdad7166':
  Adjust tags format in _index.jd files.
 2013-09-05 19:30:18 -07:00
Dirk Dougherty
fe32c3ad53 Adjust tags format in _index.jd files. 
Change-Id: Id32ea71d4b8d54c6e8783326b112b20e23a8f44c
 2013-09-05 18:50:25 -07:00
Chet Haase
2fafc7751e Merge "Minor fixes to animation ApiDemos" into klp-dev 2013-09-05 23:36:38 +00:00
Chet Haase
f3dbdc66d7 Minor fixes to animation ApiDemos 
Many of the original animation demos still had hardwareAccelerated="false"
in their activity tag. This was originally necessary due to the state of the
hw renderer in 3.0, but is no longer necessary.

Also, added documentation to the new Transitions demo.

Issue #7902583 Update animation ApiDemos to use hw acceleration

Change-Id: I7add3acc10d8fa36648e1869a3ec91088b2e199d
 2013-09-05 12:57:33 -07:00
Deepanshu Gupta
7a63270eb4 am a3e0ada2: am 7c5fdf32: am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev 
* commit 'a3e0ada25bb5fbd34fe6ade783bdb61469871ab8':
  Add ICU jar to SDK
 2013-09-05 11:57:31 -07:00
Deepanshu Gupta
a3e0ada25b am 7c5fdf32: am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev 
* commit '7c5fdf3251a44fb584c957de37849e4d4b6d363e':
  Add ICU jar to SDK
 2013-09-05 11:54:57 -07:00
Deepanshu Gupta
7c5fdf3251 am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev 
* commit '2c3e0af13c08379895f0ec296f2e5cb7670acb4a':
  Add ICU jar to SDK
 2013-09-05 11:52:38 -07:00
Deepanshu Gupta
2c3e0af13c Merge "Add ICU jar to SDK" into jb-mr2-dev 2013-09-05 18:48:10 +00: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
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
0a98bfeda6 Fix build -- undo manager not yet public. 
Change-Id: I2d1d59e27b1bbe499421aa2312d8220d12ba18fb
 2013-09-04 19:04:56 -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
72c6392c13 Merge "eclipse classpath: add external/hamcrest (used by mockito)" into klp-dev 2013-09-04 00:44:51 +00:00
Tom O'Neill
de6b89866c Merge "Adapt to API constant changes" into klp-dev 2013-09-03 20:26:24 +00: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
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
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
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
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
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
Jeff Brown
9299c6cdd8 Ensure sample runs on Gingerbread. (DO NOT MERGE) 
Unfortunately, the video does not play due to a MediaPlayer
exception but at least this version does not crash.

Change-Id: I0baf9239a8a12f92b4805bab226f21f46fa63693
(cherry picked from commit 854e16afda)
 2013-08-23 03:23:46 +00:00
Jeff Brown
854e16afda Ensure sample runs on Gingerbread. 
Unfortunately, the video does not play due to a MediaPlayer
exception but at least this version does not crash.

Change-Id: I0baf9239a8a12f92b4805bab226f21f46fa63693
 2013-08-22 18:25:58 -07:00
Brett Chabot
c518764b02 Merge "Fix runtest cts-net" into klp-dev 2013-08-22 18:00:37 +00:00
Brett Chabot
315d72f730 Fix runtest cts-net 
Change-Id: Ia3f7e058c48a8c84e465602e1af172ba75ff1154
 2013-08-22 10:26:52 -07:00
The Android Automerger
ccc84a24aa merge in klp-release history after reset to klp-dev 2013-08-22 06:00:42 -07:00