LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,899 Commits 2 Branches 0 Tags
ee062480adcacde89e0ed1a04e8d0e34faa3e42c
Commit Graph

10899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
a161dd2994 Add sample code for the new widget android.widget.TextClock 
Change-Id: I0b65fcc35db8d9f15d9b7c4ada0658d806a601b8
 2012-10-31 20:35:07 -07:00
Trevor Johns
b69d09ecd9 LunarLander: Fix race condition causing crash on exit 
When exiting the LunarLander sample, it was possible for the canvas
to get destroyed before execution was halted.

Added additional synchronization to make sure the current run-state
is accounted for before performing a canvas update.

Also updated deprecated constants in lunar_layout.xml.

Bug: 6164549
Change-Id: I9a710f6b128491f1beece84dd39ab00f4937a4c6
 2012-10-31 16:58:00 -07:00
The Android Open Source Project
089adf7c7e Reconcile with jb-mr1-release - do not merge 
Change-Id: I7dd54fd9a5bb7c51979d90beabbb6f00518896b1
 2012-10-31 09:15:40 -07:00
The Android Automerger
a2790ad94a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-26 16:22:38 -07:00
Jeff Brown
a5374ab3f5 am 5091d4e4: am b7e8a4ec: Merge "Add a demo for using Presentations with the MediaRouter." into jb-mr1-dev 
* commit '5091d4e4335f3ce9c5bea0b7a7156d07902a60ff':
  Add a demo for using Presentations with the MediaRouter.
 2012-10-26 15:20:17 -07:00
Jeff Brown
5091d4e433 am b7e8a4ec: Merge "Add a demo for using Presentations with the MediaRouter." into jb-mr1-dev 
* commit 'b7e8a4ecb1b5f5a46e8e5c42c29425bbb16fc2fc':
  Add a demo for using Presentations with the MediaRouter.
 2012-10-26 15:09:50 -07:00
Jeff Brown
b7e8a4ecb1 Merge "Add a demo for using Presentations with the MediaRouter." into jb-mr1-dev 2012-10-26 13:53:05 -07:00
Roman Nurik
9b87399510 am 46e81a38: am 31f3da3a: am 9cfe3d44: am dc567ef5: am c00fe97b: Merge "AnimationsDemo sample code for Animations training class." into jb-dev-docs 
* commit '46e81a3853e6aaaed0e57872f01c0a1c724f099b':
  AnimationsDemo sample code for Animations training class.
 2012-10-26 09:05:18 -07:00
Roman Nurik
46e81a3853 am 31f3da3a: am 9cfe3d44: am dc567ef5: am c00fe97b: Merge "AnimationsDemo sample code for Animations training class." into jb-dev-docs 
* commit '31f3da3a08bc1a2a3d9e98543cb53105fb244fdb':
  AnimationsDemo sample code for Animations training class.
 2012-10-26 09:02:46 -07:00
Roman Nurik
31f3da3a08 am 9cfe3d44: am dc567ef5: am c00fe97b: Merge "AnimationsDemo sample code for Animations training class." into jb-dev-docs 
* commit '9cfe3d449dfe81c8dfe367ec9d954fee266dd8cf':
  AnimationsDemo sample code for Animations training class.
 2012-10-26 09:00:34 -07:00
Roman Nurik
9cfe3d449d am dc567ef5: am c00fe97b: Merge "AnimationsDemo sample code for Animations training class." into jb-dev-docs 
* commit 'dc567ef57a0b7903880539d18a738f0d92fb750b':
  AnimationsDemo sample code for Animations training class.
 2012-10-26 08:57:47 -07:00
Roman Nurik
dc567ef57a am c00fe97b: Merge "AnimationsDemo sample code for Animations training class." into jb-dev-docs 
* commit 'c00fe97be4b7501952dbbc6e40553a5a6eb73f26':
  AnimationsDemo sample code for Animations training class.
 2012-10-26 08:55:22 -07:00
Roman Nurik
c00fe97be4 Merge "AnimationsDemo sample code for Animations training class." into jb-dev-docs 2012-10-26 08:52:31 -07:00
Jeff Brown
66dc70ff47 Add a demo for using Presentations with the MediaRouter. 
Improved the documentation and robustness of the samples.

Modified the existing Presentation sample to use the new
DisplayManager API for querying displays that support a
particular category of uses.

Bug: 7409073
Change-Id: I2a19afa373c408c2bcbaa633370480b717630088
 2012-10-25 20:14:32 -07:00
