LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,611 Commits 2 Branches 0 Tags
bc6fa8a82b436912501baabc6cb1b93b6202eb7d
Commit Graph

623 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
dede009a98 Delete browserplugin sample. do not merge 
It doesn't build in all environments.

Change-Id: Ib27b73a0f74a79e4138bb128f643206e37f5ea60
 2011-01-27 13:35:26 -08:00
Anirudh Dewani
35dfdb6fc3 am dbe66332: Extended camera preview to switch between multiple available device cameras 
* commit 'dbe66332e278962c058a596353b839a2fd6dca1b':
  Extended camera preview to switch between multiple available device cameras
 2010-11-29 15:54:05 -08:00
Anirudh Dewani
dbe66332e2 Extended camera preview to switch between multiple available device cameras 
Change-Id: I8e97d6182bf02cba29ae3bc9f1a7ef21a277117e
 2010-11-26 02:28:11 +05:30
Raphael
0aa3856227 resolved conflicts for merge of d7267fc2 to gingerbread-plus-aosp 
Change-Id: Id3b056cf13bcfa50b3b4a00a22b8f482069c04c9
 2010-11-23 02:44:59 -08:00
Raphael Moll
a3dc674543 Move <uses-sdk> before <application> in samples. 
Change-Id: Iac2644d350235e19f5109aeb25a8d6d4eb1af3fe
 2010-11-22 12:39:47 -08:00
Glenn Kasten
6e20b04ed0 am f328f262: Merge "Remove .classpath and .project files" into gingerbread 
* commit 'f328f262fd66f90a8ebda011e75dfcc11b65279a':
  Remove .classpath and .project files
 2010-11-15 16:25:58 -08:00
Glenn Kasten
f328f262fd Merge "Remove .classpath and .project files" into gingerbread 2010-11-15 16:23:34 -08:00
Megha Joshi
d53c6f2ac3 am 7f39ff80: Merge "NFC sample app (DO NOT MERGE)" into gingerbread 
* commit '7f39ff802b6281b563f341dc89c58a43ec6bdd99':
  NFC sample app  (DO NOT MERGE)
 2010-11-12 18:32:14 -08:00
Megha Joshi
7f39ff802b Merge "NFC sample app (DO NOT MERGE)" into gingerbread 2010-11-12 18:30:14 -08:00
Megha Joshi
150dd1693f NFC sample app (DO NOT MERGE) 
Change-Id: I1d1d67bbc6760cea1a0c6eccfa4d9f7b1398cd4d
 2010-11-12 18:03:05 -08:00
Alexander Lucas
655f02a456 am 48cc36d9: Merge "Added SIP Demo to sample apps." into gingerbread 
* commit '48cc36d936ea132665c35a1f8c9a2b4b9207ec0b':
  Added SIP Demo to sample apps.
 2010-11-03 15:35:24 -07:00
Alexander Lucas
48cc36d936 Merge "Added SIP Demo to sample apps." into gingerbread 2010-11-03 15:32:48 -07:00
Alexander Lucas
a025796211 Added SIP Demo to sample apps. 
Change-Id: Id98b6e542e1be5b9822a696936e735406c08500f
 2010-11-03 13:21:52 -07:00
Dirk Dougherty
9c92ae922c am 49fe761d: Merge "Cherry pick from master: Sample app and test package for a Service" into gingerbread 
* commit '49fe761ddcf779f1913d22706a2a6153b80aa397':
  Cherry pick from master: Sample app and test package for a Service
 2010-11-03 13:13:33 -07:00
Dirk Dougherty
49fe761ddc Merge "Cherry pick from master: Sample app and test package for a Service" into gingerbread 2010-11-03 13:12:11 -07:00
Roman Nurik
bf8c20f6f0 am bccecc2b: Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread 
* commit 'bccecc2b871749695148a7dcf27ff5b8655a77a0':
  Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)
 2010-11-03 07:56:40 -07:00
Roman Nurik
bccecc2b87 Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread 2010-11-03 07:55:06 -07:00
Glenn Kasten
cbb9f0d00e Remove .classpath and .project files 
During review of the patch set for native audio sample, someone
mentioned there should not be these files in git.  But we seem to
be inconsistent about this (for example these files).  Can you
please let me know whether they should be there or not, and then I
will update the native audio patch set. Thanks!

Change-Id: I6d27f4936f8c60efb05a89a4ba11e77e66aaf539
 2010-10-29 15:23:25 -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
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
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
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
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
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
Joe Malin
94ce3f2088 Cherry pick from master: Sample app and test package for a Service 2010-10-21 14:20:11 -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
Xavier Ducrohet
35ac4e1d36 am 92df1283: Move samples to API 9 
Merge commit '92df1283f7a8e186f04a93a1ec34d8f8fa3202ce' into gingerbread-plus-aosp

* commit '92df1283f7a8e186f04a93a1ec34d8f8fa3202ce':
  Move samples to API 9
 2010-10-19 10:37:02 -07:00
Xavier Ducrohet
92df1283f7 Move samples to API 9 
Change-Id: I918a63197ff62d6b935de5a6eb843516a314a241
 2010-10-19 10:32:14 -07:00
Dianne Hackborn
79ee0a9a05 am 8143be8d: Update device admin example to wipe SD card. 
Merge commit '8143be8d0348e4918ccc75e0a44e617c295da2fc' into gingerbread-plus-aosp

* commit '8143be8d0348e4918ccc75e0a44e617c295da2fc':
  Update device admin example to wipe SD card.
 2010-10-16 16:55:15 -07:00
Dianne Hackborn
8143be8d03 Update device admin example to wipe SD card. 
Change-Id: I224006f284916761578e3d04b208828f80ea3cb6
 2010-10-15 18:52:33 -07:00
