LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,853 Commits 2 Branches 0 Tags
5a4f0c40d4ab0e6ad859b9b2eeaa93a1733cc3d7
Commit Graph

5853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Turner
5a4f0c40d4 am d56f61b3: am 201398b4: am 85d6342d: am 99d6295f: Merge "Enable lcd backlight in the emulator." 
* commit 'd56f61b3fdd02cb4483a759e240180bac1dd23aa':
  Enable lcd backlight in the emulator.
 2011-03-30 16:34:30 -07:00
Raphael
de3c6fdf34 am ee13f1c3: am 06f2189a: am 627afeae: resolved conflicts for merge of 002acfc3 to stage-korg-master 
* commit 'ee13f1c3a7ca2eb47031d7c5bfabc3babd3e513a':
  Fix XMLNS detection in SDK Repo XSD files.
 2011-03-30 16:34:26 -07:00
David 'Digit' Turner
d6174475af am 74a30541: am 1ca79b34: am 8edebe1f: am 4712e4eb: Merge "qemud: disable debug traces" 
* commit '74a30541a481ce598b61c2c3665020207c6351bd':
  qemud: disable debug traces
 2011-03-30 16:34:17 -07:00
Raphael
21470619d6 am 89c0b1a3: (-s ours) am 7a8e0399: (-s ours) am 86f738ab: am 473fad03: (-s ours) Merge "Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge." 
* commit '89c0b1a34e968b4525ed8fed0a8cf09f1184d08e':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
 2011-03-30 16:34:13 -07:00
Raphael
f922f6d124 am 84ed1107: (-s ours) am 8ad74177: (-s ours) am 2a610080: am 878796e9: (-s ours) Merge "Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge." 
* commit '84ed11075eed81f4e2525319010793881ff16dd9':
  Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
 2011-03-30 16:34:07 -07:00
David Turner
d56f61b3fd am 201398b4: am 85d6342d: am 99d6295f: Merge "Enable lcd backlight in the emulator." 
* commit '201398b4890f37e2a0db4ef33dfc2140506a4957':
  Enable lcd backlight in the emulator.
 2011-03-30 08:20:36 -07:00
Raphael
ee13f1c3a7 am 06f2189a: am 627afeae: resolved conflicts for merge of 002acfc3 to stage-korg-master 
* commit '06f2189a4eb7221ae5ef0eda451f4f7875b906b5':
  Fix XMLNS detection in SDK Repo XSD files.
 2011-03-30 08:20:33 -07:00
David 'Digit' Turner
74a30541a4 am 1ca79b34: am 8edebe1f: am 4712e4eb: Merge "qemud: disable debug traces" 
* commit '1ca79b3497eb4ca3f7341dcb97bb263d8fa6245b':
  qemud: disable debug traces
 2011-03-30 08:20:18 -07:00
Raphael
89c0b1a34e am 7a8e0399: (-s ours) am 86f738ab: am 473fad03: (-s ours) Merge "Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge." 
* commit '7a8e0399c6b8b0b02cd596d0949acc8364500887':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
 2011-03-30 08:20:01 -07:00
Raphael
84ed11075e am 8ad74177: (-s ours) am 2a610080: am 878796e9: (-s ours) Merge "Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge." 
* commit '8ad7417748be9a2a1456f55d1e5e4c6484c06f93':
  Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
 2011-03-30 08:19:56 -07:00
Kenny Root
c8c211a085 Fix some errors in the foreground compat 
The foreground compatibility sample wouldn't actually work on an old
platform because of a misplaced return statement in onCreate and the
invokeMethod would ignore its arguments.

Change-Id: Ic1d1a6d8579700215c7988cd603a6bb86f1346a4
 2011-03-29 09:51:21 -07:00
Xavier Ducrohet
e5a81ca2f5 am f19518fc: am 9775ffe5: Merge "Update SDK files to API 12/Android 3.1" into honeycomb-mr1 
* commit 'f19518fcb1ef26db56094cfaaf9d8082ad30f316':
  Update SDK files to API 12/Android 3.1
 2011-03-28 16:03:32 -07:00