Roman Nurik
01be9fd4c0 AnimationsDemo sample code for Animations training class. 
Change-Id: I0fbf3c2f66ee4321adcc0c0bf3fe7f4b4e67584e
 2012-10-25 12:59:24 -07:00
The Android Automerger
08f4431e91 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-24 16:56:50 -07:00
Jeff Brown
2fc12d75a5 am 33c5d45c: am ea7dfba7: Merge "Add ApiDemos for secure surfaces." into jb-mr1-dev 
* commit '33c5d45c0c8710574d5193b5dc7984ac21a4df75':
  Add ApiDemos for secure surfaces.
 2012-10-24 13:33:41 -07:00
Jeff Brown
33c5d45c0c am ea7dfba7: Merge "Add ApiDemos for secure surfaces." into jb-mr1-dev 
* commit 'ea7dfba76c1244dce72094da1616a33a725f0781':
  Add ApiDemos for secure surfaces.
 2012-10-24 13:31:01 -07:00
Jeff Brown
ea7dfba76c Merge "Add ApiDemos for secure surfaces." into jb-mr1-dev 2012-10-24 13:28:17 -07:00
Jeff Brown
c875f9321a Add ApiDemos for secure surfaces. 
Added three ApiDemos for secure surfaces.  One for Activity,
one for Dialog and one for SurfaceView.  The mechanism is the
same in each case but the API is a little different.

Bug: 7368436
Change-Id: I78bc2a456b4c0f1a553120d72f433095ba7e038c
 2012-10-24 12:56:50 -07:00
Laurent Tu
8a5ef7c437 am 8b57938a: am bc4f4fce: Add platform FLP for emulator config 
* commit '8b57938a393bbc94ffda1a43a706a7cdf7f4ea0e':
  Add platform FLP for emulator config
 2012-10-24 11:07:32 -07:00
Laurent Tu
8b57938a39 am bc4f4fce: Add platform FLP for emulator config 
* commit 'bc4f4fcecb47e984093c7dfc3008fe45ac011129':
  Add platform FLP for emulator config
 2012-10-24 11:06:14 -07:00
Laurent Tu
bc4f4fcecb Add platform FLP for emulator config 
Add platform FLP for emulator config since this is now required by
LocationManagerService.ensureFallbackFusedProviderPresentLocked().

Bug: 7379580
Change-Id: If8a3499103eb96d392939fd1ef70368ec9168ad5
 2012-10-23 18:36:46 -07:00
Andrew Hsieh
61601e818f am 42d7eefb: Merge "Let users could query cpu features on device." 
* commit '42d7eefb86bf9823f5563b6fa2a741b56cfcbe95':
  Let users could query cpu features on device.
 2012-10-22 19:59:35 -07:00
Andrew Hsieh
42d7eefb86 Merge "Let users could query cpu features on device." 2012-10-22 19:54:53 -07:00
Lai Wei-Chih
2c9e934fc5 Let users could query cpu features on device. 
Change-Id: I9f5d7c66fb4248f5f8cbbf4c350b82a5b8c3aee9
 2012-10-23 10:05:22 +08:00
The Android Automerger
d8cfc7d1aa merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-22 16:41:52 -07:00
Xavier Ducrohet
be080b8494 am 64063993: am dc14aa6f: Merge "Update the API file for the SDK." into jb-mr1-dev 
* commit '640639932a3eeac06ee461a289db208d8b09e64d':
  Update the API file for the SDK.
 2012-10-22 12:40:05 -07:00
Xavier Ducrohet
640639932a am dc14aa6f: Merge "Update the API file for the SDK." into jb-mr1-dev 
* commit 'dc14aa6f1c820bedec1d59ac94d42daf8170845b':
  Update the API file for the SDK.
 2012-10-22 12:37:37 -07:00
Xavier Ducrohet
dc14aa6f1c Merge "Update the API file for the SDK." into jb-mr1-dev 2012-10-22 12:34:43 -07:00
Xavier Ducrohet
6cee101c6f Update the API file for the SDK. 
Also update the platform tools to rev 16.

Change-Id: I92c8e1f99e4192212ed352f38d84d01c6a95d047
 2012-10-22 12:10:32 -07:00
Geremy Condra
bdebbf14fd am 84a3fb98: am 03034847: Fixed runtest to work with python != 2.4 
* commit '84a3fb98737c303922d591f5bf30c248b05f2c12':
  Fixed runtest to work with python != 2.4
 2012-10-22 10:46:06 -07:00
