LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,040 Commits 2 Branches 0 Tags
54723fb6ac38cbefd2dbaf8c1e7a892765170d4c
Commit Graph

12040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
3e5d85bbf5 am 70733220: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '70733220a7d61da44c6465f51154bb8e73b34f15':
 2012-11-02 07:30:21 -07:00
The Android Open Source Project
70733220a7 Reconcile with jb-mr1-release - do not merge 
Change-Id: I2c7dc58d384802df352438ef14c32654d1271a61
 2012-11-02 07:27:49 -07:00
The Android Automerger
b89ca65c15 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-01 19:05:07 -07:00
Philip Milne
888ac28d79 Fixes to GridLayout demos. 
Include a GridLayout version of the "Simple Form" example provided in the
LinearLayout and RelativeLayout demos.

Make the existing Form demo work on all devices and orientations
(it was previously too wide for portrait mode).

Change-Id: Ia01d49230bc3ef3d2e70bc34e936c8b4b421b796
 2012-11-01 13:16:37 -07:00
Romain Guy
edfc9b380f am 9ea7b4de: am ff3116b8: am a161dd29: Add sample code for the new widget android.widget.TextClock 
* commit '9ea7b4def72473cd985d80b423ce527e7d8124c6':
  Add sample code for the new widget android.widget.TextClock
 2012-11-01 11:45:36 -07:00
Romain Guy
9ea7b4def7 am ff3116b8: am a161dd29: Add sample code for the new widget android.widget.TextClock 
* commit 'ff3116b8379ae97a040268b3cbe40c95b560aca3':
  Add sample code for the new widget android.widget.TextClock
 2012-11-01 11:28:10 -07:00
Romain Guy
ff3116b837 am a161dd29: Add sample code for the new widget android.widget.TextClock 
* commit 'a161dd29940e7d930dc7d83a27a845e9750c3be2':
  Add sample code for the new widget android.widget.TextClock
 2012-11-01 11:26:07 -07:00
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
4c347ae7c6 am 089adf7c: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '089adf7c7e5272b7e1fd5874c0c65a0d4deba0e1':
 2012-10-31 09:19:08 -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
Brett Chabot
b9d8c82b68 Merge "Make runtest handle inner instrumentation class names." 2012-10-26 16:51:18 -07:00
Brett Chabot
616e8f960d Make runtest handle inner instrumentation class names. 
Bug 7311518

Change-Id: I7c02991445a9fdd2341f54cfd49169fc4e492536
 2012-10-26 16:47:09 -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
1b240560d2 am a5374ab3: am 5091d4e4: am b7e8a4ec: Merge "Add a demo for using Presentations with the MediaRouter." into jb-mr1-dev 
* commit 'a5374ab3f50acd98a7c100bcab200915c71e6b3a':
  Add a demo for using Presentations with the MediaRouter.
 2012-10-26 15:22:50 -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
15b04d63e6 am 9b873995: am 46e81a38: am 31f3da3a: am 9cfe3d44: am dc567ef5: am c00fe97b: Merge "AnimationsDemo sample code for Animations training class." into jb-dev-docs 
* commit '9b873995105684d83e538214b827f729693011df':
  AnimationsDemo sample code for Animations training class.
 2012-10-26 09:07:18 -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
Brett Chabot
d4dd2825b7 Merge "Change runtest --path to only run first instrumentation found." 2012-10-24 16:23:54 -07:00
Brett Chabot
f0afa30c7f Change runtest --path to only run first instrumentation found. 
Bug 7311518

Change-Id: I208c78c73b821389d942700afe8ea7073c41e8d4
 2012-10-24 15:58:21 -07:00
Jeff Brown
e0248ad3c9 am 2fc12d75: am 33c5d45c: am ea7dfba7: Merge "Add ApiDemos for secure surfaces." into jb-mr1-dev 
* commit '2fc12d75a5aeea40a4d0004714e7376bd6513fcf':
  Add ApiDemos for secure surfaces.
 2012-10-24 13:36:31 -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
e3c9f9b7eb am 8a5ef7c4: am 8b57938a: am bc4f4fce: Add platform FLP for emulator config 
* commit '8a5ef7c4379d0d13aebd27a193c3a9094b10b92f':
  Add platform FLP for emulator config
 2012-10-24 11:09:31 -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
d368fe3c10 am 61601e81: am 42d7eefb: Merge "Let users could query cpu features on device." 
* commit '61601e818fb194b917a0f3817019601f8f578d2a':
  Let users could query cpu features on device.
 2012-10-22 20:02:39 -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
737f70c2fa am be080b84: am 64063993: am dc14aa6f: Merge "Update the API file for the SDK." into jb-mr1-dev 
* commit 'be080b849439aa3a8cecb3506387be4c07ed9587':
  Update the API file for the SDK.
 2012-10-22 12:42:23 -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
6ccebb8ca2 am bdebbf14: am 84a3fb98: am 03034847: Fixed runtest to work with python != 2.4 
* commit 'bdebbf14fd0b04709508fa396edbe545b77c5a9f':
  Fixed runtest to work with python != 2.4
 2012-10-22 10:49:08 -07:00