LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,277 Commits 2 Branches 0 Tags
39858d19e920cdbb05550ed96e97fe6a9bf49b51
Commit Graph

8277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raphael Moll
01cd2b97eb am 07d29555: am 42197997: Merge "SDK Windows: Package customized proguard.bat scripts." 2010-10-26 15:44:23 -07:00
Raphael Moll
07d29555ee am 42197997: Merge "SDK Windows: Package customized proguard.bat scripts." 2010-10-26 15:42:14 -07:00
Raphael Moll
4219799735 Merge "SDK Windows: Package customized proguard.bat scripts." 2010-10-26 15:32:23 -07:00
Dianne Hackborn
1468e18a84 Merge "Update to follow API." 2010-10-26 15:25:34 -07:00
Roman Nurik
90c1d50252 Add ApiDemo for android.media.audiofx (Visualizer and Equalizer) 
Change-Id: I4fa3b0aff4edfe80533066a81b0eacc97caa6f86
 2010-10-26 14:04:11 -07:00
Dianne Hackborn
b252273014 Update to follow API. 
Also a new list demo.

Change-Id: I0c59fc6f50009fcba183f0b5af61ec50d5888240
 2010-10-26 12:47:13 -07:00
Mathias Agopian
ecdca8ecce am c07ab4bd: am 5a2fb6ce: Merge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID." into gingerbread 2010-10-26 12:23:56 -07:00
Mathias Agopian
c07ab4bd05 am 5a2fb6ce: Merge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID." into gingerbread 2010-10-26 12:22:09 -07:00
Mathias Agopian
5a2fb6ce28 Merge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID." into gingerbread 2010-10-26 12:18:49 -07:00
Jack Palevich
ca04e3adec am ddc73f98: am 902b355d: Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread 2010-10-26 10:31:43 -07:00
Jack Palevich
ddc73f98ca am 902b355d: Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread 2010-10-26 10:27:09 -07:00
Jack Palevich
902b355dfc Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread 2010-10-26 10:25:13 -07:00
Mathias Agopian
2cf5a578c6 am 844b1ed7: am f0c01122: simplify a bit the native-activity sample code 2010-10-26 07:28:47 -07:00
Mathias Agopian
844b1ed7c7 am f0c01122: simplify a bit the native-activity sample code 2010-10-26 07:24:45 -07:00
The Android Automerger
71e1187f35 Merge branch 'gingerbread' into gingerbread-release 2010-10-25 21:21:33 -07:00
Mathias Agopian
793509c983 Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID. 
This is the preferred way of selecting config starting in
gingerbread, this procedure guarantees forward compatibility.

Change-Id: Iff55b545e722205bd029b92da33368129253b8a3
 2010-10-25 18:03:55 -07:00
Mathias Agopian
f0c011224a simplify a bit the native-activity sample code 
there is no reason to set a depth buffer. this is somewhat confusing.
also, it's better to always specify EGL_SURFACE_TYPE.

Change-Id: Ieff499b0b69a3812773cf3fe08b8bf1ca57a82d9
 2010-10-25 17:59:06 -07:00
Dianne Hackborn
50fc9364b6 am 4bd22f94: am a77c1bdd: Work on issue #3126018: No way to specify NativeActivity\'s native method 
Merge commit '4bd22f94015a9ea90013a96270dc886f73207793'

* commit '4bd22f94015a9ea90013a96270dc886f73207793':
  Work on issue #3126018: No way to specify NativeActivity's native method
 2010-10-25 17:25:14 -07:00
Raphael Moll
da1248a231 am 5c428f4a: am 799754e1: Merge "Tools package was missing proguard.bat" 
Merge commit '5c428f4a8d7fcbd8aea588593cafa8193d48b5f7'

* commit '5c428f4a8d7fcbd8aea588593cafa8193d48b5f7':
  Tools package was missing proguard.bat
 2010-10-25 17:25:08 -07:00
Dianne Hackborn
4bd22f9401 am a77c1bdd: Work on issue #3126018: No way to specify NativeActivity\'s native method 
Merge commit 'a77c1bdd4abf3c7e82af1f3b4330143d14c84103' into gingerbread-plus-aosp

* commit 'a77c1bdd4abf3c7e82af1f3b4330143d14c84103':
  Work on issue #3126018: No way to specify NativeActivity's native method
 2010-10-25 17:07:35 -07:00
Dianne Hackborn
a77c1bdd4a Work on issue #3126018: No way to specify NativeActivity's native method 
Update the header file to match the platform change.

Also add an Android.mk so I can actually build this sample when I want to.

Change-Id: I30c3c43fba7c233c59005d916888a46dc7049651
 2010-10-25 17:01:49 -07:00
