Commit Graph

65 Commits

Author SHA1 Message Date
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
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
The Android Open Source Project
10afb18820 merge from open-source master
Change-Id: Iedee6a43e23821175148324bc2502a33112e2d59
2010-06-14 09:26:36 -07:00
The Android Open Source Project
740c3e2e97 merge from open-source master
Change-Id: I02c592cc054ac16e494ca7a34673ffb562287b01
2010-06-02 07:23:24 -07:00
Christian Mehlmauer
97d0e8ddb7 Removed unused Imports, Added Type Arguments, removed some Warnings by using unused Methods and Variables
Change-Id: I39a4eb2b17f3411b17fcc49cbbbe396e89fab24a
2010-05-21 19:34:32 +02:00
Christian Mehlmauer
62e6bdb0fe Updated deprecated Contacts API to ContactsContract
Change-Id: I1d51b5eba579e841d6024eec08670ae8ff595f94
2010-05-20 06:29:48 +02:00
The Android Open Source Project
ca81fb411a merge from open-source master
Change-Id: I4af8f65d1dfff3912f0057645943df78ddefc7ca
2010-05-19 08:13:51 -07:00
Christian Mehlmauer
9bfa323af1 Corrected StatusBarNotificationSample
Change-Id: I892e84198cfe288e673b81e8ffc331525fee09b8
2010-05-18 23:44:32 +02:00
The Android Open Source Project
c043a97c9f merge from open-source master
Change-Id: Ib0c6bef7b527a79c9902046889e29a4bccd0ab87
2010-05-18 09:27:19 -07:00
Christian Mehlmauer
b88f42b361 Removed Calls to deprecated API
Change-Id: Ia94734637df6aa7b8b08417c49a3485f34f1b94c
2010-05-17 23:43:43 +02:00
Jim Miller
68230c3f72 Fix 2527411: Extend sample DPM app to test setMaximumTimeToLock()
Change-Id: I1a0ff93a27d7d27b66acbacf953eb0984e85e4cf
2010-03-29 20:22:06 -07:00
Dianne Hackborn
c1f107a257 Add new quality constant.
Change-Id: I386438485a921ec94ed1047936ca182c04bce410
2010-03-22 17:02:46 -07:00
Dianne Hackborn
c48b3d9b71 Move DeviceAdmin APIs to android.app.admin. 2010-02-26 18:25:03 -08:00
Dianne Hackborn
bae0f4fd87 Add new MessengerService API demo.
Also refactor the LocalService demo to be more ammenable to being
used for sample code in the java docs.
2010-02-18 16:26:12 -08:00
Dianne Hackborn
0a4b90cb68 Fix issue #2420412: API review: DeviceAdmin API changes 2010-02-17 10:30:09 -08:00
Andrew Stadler
1f91425318 Cleanups to Device Admin sample code
1.  Rename SampleDeviceAdmin to DeviceAdminSample where it appears in
    filenames.  This makes it easier to find when scanning directories.
2.  Fix bug in max password length handling
3.  Add a toast to warn user that entering values in "Password Attempts"
    box has real consequences.
2010-02-08 21:00:05 -08:00
Dianne Hackborn
906d338680 Update to follow device policy "mode" to "quality" change. 2010-01-29 17:16:11 -08:00
Dianne Hackborn
c518e3ac44 Update to follow device policy API changes. 2010-01-28 13:16:10 -08:00
Dianne Hackborn
d51a50c766 More device admin work:
- Example warning message when disabling.
- UI to set maximum failed password attempts.
2010-01-26 18:04:54 -08:00
Dianne Hackborn
cc4ee91892 Start implementing UI for changing requested policies. 2010-01-21 14:30:29 -08:00
Dianne Hackborn
c86ba3199d Initial sample code for writing a device policy. 2010-01-16 18:01:37 -08:00
Romain Guy
74192eafec Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
2010-01-08 15:11:18 -08:00
Dirk Dougherty
a276296490 Merge commit 'e897c1b4' into manualmerge
Conflicts:
	samples/ApiDemos/src/com/example/android/apis/app/_index.html