Xavier Ducrohet
1cefa9fb2e am 24277fdb: Merge "Set SDK samples to API 8 + gingerbread." into gingerbread 
Merge commit '24277fdb61ce6133e31c7ef3e99bd4fc1314f0ac' into gingerbread-plus-aosp

* commit '24277fdb61ce6133e31c7ef3e99bd4fc1314f0ac':
  Set SDK samples to API 8 + gingerbread.
 2010-10-15 18:22:48 -07:00
Raphael
95a7877b9e Set SDK samples to API 8 + gingerbread. 
DO NOT MERGE

Change-Id: I1040974ab20426ad1fbdb958a21f10681fb68e69
 2010-10-15 11:27:08 -07:00
Xavier Ducrohet
6c99a05152 am 9e914e4a: Reorder the samples packaging + readme. 
Merge commit '9e914e4aa2075a38d76048261808a9a3a3036eb5' into gingerbread-plus-aosp

* commit '9e914e4aa2075a38d76048261808a9a3a3036eb5':
  Reorder the samples packaging + readme.
 2010-10-13 14:22:51 -07:00
Xavier Ducrohet
9e914e4aa2 Reorder the samples packaging + readme. 
Change-Id: Ic4d91b214ec9ceb6303bd99e0a0580fbf3401177
 2010-10-13 13:38:45 -07:00
Kenny Root
d5e77d5e56 am 3ceb9b53: Merge "Update OBB sample to revised API" into gingerbread 
Merge commit '3ceb9b53eab86a86d1817d344822bd16fbbc47fd' into gingerbread-plus-aosp

* commit '3ceb9b53eab86a86d1817d344822bd16fbbc47fd':
  Update OBB sample to revised API
 2010-10-11 17:31:13 -07:00
Kenny Root
a2f69539af Update OBB sample to revised API 
Change-Id: Idc724170a9cbb6a94523b406b8a1f91fcf8293a4
 2010-10-11 17:25:23 -07:00
Dianne Hackborn
efddd2c5b2 am 8bcb38f3: Merge "New API demo showing different screen orientation options." into gingerbread 
Merge commit '8bcb38f3d49d0fdefd51546ada4232203fc606cf' into gingerbread-plus-aosp

* commit '8bcb38f3d49d0fdefd51546ada4232203fc606cf':
  New API demo showing different screen orientation options.
 2010-10-04 14:58:44 -07:00
Dianne Hackborn
bf895af17d New API demo showing different screen orientation options. 
Change-Id: I75b206f86ee87b50cccc5e23140d55bd566781cd
 2010-10-02 16:56:56 -07:00
Jeff Brown
284e195427 resolved conflicts for merge of 4110368b to gingerbread-plus-aosp 
Change-Id: I6a75675ffcb4d9bcb1b7d321a4934b3e3fcca137
 2010-10-01 10:42:11 -07:00
Jeff Brown
4110368b93 Merge "Improve touch paint sample to use geometrical touch width." into gingerbread 2010-09-30 15:58:59 -07:00
Jeff Brown
fc1ee06369 Improve touch paint sample to use geometrical touch width. 
Added multitouch support.
Fixed the trackball based drawing.

Change-Id: I15d9c5c4ac26a83f476f98c1f2ef3a5841e2ffbd
 2010-09-30 15:32:28 -07:00
Kenny Root
e575be05fd am 12c86756: Merge "Add OBB usage example" into gingerbread 
Merge commit '12c86756b9c1ac9080e7ff052a78cdcf16b8f85d' into gingerbread-plus-aosp

* commit '12c86756b9c1ac9080e7ff052a78cdcf16b8f85d':
  Add OBB usage example
 2010-09-30 10:09:11 -07:00
Kenny Root
b9e80e74e2 Add OBB usage example 
Change-Id: I7da5ac0009cb32829e7c6470c0a60ebff2988905
 2010-09-29 16:18:08 -07:00
Megha Joshi
292096fccd am 3471dafa: am 42d3a4ae: Adding CrossCompatibility sample app. 
Merge commit '3471dafa11b721ae4510cb182e3d54033faed12d' into gingerbread-plus-aosp

* commit '3471dafa11b721ae4510cb182e3d54033faed12d':
  Adding CrossCompatibility sample app.
 2010-09-13 17:43:01 -07:00
Megha Joshi
3471dafa11 am 42d3a4ae: Adding CrossCompatibility sample app. 
Merge commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226' into gingerbread

* commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226':
  Adding CrossCompatibility sample app.
 2010-09-13 17:38:43 -07:00
Megha Joshi
42d3a4ae14 Adding CrossCompatibility sample app. 
Change-Id: I565584ea53212f61a9fbbb44e50da59f4ba06fff
 2010-09-13 17:00:10 -07:00
Vairavan Srinivasan
3d925ea9e8 am 50d579d0: GlobalTime: Perform Zoom In and Out only after initialization 
Merge commit '50d579d0ec9c9d0bcd3da936af8480808d5e0843' into gingerbread-plus-aosp

* commit '50d579d0ec9c9d0bcd3da936af8480808d5e0843':
  GlobalTime: Perform Zoom In and Out only after initialization
 2010-09-10 15:41:59 -07:00
Jeff Brown
2073f44b8f am ff242db8: Merge "Add samples for secure views." into gingerbread 
Merge commit 'ff242db8670695e946400d957a82d2933e7e01a1' into gingerbread-plus-aosp

* commit 'ff242db8670695e946400d957a82d2933e7e01a1':
  Add samples for secure views.
 2010-09-08 11:57:59 -07:00