Xavier Ducrohet
f19518fcb1 am 9775ffe5: Merge "Update SDK files to API 12/Android 3.1" into honeycomb-mr1 
* commit '9775ffe5fd3b8498137edf59c7570c4639a73763':
  Update SDK files to API 12/Android 3.1
 2011-03-28 15:58:37 -07:00
Xavier Ducrohet
9775ffe5fd Merge "Update SDK files to API 12/Android 3.1" into honeycomb-mr1 2011-03-28 15:27:26 -07:00
Xavier Ducrohet
a6f8392dc7 Update SDK files to API 12/Android 3.1 
Change-Id: I630413dab4f6859623a9c1aa44b54abe6ef392b8
 2011-03-28 15:23:37 -07:00
Raphael
923dc04127 am e2d5577e: (-s ours) am 4cc9a1e9: Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge. 
* commit 'e2d5577e86390ee769bb417a5e09133e7d133ae6':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
 2011-03-28 12:57:56 -07:00
Raphael
e2d5577e86 am 4cc9a1e9: Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge. 
* commit '4cc9a1e942f068c86b0715e398ec40f86a9deb87':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
 2011-03-28 12:56:11 -07:00
David Turner
201398b489 am 85d6342d: am 99d6295f: Merge "Enable lcd backlight in the emulator." 
* commit '85d6342d8b5e76f933a200c8a9832a52b69d9548':
  Enable lcd backlight in the emulator.
 2011-03-28 07:41:20 -07:00
David Turner
85d6342d8b am 99d6295f: Merge "Enable lcd backlight in the emulator." 
* commit '99d6295f69532f24371a40c27671ac6cbc6b1ded':
  Enable lcd backlight in the emulator.
 2011-03-28 07:28:07 -07:00
David Turner
99d6295f69 Merge "Enable lcd backlight in the emulator." 2011-03-28 07:04:33 -07:00
Raphael
06f2189a4e am 627afeae: resolved conflicts for merge of 002acfc3 to stage-korg-master 
* commit '627afeae86cf877b53316d976f53c3735414f3ca':
  Fix XMLNS detection in SDK Repo XSD files.
 2011-03-25 17:51:57 -07:00
Raphael
4cc9a1e942 Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge. 
When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
  make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
  make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Also merges 3ea87ca65f
  'Fix XMLNS detection in SDK Repo XSD files.'
  to prevent a merge conflict later on.

Change-Id: Ic9832e71456d76f849406e641792f4285ffbf649
 2011-03-25 17:45:21 -07:00
Raphael
627afeae86 resolved conflicts for merge of 002acfc3 to stage-korg-master 
Change-Id: I58e9828bd4d3ebcc4099c9f9ab97390023a1b8e8
 2011-03-25 17:38:23 -07:00
David Turner
44b79c9579 am 411f741d: am 4621d1a8: am 18ddf41d: Merge "Add x86 qemu" 
* commit '411f741d905a174a7f9e315efe7fe7e31f55589b':
  Add x86 qemu
 2011-03-25 16:39:03 -07:00
Raphael
002acfc342 Merge "Fix XMLNS detection in SDK Repo XSD files." 2011-03-25 16:35:04 -07:00
David Turner
411f741d90 am 4621d1a8: am 18ddf41d: Merge "Add x86 qemu" 
* commit '4621d1a82ce5bb3196c82cb164e7b56521f3a7d2':
  Add x86 qemu
 2011-03-25 15:51:22 -07:00
Raphael
3ea87ca65f Fix XMLNS detection in SDK Repo XSD files. 
Change-Id: I7e804c1d7de2db9428d53242c146e15f4c2fcc15
 2011-03-25 14:25:03 -07:00
Jamie Gennis
8d52aeb684 Merge "GLES2Dbg: Remove spurious execute file permissions." 2011-03-25 11:07:23 -07:00
David 'Digit' Turner
1ca79b3497 am 8edebe1f: am 4712e4eb: Merge "qemud: disable debug traces" 
* commit '8edebe1f2877bb0e64321342ff3984e2ab9ab2c3':
  qemud: disable debug traces
 2011-03-25 08:49:37 -07:00
David 'Digit' Turner
8edebe1f28 am 4712e4eb: Merge "qemud: disable debug traces" 
* commit '4712e4eb1421867bcd0e61d0cc51662fc56a7938':
  qemud: disable debug traces
 2011-03-25 08:39:28 -07:00