2009-12-15 23:27:22 -08:00
Dirk Dougherty
e897c1b428 am 1d151678: Merge change Ie8650e4b into eclair
Merge commit '1d15167865b22730cf6ba314a057e62f960aa1db' into eclair-plus-aosp

* commit '1d15167865b22730cf6ba314a057e62f960aa1db':
  sdk doc change for esr: fix some broken links to resources files.
2009-12-15 19:26:25 -08:00
Dirk Dougherty
0b1153b115 sdk doc change for esr: fix some broken links to resources files.
Bug: 2160782
Change-Id: Ie8650e4b642a96e67a2e7e62669282bc58d414ba
2009-12-15 18:47:00 -08:00
James Yum
2a52912611 am 1b5a89a2: am d2962a33: TextToSpeech API demo.
Merge commit '1b5a89a2041586eba7211e996d4de9a5300e8b2d' into eclair-mr2-plus-aosp

* commit '1b5a89a2041586eba7211e996d4de9a5300e8b2d':
  TextToSpeech API demo.
2009-12-09 15:54:38 -08:00
Dianne Hackborn
d564588d7d am 579c7f19: Reorganize Service API demos.
Merge commit '579c7f19ac379294822b976b73fe4037f40eba82' into eclair-mr2-plus-aosp

* commit '579c7f19ac379294822b976b73fe4037f40eba82':
  Reorganize Service API demos.
2009-12-09 15:41:08 -08:00
James Yum
8ac07a902d am d2962a33: TextToSpeech API demo.
Merge commit 'd2962a33216ce40a526c80fc8865cf9bd04936f4' into eclair-plus-aosp

* commit 'd2962a33216ce40a526c80fc8865cf9bd04936f4':
  TextToSpeech API demo.
2009-12-08 16:13:51 -08:00
James Yum
1b5a89a204 am d2962a33: TextToSpeech API demo.
Merge commit 'd2962a33216ce40a526c80fc8865cf9bd04936f4' into eclair-mr2

* commit 'd2962a33216ce40a526c80fc8865cf9bd04936f4':
  TextToSpeech API demo.
2009-12-08 16:13:06 -08:00
James Yum
d2962a3321 TextToSpeech API demo. 2009-12-07 18:35:56 -08:00
Dianne Hackborn
579c7f19ac Reorganize Service API demos.
This collapses multiple related files in one, to make it easier to deal
with in documentation and elsewhere.
2009-12-07 18:05:40 -08:00
Megha Joshi
0a510b1f70 am 0cf6092e: am 11d89599: Add QuickContactsBadge widget sample to ApiDemos
Merge commit '0cf6092e742fbf95722e596f0d4e808e87ac6ce2' into eclair-mr2-plus-aosp

* commit '0cf6092e742fbf95722e596f0d4e808e87ac6ce2':
  Add QuickContactsBadge widget sample to ApiDemos
2009-12-07 17:03:40 -08:00
Megha Joshi
b3ed38b90e am 11d89599: Add QuickContactsBadge widget sample to ApiDemos
Merge commit '11d89599ef7cf949bfe0048d1352f264ee0f6a34' into eclair-plus-aosp

* commit '11d89599ef7cf949bfe0048d1352f264ee0f6a34':
  Add QuickContactsBadge widget sample to ApiDemos
2009-12-07 16:59:39 -08:00
Megha Joshi
11d89599ef Add QuickContactsBadge widget sample to ApiDemos 2009-12-07 16:53:24 -08:00
Megha Joshi
f10748929f am 2321ba48: am b49dd835: Adding wallpaper sample in ApiDemos.
Merge commit '2321ba48baed1638a71ec8c7b1d6f9d79e3e9f83' into eclair-mr2-plus-aosp

* commit '2321ba48baed1638a71ec8c7b1d6f9d79e3e9f83':
  Adding wallpaper sample in ApiDemos.
2009-12-04 17:10:40 -08:00
Megha Joshi
5bd13f2f4e am b49dd835: Adding wallpaper sample in ApiDemos.
Merge commit 'b49dd8359d1b23eb527139499c0db58cb01466c6' into eclair-plus-aosp

