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

5526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raphael
3dc7ef4243 am bb0f61d7: (-s ours) am 5eafc91a: Merge "merge "SDK: make \'mkstub\' less verbose." from HC. Do not merge." into gingerbread 
* commit 'bb0f61d73d9cb6101dec6957e0f7fa3d657e33cd':
  merge "SDK: make 'mkstub' less verbose." from HC. Do not merge.
 2011-02-04 15:20:38 -08:00
Raphael
bb0f61d73d am 5eafc91a: Merge "merge "SDK: make \'mkstub\' less verbose." from HC. Do not merge." into gingerbread 
* commit '5eafc91ad3216561d2287f327580644fb1e04cfb':
  merge "SDK: make 'mkstub' less verbose." from HC. Do not merge.
 2011-02-04 14:49:19 -08:00
Raphael
5eafc91ad3 Merge "merge "SDK: make 'mkstub' less verbose." from HC. Do not merge." into gingerbread 2011-02-04 14:46:24 -08:00
Xavier Ducrohet
fe15961ea9 am bf1caaa0: Move platform-tools SDK component rev to 3 
* commit 'bf1caaa0657357aa69eb12dc05c6a896091f7975':
  Move platform-tools SDK component rev to 3
 2011-02-04 12:57:50 -08:00
Xavier Ducrohet
0e1287eba0 am b82c8fad: (-s ours) am 1cedfdb0: Update samples API level. DO NOT MERGE 
* commit 'b82c8fad3d25e79e12c0e044db7f4427b246a0fd':
  Update samples API level. DO NOT MERGE
 2011-02-04 12:56:30 -08:00
Xavier Ducrohet
bf1caaa065 Move platform-tools SDK component rev to 3 
Change-Id: I243f703ba76d63e9116c9f99c8cf80a7b1f6285e
 2011-02-04 12:54:02 -08:00
Xavier Ducrohet
b82c8fad3d am 1cedfdb0: Update samples API level. DO NOT MERGE 
* commit '1cedfdb031685dd1376de4063d75fb5b8df04eb6':
  Update samples API level. DO NOT MERGE
 2011-02-04 12:52:42 -08:00
Raphael
b82fbc6442 merge "SDK: make 'mkstub' less verbose." from HC. Do not merge. 
mkstub is the tool used to stub the google_apis maps.jar.
Since we're integrating it in the build, we want to control its verbosity.

Change-Id: I93d7dc6a63426affac008f8ef367a0d79277b59a
 2011-02-04 12:35:17 -08:00
Xavier Ducrohet
1cedfdb031 Update samples API level. DO NOT MERGE 
Change-Id: Ib6a27e5abcb7cb767dae31c67445b450705ae9af
 2011-02-04 12:27:11 -08:00
Raphael
58d2cfd206 am 8252cdea: SDK: make \'mkstub\' less verbose. 
* commit '8252cdea30a5a22ae8b2235d7dee2fdd02ba5ccd':
  SDK: make 'mkstub' less verbose.
 2011-02-04 11:10:22 -08:00
Raphael
8252cdea30 SDK: make 'mkstub' less verbose. 
mkstub is the tool used to stub the google_apis maps.jar.
Since we're integrating it in the build, we want to control its verbosity.

Change-Id: Ic0cfacb79a0aa260bcafb54bdc6bdb5a98b1c87a
 2011-02-03 22:56:14 -08:00
Raphael
fdb1410e6c am ad402d2b: resolved conflicts for merge of d30ec22e to gingerbread-plus-aosp 
* commit 'ad402d2b1f4315f31be760d5d2345561059bbe75':
  SDK: fix win-sdk build errors, make future errors fatal.
 2011-02-03 11:34:31 -08:00
Raphael
ad402d2b1f resolved conflicts for merge of d30ec22e to gingerbread-plus-aosp 
Change-Id: I02a991cfb35d3cd14bd45eee1c3454e5a9c4600b
 2011-02-03 11:30:41 -08:00
Raphael
a922306a87 am 27caad99: am 343c626a: am b0e81c37: Merge "SDK: Strip llvm-rs-cc in Windows SDK." 
* commit '27caad9905b7346bfb4e93ff98371ecdf7cdf433':
  SDK: Strip llvm-rs-cc in Windows SDK.
 2011-02-03 09:16:46 -08:00
Raphael
27caad9905 am 343c626a: am b0e81c37: Merge "SDK: Strip llvm-rs-cc in Windows SDK." 
* commit '343c626adaaf323f13d3d0796cf4c84455496a96':
  SDK: Strip llvm-rs-cc in Windows SDK.
 2011-02-03 09:05:11 -08:00
Raphael
d30ec22e43 am 04bb65e7: Merge "SDK: fix win-sdk build errors, make future errors fatal." 
* commit '04bb65e7c4cd42ce50fa534807c973dba6cb2720':
  SDK: fix win-sdk build errors, make future errors fatal.
 2011-02-03 08:56:31 -08:00
