Dianne Hackborn
9fc7996adb
Removed limit-unlock policy.
2010-02-11 14:34:23 -08:00
James Yum
bd9e4dda73
am a88a8393: am 40e665a0: cleanup
...
Merge commit 'a88a8393c6321b7baebb621bcc4c1b3be1ac7793'
* commit 'a88a8393c6321b7baebb621bcc4c1b3be1ac7793':
cleanup
2010-02-10 13:05:40 -08:00
James Yum
a88a8393c6
am 40e665a0: cleanup
...
Merge commit '40e665a015c67a8dd21838894a1634a3e101b760' into eclair-plus-aosp
* commit '40e665a015c67a8dd21838894a1634a3e101b760':
cleanup
2010-02-10 13:01:55 -08:00
James Yum
40e665a015
cleanup
...
deleted: licensing/ILicenseResultListener.aidl
deleted: licensing/ILicensingService.aidl
deleted: licensing/LicenseChecker.java
deleted: licensing/LicenseCheckerCallback.java
deleted: licensing/LicenseValidator.java
deleted: licensing/Policy.java
deleted: licensing/ResponseData.java
deleted: licensing/StrictPolicy.java
2010-02-10 11:18:23 -08:00
Dirk Dougherty
7646786846
am 2a589050: am 4389d65c: Merge "Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build." into eclair
...
Merge commit '2a589050efc7947cc75d3cfe6b12f1eeb2f5ea3a'
* commit '2a589050efc7947cc75d3cfe6b12f1eeb2f5ea3a':
Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build.
2010-02-09 18:47:09 -08:00
Dirk Dougherty
2a589050ef
am 4389d65c: Merge "Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build." into eclair
...
Merge commit '4389d65caea762b276b1b7d6fd560f4b2c4370b3' into eclair-plus-aosp
* commit '4389d65caea762b276b1b7d6fd560f4b2c4370b3':
Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build.
2010-02-09 18:42:38 -08:00
Dirk Dougherty
658d86e5be
Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build.
...
Change-Id: I149fb2aab91d0a2dfc4242a85118bf20dea97e42
2010-02-09 18:00:44 -08:00
Dianne Hackborn
04a9130c8e
New sample code for new external storage paths/APIs.
2010-02-09 12:54:41 -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
The Android Open Source Project
169c7bc043
am 60932954: merge from open-source master
...
Merge commit '609329541ac4c23a2a21b7d493c594c1b3d0c438'
* commit '609329541ac4c23a2a21b7d493c594c1b3d0c438':
Add uses-feature for live wallpaper sample.
resolves Issue #5280 : Go to problem in source from LogCat
2010-02-05 18:00:05 -08:00
The Android Open Source Project
609329541a
merge from open-source master
2010-02-05 13:51:37 -08:00
Megha Joshi
64908722b9
am 74ccbf7a: am ca7a9d34: Merge "SampleSyncAdapter sample code." into eclair
...
Merge commit '74ccbf7aa77213d6df41990936d5f30eb06afe43'
* commit '74ccbf7aa77213d6df41990936d5f30eb06afe43':
SampleSyncAdapter sample code.
2010-02-03 12:34:37 -08:00
Megha Joshi
74ccbf7aa7
am ca7a9d34: Merge "SampleSyncAdapter sample code." into eclair
...
Merge commit 'ca7a9d3497b84fe5b3576d9ea1d1cefa32850fd1' into eclair-plus-aosp
* commit 'ca7a9d3497b84fe5b3576d9ea1d1cefa32850fd1':
SampleSyncAdapter sample code.
2010-02-03 12:29:01 -08:00
Megha Joshi
ca7a9d3497
Merge "SampleSyncAdapter sample code." into eclair
2010-02-03 12:24:47 -08:00
Jack Palevich
66914d4a73
Improve Cube Map and FrameBufferObject samples.
...
Fix tabs and trailing whitespace.
Expand comment to explain how we search for GL extensions.
Rename and document the DEBUG_RENDER_OFFSCREEN_ONSCREEN variable.
Also make it final static because its value never changes.
2010-02-03 16:00:49 +08:00
Megha Joshi
00bf0f0296
SampleSyncAdapter sample code.
2010-02-01 15:44:47 -08:00
Dianne Hackborn
1c2669905d
Fix sample code markers.
2010-01-29 19:12:05 -08:00
Dianne Hackborn
906d338680
Update to follow device policy "mode" to "quality" change.
2010-01-29 17:16:11 -08:00
Jack Palevich
d97a9e3b3b
Merge "Add API Demos showing how to use cube maps and frame buffer objects."
2010-01-29 14:28:47 -08:00
Jack Palevich
89282a6fd6
Add API Demos showing how to use cube maps and frame buffer objects.
2010-01-29 20:58:38 +08:00
James Yum
fc75835c87
am a3c89d73: am b8168f27: Merge "Market licensing server library core." into eclair
...
Merge commit 'a3c89d73bda785739b3396993c2491768bee2c23'
* commit 'a3c89d73bda785739b3396993c2491768bee2c23':
Market licensing server library core.
2010-01-28 15:31:04 -08:00
Romain Guy
4e0ee8e739
am 9c5363b0: am 897af093: Add uses-feature for live wallpaper sample.
...
Merge commit '9c5363b081dcbe1da924a274d7a57e20f85d1b60'
* commit '9c5363b081dcbe1da924a274d7a57e20f85d1b60':
Add uses-feature for live wallpaper sample.
2010-01-28 15:30:56 -08:00
Dianne Hackborn
c518e3ac44
Update to follow device policy API changes.
2010-01-28 13:16:10 -08:00
Dirk Dougherty
26d1fb0c8d
am 07b5c3bd: am c220077d: Merge "SDK doc change: Misc fixes." into eclair
...
Merge commit '07b5c3bdb76e7f4b4ceefb48e5cf11ed789bb0c2'
* commit '07b5c3bdb76e7f4b4ceefb48e5cf11ed789bb0c2':
SDK doc change: Misc fixes.
2010-01-28 12:37:28 -08:00
James Yum
a3c89d73bd
am b8168f27: Merge "Market licensing server library core." into eclair
...
Merge commit 'b8168f27f6f5b6b0ced5ef3210c0e89e8d3a5ae2' into eclair-plus-aosp
* commit 'b8168f27f6f5b6b0ced5ef3210c0e89e8d3a5ae2':
Market licensing server library core.
2010-01-28 10:51:19 -08:00
James Yum
b8168f27f6
Merge "Market licensing server library core." into eclair
2010-01-28 10:36:53 -08:00
Romain Guy
0c823a12e5
Add uses-feature for live wallpaper sample.
2010-01-28 07:30:54 -08:00
James Yum
f32f3b5e7b
Market licensing server library core.
...
new file: ILicenseResultListener.aidl
new file: ILicensingService.aidl
new file: LicenseChecker.java
new file: LicenseCheckerCallback.java
new file: Policy.java
new file: ResponseData.java
new file: StrictPolicy.java
new file: LicenseValidator.java
2010-01-27 18:51:48 -08:00
Romain Guy
9c5363b081
am 897af093: Add uses-feature for live wallpaper sample.
...
Merge commit '897af09372ca7c95db6c12554d9ff6fcec81ad58' into eclair-plus-aosp
* commit '897af09372ca7c95db6c12554d9ff6fcec81ad58':
Add uses-feature for live wallpaper sample.
2010-01-27 17:04:23 -08:00
Romain Guy
897af09372
Add uses-feature for live wallpaper sample.
...
Change-Id: I766d72ea79e8ef9530b2c485376a3429b530a00f
2010-01-27 16:55:38 -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
2086587ba4
Update sample admin with a description to uses-policies info.
2010-01-26 12:28:25 -08:00
Dirk Dougherty
07b5c3bdb7
am c220077d: Merge "SDK doc change: Misc fixes." into eclair
...
Merge commit 'c220077d52972356ff30d46d47def7669731f0d7' into eclair-plus-aosp
* commit 'c220077d52972356ff30d46d47def7669731f0d7':
SDK doc change: Misc fixes.
2010-01-22 16:49:51 -08:00
Dirk Dougherty
c220077d52
Merge "SDK doc change: Misc fixes." into eclair
2010-01-22 16:45:03 -08:00
Dirk Dougherty
e096b94573
SDK doc change: Misc fixes.
...
Bug: 2160782
Change-Id: I44d1d9687df45dae40a6922a37e6b410cc2de835
2010-01-22 15:18:15 -08:00
Xavier Ducrohet
5f063195d6
Move SDK files to froyo.
...
Change-Id: I55a5cb149982f1f30dc513ff018d8630d6513592
2010-01-22 14:46:05 -08:00
Dianne Hackborn
cc4ee91892
Start implementing UI for changing requested policies.
2010-01-21 14:30:29 -08:00
Derek Sollenberger
4fe6d38a68
Removing unused parameter from NP_Initialize.
2010-01-21 15:04:58 -05:00
Dianne Hackborn
877103b3f1
Merge "Initial sample code for writing a device policy."
2010-01-17 15:18:42 -08:00
Dianne Hackborn
c86ba3199d
Initial sample code for writing a device policy.
2010-01-16 18:01:37 -08:00
Derek Sollenberger
1645f9cab0
am aebdb460: am 1bc5ab62: Adding a new sub-plugin that gives visual feedback for navigation keys.
...
Merge commit 'aebdb4608541e3ffb158283bbc249b586ad9aa8f'
* commit 'aebdb4608541e3ffb158283bbc249b586ad9aa8f':
Adding a new sub-plugin that gives visual feedback for navigation keys.
2010-01-14 11:31:00 -08:00
Derek Sollenberger
aebdb46085
am 1bc5ab62: Adding a new sub-plugin that gives visual feedback for navigation keys.
...
Merge commit '1bc5ab625c5ca84a3e0f240b58327d8084af22a8' into eclair-mr2-plus-aosp
* commit '1bc5ab625c5ca84a3e0f240b58327d8084af22a8':
Adding a new sub-plugin that gives visual feedback for navigation keys.
2010-01-14 11:23:01 -08:00
Derek Sollenberger
1bc5ab625c
Adding a new sub-plugin that gives visual feedback for navigation keys.
2010-01-14 14:06:50 -05:00
Xavier Ducrohet
cd0c5185e2
am 7ae4c402: am 2f2fb96b: Make the SDK packaging put the samples in the root folder.
...
Merge commit '7ae4c4026a3e0596d32983003594abb0d3df80cc'
* commit '7ae4c4026a3e0596d32983003594abb0d3df80cc':
Make the SDK packaging put the samples in the root folder.
2010-01-12 13:12:19 -08:00
Xavier Ducrohet
7ae4c4026a
am 2f2fb96b: Make the SDK packaging put the samples in the root folder.
...
Merge commit '2f2fb96b4b037a016336a98e3b637f4394e1f323' into eclair-plus-aosp
* commit '2f2fb96b4b037a016336a98e3b637f4394e1f323':
Make the SDK packaging put the samples in the root folder.
2010-01-12 12:46:21 -08:00
Xavier Ducrohet
2f2fb96b4b
Make the SDK packaging put the samples in the root folder.
...
Change-Id: Icb88f88d503de9690ba210c0bfabdc0598021860
2010-01-12 12:32:12 -08:00
Derek Sollenberger
f0ef1b60fe
Merge "resolved conflicts for merge of a85d523b to master"
2010-01-11 14:13:18 -08:00
Derek Sollenberger
b81615148c
resolved conflicts for merge of a85d523b to master
2010-01-11 17:12:46 -05:00
Trevor Johns
e8ca26df95
am 7b48a646: am c7d2c458: Merge "Adding index file for BusinessCard sample. This will be displayed in the HTML documentation when this sample is selected via the Resource tab." into eclair
...
Merge commit '7b48a6463f960bf63f43e46900ef92bc3b867aa1'
* commit '7b48a6463f960bf63f43e46900ef92bc3b867aa1':
Adding index file for BusinessCard sample. This will be displayed in the HTML
2010-01-11 14:09:50 -08:00
Trevor Johns
7b48a6463f
am c7d2c458: Merge "Adding index file for BusinessCard sample. This will be displayed in the HTML documentation when this sample is selected via the Resource tab." into eclair
...
Merge commit 'c7d2c4580552a4921ed1f1fa78b0a180eb995193' into eclair-plus-aosp
* commit 'c7d2c4580552a4921ed1f1fa78b0a180eb995193':
Adding index file for BusinessCard sample. This will be displayed in the HTML
2010-01-11 14:05:34 -08:00