Raphael Moll
5c428f4a8d am 799754e1: Merge "Tools package was missing proguard.bat" 
Merge commit '799754e18b7ce057a9aab8ea243f7dfd1d4edb44' into gingerbread-plus-aosp

* commit '799754e18b7ce057a9aab8ea243f7dfd1d4edb44':
  Tools package was missing proguard.bat
 2010-10-25 16:57:55 -07:00
Raphael Moll
799754e18b Merge "Tools package was missing proguard.bat" 2010-10-25 14:43:05 -07:00
Raphael Moll
f4320c6b14 SDK Windows: Package customized proguard.bat scripts. 
Requires Change: Ic1dc74cb3ff4dec9b419e2753290c361dffce48e
in platform/sdk.

Change-Id: Ieb2e308c0e9e655b2c047554563d753ac4cbb852
 2010-10-25 14:41:16 -07:00
Jack Palevich
9ca6f2c057 Remove unused Grid object from LabelMaker.java class. 
Also remove unnescessary "executable" bits from a documentation file.

Change-Id: I49bf8a6f0dabece62d16956b7e02c9a846bdd69b
 2010-10-25 14:03:27 -07:00
Roman Nurik
a10cf9edd8 am affd0f8e: am 83c50ca7: Merge "Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn\'t support a preview size with the same aspect ratio as the device display." into gingerbread 
Merge commit 'affd0f8ec31f9bf1f0f2288c5f6ebab9c18673fe'

* commit 'affd0f8ec31f9bf1f0f2288c5f6ebab9c18673fe':
  Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn't support a preview size with the same aspect ratio as the device display.
 2010-10-25 14:00:28 -07:00
Roman Nurik
affd0f8ec3 am 83c50ca7: Merge "Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn\'t support a preview size with the same aspect ratio as the device display." into gingerbread 
Merge commit '83c50ca740fabe25189601db90dc1f65ed4d2061' into gingerbread-plus-aosp

* commit '83c50ca740fabe25189601db90dc1f65ed4d2061':
  Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn't support a preview size with the same aspect ratio as the device display.
 2010-10-25 13:55:34 -07:00
Roman Nurik
83c50ca740 Merge "Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn't support a preview size with the same aspect ratio as the device display." into gingerbread 2010-10-25 13:50:34 -07:00
Scott Main
bfb2c1dbd0 am ccbd8955: (-s ours) am 0c53c5b6: Merge "Do not merge. This is a cherry-pick from froyo change I392406824607e2bdae646e3156433d82a9ed6521 Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need 
Merge commit 'ccbd8955c0ce6c0bef32d531b6d8c607db7fb561'

* commit 'ccbd8955c0ce6c0bef32d531b6d8c607db7fb561':
  Do not merge.
 2010-10-25 11:27:22 -07:00
Scott Main
ccbd8955c0 am 0c53c5b6: Merge "Do not merge. This is a cherry-pick from froyo change I392406824607e2bdae646e3156433d82a9ed6521 Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for ve 
Merge commit '0c53c5b6f6b449ad7bca14ebb4d650913650b219' into gingerbread-plus-aosp

* commit '0c53c5b6f6b449ad7bca14ebb4d650913650b219':
  Do not merge.
 2010-10-25 11:17:09 -07:00
Scott Main
0c53c5b6f6 Merge "Do not merge. This is a cherry-pick from froyo change I392406824607e2bdae646e3156433d82a9ed6521 Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for version qualifiers on resource directories. - to NOT include items in the options menu based on the 'selected' item (that's what a context menu is for). - include all drawables in the app, instead of using system resources." into gingerbread 2010-10-25 11:14:20 -07:00
Joe Malin
f290a6b611 Merge "Samples: Fix bugs in Note Pad sample app." 2010-10-24 11:11:52 -07:00
Raphael Moll
b04a4f947c Tools package was missing proguard.bat 
SDK Bug: 3126278

Change-Id: I8bb9c2e2250b0da4303b09cdfe05717cee887c44
 2010-10-23 22:11:37 -07:00
The Android Automerger
d752061184 Merge branch 'gingerbread' into gingerbread-release 2010-10-22 17:05:50 -07:00
Dianne Hackborn
c8f1ba9bb0 am 742b1fbd: am c2d70d2a: Update native headers/library to match current platform. 2010-10-22 12:30:44 -07:00
Dianne Hackborn
742b1fbd8b am c2d70d2a: Update native headers/library to match current platform. 2010-10-22 12:11:19 -07:00
Roman Nurik
72dcdbbd09 Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn't support a preview size with the same aspect ratio as the device display. 
Change-Id: Ic7ccc324dfe4d46f3aeb5c7edafc7cc97a6fdc49
 2010-10-22 11:30:57 -07:00