Raphael
343c626ada am b0e81c37: Merge "SDK: Strip llvm-rs-cc in Windows SDK." 
* commit 'b0e81c371883a8f7f2cfa9a01f8b65d4a2423dcf':
  SDK: Strip llvm-rs-cc in Windows SDK.
 2011-02-03 08:56:28 -08:00
Raphael
6d5532beed am 7a508aed: SDK: fix win-sdk build errors, make future errors fatal. 
* commit '7a508aed2ac3fe64b307cf05df9989e41e7f6630':
  SDK: fix win-sdk build errors, make future errors fatal.
 2011-02-02 15:52:38 -08:00
Raphael
83a172e05f am 0e2de35b: SDK: Strip llvm-rs-cc in Windows SDK. 
* commit '0e2de35b07d086bba435cda6c112481c75a47521':
  SDK: Strip llvm-rs-cc in Windows SDK.
 2011-02-02 15:52:34 -08:00
Raphael
04bb65e7c4 Merge "SDK: fix win-sdk build errors, make future errors fatal." 2011-02-02 13:41:24 -08:00
Raphael
b0e81c3718 Merge "SDK: Strip llvm-rs-cc in Windows SDK." 2011-02-02 13:41:09 -08:00
Raphael
7a508aed2a SDK: fix win-sdk build errors, make future errors fatal. 
Firs this fixes a cp/rm errors that were logged when building the Windows SDK.
There errors happens because the secondary sdk/tools/patch_windows_sdk.sh
was run twice.

Next the shell script is changed to make any error fatal and actually
break the build, like it should.

In the makefile, merge Ying's fix to correctly pass showcommands.

Change-Id: Iee75e42b0b0bbba3c26858c82c933660dc6d74ae
 2011-02-02 11:52:53 -08:00
Raphael
0e2de35b07 SDK: Strip llvm-rs-cc in Windows SDK. 
SDK Bug: 3394374

Change-Id: I892afdde0672bd5803d25c99e202f2b0418b796d
 2011-02-02 11:52:47 -08:00
Raphael
cedf2ba818 SDK: fix win-sdk build errors, make future errors fatal. 
Firs this fixes a cp/rm errors that were logged when building the Windows SDK.
There errors happens because the secondary sdk/tools/patch_windows_sdk.sh
was run twice.

Next the shell script is changed to make any error fatal and actually
break the build, like it should.

In the makefile, merge Ying's fix to correctly pass showcommands.

Change-Id: I97bbe46d705c6683e31bb701222efe6f9da71d70
 2011-02-02 11:35:41 -08:00
Raphael
d38c76bdf0 SDK: Strip llvm-rs-cc in Windows SDK. 
SDK Bug: 3394374

Change-Id: I46ca70a674da28f265f977a267f81039afe3de7c
 2011-02-02 11:35:24 -08:00
David 'Digit' Turner
8fa01f7d54 am 442064f4: am fd2d786d: am 3f33b7b7: Merge "native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook" 
* commit '442064f4a910bc5c9997e81d451e5721f6e96696':
  native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook
 2011-02-02 09:56:15 -08:00
David 'Digit' Turner
442064f4a9 am fd2d786d: am 3f33b7b7: Merge "native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook" 
* commit 'fd2d786dd10efc9bf3ce0f5f21fbf80f617286a1':
  native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook
 2011-02-02 09:53:15 -08:00
David 'Digit' Turner
fd2d786dd1 am 3f33b7b7: Merge "native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook" 
* commit '3f33b7b742865e0c89e49fd7eb917232c2610a70':
  native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook
 2011-02-02 09:42:07 -08:00
David 'Digit' Turner
3f33b7b742 Merge "native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook" 2011-02-02 03:11:30 -08:00
David 'Digit' Turner
95ae335fd5 native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook 
The window field must not be set to NULL in the pre-hook, only the
post-one. See http://code.google.com/p/android/issues/detail?id=14352

Change-Id: Ib6214d47c97766bf4a5e148b6b6707e08366fe36
 2011-02-02 00:54:02 +01:00
Raphael Moll
ae43104493 am 33d8964c: am e3ec8442: am 2fa9bd29: Merge "Revamped CustomLocale for the SDK." 
* commit '33d8964ce12e438e70456be368bbbf2702efb05b':
  Revamped CustomLocale for the SDK.
 2011-02-01 14:48:40 -08:00
Raphael Moll
33d8964ce1 am e3ec8442: am 2fa9bd29: Merge "Revamped CustomLocale for the SDK." 
* commit 'e3ec8442781ac765c760c6096393863a62b6a26d':
  Revamped CustomLocale for the SDK.
 2011-02-01 14:31:29 -08:00
Raphael Moll
e3ec844278 am 2fa9bd29: Merge "Revamped CustomLocale for the SDK." 
* commit '2fa9bd29f6e6c1694e38f547a5d11e01d5189697':
  Revamped CustomLocale for the SDK.
 2011-02-01 14:25:26 -08:00