David 'Digit' Turner
4712e4eb14 Merge "qemud: disable debug traces" 2011-03-25 08:24:58 -07:00
Raphael
7a8e0399c6 am 86f738ab: am 473fad03: (-s ours) Merge "Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge." 
* commit '86f738abccb61c820d50a3a50d1fd1f0f2745c84':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
 2011-03-24 22:44:03 -07:00
Raphael
8ad7417748 am 2a610080: am 878796e9: (-s ours) Merge "Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge." 
* commit '2a6100802234fbbe0643d11ecc8a874096ab9f0f':
  Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
 2011-03-24 22:43:59 -07:00
Raphael
86f738abcc am 473fad03: (-s ours) Merge "Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge." 
* commit '473fad031584363bfd011b51522b819cf62d79d3':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
 2011-03-24 22:39:32 -07:00
Raphael
2a61008022 am 878796e9: (-s ours) Merge "Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge." 
* commit '878796e999792bf9632cbdbb2f97d7214f212b93':
  Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
 2011-03-24 22:39:29 -07:00
Raphael
473fad0315 Merge "Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge." 2011-03-24 22:23:20 -07:00
Raphael
878796e999 Merge "Merge 2ff496b8a1: 'Build SDK repository.' Do not merge." 2011-03-24 22:23:16 -07:00
Jaikumar Ganesh
5c3aac7074 Merge "Modify Bluetooth Porting page image." 2011-03-24 17:17:14 -07:00
Jaikumar Ganesh
f7c1d6f04f Modify Bluetooth Porting page image. 
Change-Id: I2c0fcd033957826b7cc5b66c72d6ec2f808d3838
 2011-03-24 17:13:06 -07:00
Jaikumar Ganesh
5081289ad0 Merge "Update Bluetooth documentation." 2011-03-24 15:36:03 -07:00
Jaikumar Ganesh
4e9067c8d2 Update Bluetooth documentation. 
Change-Id: I491afbbc73e3705d57c3af2781151ce767acd7c9
 2011-03-24 13:57:34 -07:00
Raphael
56c341295a Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge. 
When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
  make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
  make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Change-Id: I4f60d3197cac8c22027534cb7686de087ddf1a90
 2011-03-24 11:20:16 -07:00
Raphael
9eec951059 Merge 2ff496b8a1: 'Build SDK repository.' Do not merge. 
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I1c4a120616697383792d7fb1b328cfcefac0b2f5
 2011-03-24 11:09:43 -07:00
David 'Digit' Turner
5f64d75d1d qemud: disable debug traces 
They're verbose and unuseful during normal usage.

Change-Id: Ia5e2fb89b0a4844ce911a735078efdafb56bc1b4
 2011-03-24 17:14:44 +01:00
Brian Muramatsu
3c0c736422 Update Link for CTS 2.2_r5 
Bug 4128048

Change-Id: I9c43dddf0151dd01837a5c0d5aa683e73af86f9d
 2011-03-23 12:45:27 -07:00
Jamie Gennis
548c959907 GLES2Dbg: Remove spurious execute file permissions. 
This change is just a chmod -x of some files that shouldn't aren't
executable.

Change-Id: I6599f73d474e6ddadff2df6289c75e4e136219fe
 2011-03-22 15:10:47 -07:00
Xavier Ducrohet
a500a941ec am 6f06f575: am 57931c3d: Move samples to 12. 
* commit '6f06f5755a13c50ced9d36b799dfce1d6957216f':
  Move samples to 12.
 2011-03-22 11:42:33 -07:00
David Turner
4621d1a82c am 18ddf41d: Merge "Add x86 qemu" 
* commit '18ddf41d5d11729c58fbbfbe0f22e7c5888a1751':
  Add x86 qemu
 2011-03-22 06:10:31 -07:00
David Turner
18ddf41d5d Merge "Add x86 qemu" 2011-03-22 06:03:34 -07:00
Bruce Beare
60f5414658 Add x86 qemu 
Change-Id: Ic0bfcacd5834f9c2345d7fc0c45528da321f0f7f
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Author: Jun Nakajima <jun.nakajima@intel.com>
 2011-03-22 14:02:45 +01:00