* commit 'b49dd8359d1b23eb527139499c0db58cb01466c6':
  Adding wallpaper sample in ApiDemos.
2009-12-04 17:06:09 -08:00
Megha Joshi
b49dd8359d Adding wallpaper sample in ApiDemos. 2009-12-04 17:00:21 -08:00
Jean-Baptiste Queru
394ef56df8 am aecf2c65: am 76c9d31c: Revert "adding set wallpaper sample code in ApiDemos."
Merge commit 'aecf2c6581228677e90550a6d8f5f9668fb72987' into eclair-mr2-plus-aosp

* commit 'aecf2c6581228677e90550a6d8f5f9668fb72987':
  Revert "adding set wallpaper sample code in ApiDemos."
2009-12-03 16:57:41 -08:00
Jean-Baptiste Queru
91b2d65eb9 am 76c9d31c: Revert "adding set wallpaper sample code in ApiDemos."
Merge commit '76c9d31ce383cf1f4ef89dd1dae4f751fbb73b9a' into eclair-plus-aosp

* commit '76c9d31ce383cf1f4ef89dd1dae4f751fbb73b9a':
  Revert "adding set wallpaper sample code in ApiDemos."
2009-12-03 16:44:41 -08:00
Megha Joshi
392481816e am b4fe143c: am b5ad157b: adding set wallpaper sample code in ApiDemos.
Merge commit 'b4fe143cfe18022653fc6710ba44a8f19c6b17ed' into eclair-mr2-plus-aosp

* commit 'b4fe143cfe18022653fc6710ba44a8f19c6b17ed':
  adding set wallpaper sample code in ApiDemos.
2009-12-03 16:41:05 -08:00
Jean-Baptiste Queru
76c9d31ce3 Revert "adding set wallpaper sample code in ApiDemos."
This reverts commit b5ad157bab.
2009-12-03 16:35:23 -08:00
Megha Joshi
f12dc8d51c am b5ad157b: adding set wallpaper sample code in ApiDemos.
Merge commit 'b5ad157bab0298535fa09378f6aca47029f9f475' into eclair-plus-aosp

* commit 'b5ad157bab0298535fa09378f6aca47029f9f475':
  adding set wallpaper sample code in ApiDemos.
2009-12-03 14:17:53 -08:00
Megha Joshi
b5ad157bab adding set wallpaper sample code in ApiDemos. 2009-12-03 13:56:37 -08:00
Dianne Hackborn
7bd364622b am c46a762e: am eb3547b3: Add API demo for services that run in the foreground.
Merge commit 'c46a762ee35b8630ed9f824e0627566fe7cfe605' into eclair-mr2-plus-aosp

* commit 'c46a762ee35b8630ed9f824e0627566fe7cfe605':
  Add API demo for services that run in the foreground.
2009-12-01 17:24:06 -08:00
Dianne Hackborn
612c115040 am eb3547b3: Add API demo for services that run in the foreground.
Merge commit 'eb3547b3d0678ad16a602d342cf81dc64e03d9b7' into eclair-plus-aosp

* commit 'eb3547b3d0678ad16a602d342cf81dc64e03d9b7':
  Add API demo for services that run in the foreground.
2009-11-30 11:09:26 -08:00
Dianne Hackborn
eb3547b3d0 Add API demo for services that run in the foreground.
Change-Id: I7acb0817e5d738294bef02ca2df3c2ab18b45f60
2009-11-25 17:06:53 -08:00
Dianne Hackborn
83f3713356 am bad9ac7f: Merge change 27163 into eclair
Merge commit 'bad9ac7f373f5585ee6e43926b21c470d07663f8' into eclair-plus-aosp

* commit 'bad9ac7f373f5585ee6e43926b21c470d07663f8':
  Add transition animation sample, log to service sample.
2009-09-25 16:20:56 -07:00
Dianne Hackborn
cfc90dc1aa Add transition animation sample, log to service sample.
Change-Id: I7021a7fbbe26d9c52699d7c2216452a5bd51452b
2009-09-25 16:10:42 -07:00