Dianne Hackborn
c2d70d2a98 Update native headers/library to match current platform. 
Change-Id: I40ef2fa924881b9653fcddcd09c14455ac1ef37e
 2010-10-21 21:09:47 -07:00
Joe Malin
94ce3f2088 Cherry pick from master: Sample app and test package for a Service 2010-10-21 14:20:11 -07:00
Yu Shan Emily Lau
05cd1145d4 am 35ccee0b: am 9bfa6f90: Merge "1) add the bugreport option which allow the scripted monkey to capature the bugrepor and save it to the sdcard wherenever there is a ANR, java crash and native crash. 2) Add a new option in the scripted monkey which can enter a string 
Merge commit '35ccee0b22501feda0249dfcaaff2a9fdcd363b6'

* commit '35ccee0b22501feda0249dfcaaff2a9fdcd363b6':
  1) add the bugreport option which allow the scripted monkey to capature the bugrepor and save it to the sdcard wherenever there is a ANR, java crash and native crash.
 2010-10-21 13:44:36 -07:00
Scott Main
875234d940 Do not merge. 
This is a cherry-pick from froyo change I392406824607e2bdae646e3156433d82a9ed6521
Revise NotePad application to use better practices such as
        - inflating menus from XML and supporting API Level 3 without the need
        for version qualifiers on resource directories.
        - to NOT include items in the options menu based on the 'selected' item
        (that's what a context menu is for).
        - include all drawables in the app, instead of using system resources.

        Add features:
        - the ability to edit the note title through the context menu
        - disable menu items in the editor based on menu groups
        - add a "save" button to the editor instead of assuming BACK functionality
        - and show the title of the current note in the activity title.
        - and probably others

Change-Id: I5e6fa5315308edf1a9447ecadd5b289127776bd0
 2010-10-21 12:46:04 -07:00
Scott Main
1878c56740 am 9b07277b: (-s ours) am 0702c101: am 05523fb0: (-s ours) Do not merge. Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for version qualifiers on resource directories. - t 
Merge commit '9b07277b925e34e6bced3f4057b3b487b9468468'

* commit '9b07277b925e34e6bced3f4057b3b487b9468468':
  Do not merge.
 2010-10-21 10:58:46 -07:00
Dianne Hackborn
a85e26223e am ddb133f4: am 834eb602: Fix bug in native activity demo. 
Merge commit 'ddb133f4a9d1e2f75f99c148e8218e43682b40a2'

* commit 'ddb133f4a9d1e2f75f99c148e8218e43682b40a2':
  Fix bug in native activity demo.
 2010-10-21 10:49:07 -07:00
The Android Automerger
e42b9644da Merge branch 'gingerbread' into gingerbread-release 2010-10-21 07:24:06 -07:00
Yu Shan Emily Lau
35ccee0b22 am 9bfa6f90: Merge "1) add the bugreport option which allow the scripted monkey to capature the bugrepor and save it to the sdcard wherenever there is a ANR, java crash and native crash. 2) Add a new option in the scripted monkey which can enter a string through the s 
Merge commit '9bfa6f90b8c56ed7404c0c07a70e27a9fbad3c23' into gingerbread-plus-aosp

* commit '9bfa6f90b8c56ed7404c0c07a70e27a9fbad3c23':
  1) add the bugreport option which allow the scripted monkey to capature the bugrepor and save it to the sdcard wherenever there is a ANR, java crash and native crash.
 2010-10-20 14:06:56 -07:00
Yu Shan Emily Lau
9bfa6f90b8 Merge "1) add the bugreport option which allow the scripted monkey to capature the bugrepor and save it to the sdcard wherenever there is a ANR, java crash and native crash. 2) Add a new option in the scripted monkey which can enter a string through the shell command input text <string>" into gingerbread 2010-10-20 14:04:52 -07:00
Scott Main
9b07277b92 am 0702c101: am 05523fb0: (-s ours) Do not merge. Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for version qualifiers on resource directories. - to NOT include 
Merge commit '0702c101253807064c177cdbfca80391b1a26aea' into gingerbread-plus-aosp

* commit '0702c101253807064c177cdbfca80391b1a26aea':
  Do not merge.
 2010-10-20 13:54:47 -07:00
The Android Automerger
043168b457 Merge branch 'gingerbread' into gingerbread-release 2010-10-20 12:46:23 -07:00
Scott Main
0702c10125 am 05523fb0: (-s ours) Do not merge. Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for version qualifiers on resource directories. - to NOT include items in the options m 
Merge commit '05523fb0b48280a5364908b00768ec71edb847a2' into gingerbread

* commit '05523fb0b48280a5364908b00768ec71edb847a2':
  Do not merge.
 2010-10-20 10:18:00 -07:00
The Android Automerger
4f4529984c Merge branch 'gingerbread' into gingerbread-release 2010-10-20 07:29:30 -07:00