Geremy Condra
84a3fb9873 am 03034847: Fixed runtest to work with python != 2.4 
* commit '03034847073ab9979147f17b1d7f2e8dc3995e26':
  Fixed runtest to work with python != 2.4
 2012-10-22 10:44:01 -07:00
Geremy Condra
0303484707 Fixed runtest to work with python != 2.4 
Change-Id: I6104adb5a6549eb4eaa3f2096633a49e4743ce50
 2012-10-19 15:08:05 -07:00
The Android Automerger
cc8defb1b1 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-19 06:59:22 -07:00
Xavier Ducrohet
40ba6ec818 am 8be1a88d: am 43b41f52: am bb65013d: (-s ours) am fc848872: Update platform source.prop for new layoutlib. do not merge. 
* commit '8be1a88d20f9d9980075f67396781cb59660a36a':
  Update platform source.prop for new layoutlib. do not merge.
 2012-10-18 17:59:12 -07:00
Xavier Ducrohet
8be1a88d20 am 43b41f52: am bb65013d: (-s ours) am fc848872: Update platform source.prop for new layoutlib. do not merge. 
* commit '43b41f5298658a5e95410df5ed80f7dea816abd2':
  Update platform source.prop for new layoutlib. do not merge.
 2012-10-18 17:56:13 -07:00
Xavier Ducrohet
43b41f5298 am bb65013d: (-s ours) am fc848872: Update platform source.prop for new layoutlib. do not merge. 
* commit 'bb65013d27d222ef63258a574665cd197c985580':
  Update platform source.prop for new layoutlib. do not merge.
 2012-10-18 17:53:58 -07:00
Xavier Ducrohet
bb65013d27 am fc848872: Update platform source.prop for new layoutlib. do not merge. 
* commit 'fc8488729db76770c29bf9a66805fab421bf000c':
  Update platform source.prop for new layoutlib. do not merge.
 2012-10-18 17:50:36 -07:00
Xavier Ducrohet
fc8488729d Update platform source.prop for new layoutlib. do not merge. 
Change-Id: Idd813cc0c69d67e1f60e23ec0b4254d26e459ba3
 2012-10-18 17:40:20 -07:00
Jeff Hamilton
c5d3d8fe47 am 4e9866a7: am 30870013: Merge "Change the name of the location config value." into jb-mr1-dev 
* commit '4e9866a74b19819a7deb78c22ed8814cf8ae8456':
  Change the name of the location config value.
 2012-10-18 12:44:28 -07:00
Jeff Hamilton
4e9866a74b am 30870013: Merge "Change the name of the location config value." into jb-mr1-dev 
* commit '30870013927905645c1afb08a336df2c3e4e7d47':
  Change the name of the location config value.
 2012-10-18 12:41:23 -07:00
Jeff Hamilton
3087001392 Merge "Change the name of the location config value." into jb-mr1-dev 2012-10-18 12:39:24 -07:00
The Android Automerger
56311b5943 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-18 06:59:22 -07:00
Xavier Ducrohet
7c11b0ce73 am 9be07e8c: am 06c5d2f2: Merge "update source.prop for the sdk platform package." into jb-mr1-dev 
* commit '9be07e8c914438a4918a272fc8944141964c8d62':
  update source.prop for the sdk platform package.
 2012-10-17 17:25:35 -07:00
Xavier Ducrohet
9be07e8c91 am 06c5d2f2: Merge "update source.prop for the sdk platform package." into jb-mr1-dev 
* commit '06c5d2f21f1c8ff049c21414a638fa85e080e8e8':
  update source.prop for the sdk platform package.
 2012-10-17 17:23:15 -07:00
Xavier Ducrohet
06c5d2f21f Merge "update source.prop for the sdk platform package." into jb-mr1-dev 2012-10-17 17:21:43 -07:00
Xavier Ducrohet
ab136ad100 update source.prop for the sdk platform package. 
Uses the new Layoutlib API 9
Requires tools 21.

Change-Id: If1ced35107df4118775d95e3c44ebfd94a0f1209
 2012-10-17 17:20:47 -07:00
The Android Automerger
4cce2a32b0 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-17 16:07:00 -07:00
Scott Main
580e902e97 am d6d8114b: am 1cb485c8: am b63a8975: am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567 
* commit 'd6d8114ba55ead1756cf13e9f154a52688bb959a':
  add redirect for layout-objects.html bug: 7366567
 2012-10-17 15:48:38 -07:00