Raphael Moll
2fa9bd29f6 Merge "Revamped CustomLocale for the SDK." 2011-02-01 14:21:47 -08:00
Nick Pelly
1501492cfb am f0f3e98f: DO NOT MERGE 
* commit 'f0f3e98f10846f805657daa69e8d21e5b5717a9f':
  DO NOT MERGE
 2011-02-01 11:50:22 -08:00
Nick Pelly
f0f3e98f10 DO NOT MERGE 
Cherry-pick from GB to HC.

Update sample app for final GB MR API changes.

Change-Id: Iab3b879d1a53b70cbffd51011c77699325e21dad
 2011-02-01 11:16:06 -08:00
Nick Pelly
52e42d3f85 am ba29b9b1: am c2860adc: Update sample app for final GB MR API changes. 
* commit 'ba29b9b17769995d7fba7dea09934d2e11bf5ffb':
  Update sample app for final GB MR API changes.
 2011-02-01 10:22:12 -08:00
Nick Pelly
ba29b9b177 am c2860adc: Update sample app for final GB MR API changes. 
* commit 'c2860adcb8c8c84927bfe17fadd61b5beea61ae4':
  Update sample app for final GB MR API changes.
 2011-02-01 10:11:04 -08:00
Nick Pelly
c2860adcb8 Update sample app for final GB MR API changes. 
Change-Id: Ic6b7aa2ffe88f6a9228322d41a2be391eb5bf545
 2011-02-01 08:25:46 -08:00
Xavier Ducrohet
8e05fb8749 am 75b7bb25: Add Clang includes to the SDK for Renderscript 
* commit '75b7bb2521a9e8be84f24f2860870f13e9e5d263':
  Add Clang includes to the SDK for Renderscript
 2011-01-31 18:31:37 -08:00
Xavier Ducrohet
75b7bb2521 Add Clang includes to the SDK for Renderscript 
Change-Id: I247f5c1480799868792871ea68c7765fbbc01fa6
 2011-01-31 16:37:33 -08:00
Raphael Moll
bc6fa8a82b Revamped CustomLocale for the SDK. 
- Revamped the list UI: replaced the long-press actions by
some stateful buttons. Uses the listview's single choice mode.

- Added a broadcast receiver to be able to change the system
locale using an intent, e.g. sent by adb shell am. This is
convenient for automated testing scripts.

- Changed package namespace to v2. This makes it easier for
an automated testing script to figure that an emulator has the
old version and install the new one side-by-side.

Change-Id: I1849d2b9d55441490b013cfefcca5d8fa48e22bd
 2011-01-31 15:22:56 -08:00
The Android Open Source Project
9f0fe782e5 Reconcile gingerbread-plus-aosp and honeycomb 
Change-Id: I3249b581cf8e77253f3225ac3b158019b0a75c64
 2011-01-30 12:39:58 -08:00
The Android Open Source Project
88f1271196 Mass merge from gingerbread - do not merge 
Change-Id: I1fadb096a42c4905d243428a91025ecb759443cc
 2011-01-30 12:39:58 -08:00
Jean-Baptiste Queru
ce2fdae0e6 Merge 1adaa571 from gingerbread 
Change-Id: Ic4be80eea5331f2b32b507dd6546b86383306f94
 2011-01-29 11:13:54 -08:00
Xavier Ducrohet
8f823fd4a4 am 82be0899: (-s ours) Update platform version for SDK component. DO NOT MERGE. 
* commit '82be08990bc73134ae8b0e2a7e94e2a28a82d675':
  Update platform version for SDK component. DO NOT MERGE.
 2011-01-29 10:39:56 -08:00
Jeff Hamilton
59592336d5 am 509fbb4d: Sample code for foreground NDEF Push APIs. 
* commit '509fbb4df3bdbc8c78614f5297459f7afe2b1ba6':
  Sample code for foreground NDEF Push APIs.
 2011-01-29 09:55:03 -08:00
Jean-Baptiste Queru
ebcbca43e3 am 8efcfb5d: (-s ours) am c8fd87e4: Delete browserplugin sample. do not merge 
* commit '8efcfb5dd06e89215a9e119a81a8a05be6c8af7a':
  Delete browserplugin sample. do not merge
 2011-01-29 09:35:57 -08:00
Jeff Hamilton
6a16ba335f am e0fbd3ff: Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent. 
* commit 'e0fbd3ffe82e6e80c6b070c3afbdb8e7fdd9bb25':
  Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
 2011-01-29 09:32:16 -08:00
Raphael
b24ee05ba0 am 6a691b3e: resolved conflicts for merge of 1adaa571 to gingerbread-plus-aosp 
* commit '6a691b3ed872ed42d83ef52a0f975cfc5b3c638a':
  unix2dos command, used by win SDK, has been renamed under Lucid.
 2011-01-29 08:56:53 -08:00