The Android Open Source Project
d169814ab1
Reconcile with ics-mr1-release
...
Change-Id: I4408759197de8cb777049a7581a77f29986b78f7
2011-11-04 08:31:12 -07:00
Raphael
860997a7f4
am d960df40: (-s ours) cherrypick 76bd108d from master. do not merge.
...
* commit 'd960df40f2c762c02cc2b47c53444b9b0f8374f1':
cherrypick 76bd108d from master. do not merge.
2011-11-03 22:47:35 +00:00
Raphael
d960df40f2
cherrypick 76bd108d from master. do not merge.
...
Change-Id: Ibb677f286b54a9dd593301a0f8b194d3b2dc58d1
SDK: update SDK to API 15
2011-11-03 15:42:39 -07:00
Robert Ly
65be1a5342
am cc1eef49: am 8e3c1951: Merge "adding fountain framebuffer object sdk sample" into ics-mr0
...
* commit 'cc1eef493524af0ce727927996b346312637c78a':
adding fountain framebuffer object sdk sample
2011-11-03 19:59:31 +00:00
Robert Ly
cc1eef4935
am 8e3c1951: Merge "adding fountain framebuffer object sdk sample" into ics-mr0
...
* commit '8e3c1951915010985db2abee212e8c4c37cacc53':
adding fountain framebuffer object sdk sample
2011-11-03 19:56:00 +00:00
Robert Ly
8e3c195191
Merge "adding fountain framebuffer object sdk sample" into ics-mr0
2011-11-03 12:54:02 -07:00
Raphael
4fbd948d15
Merge "SDK: update SDK to API 15"
2011-11-03 12:53:20 -07:00
Raphael
76bd108da7
SDK: update SDK to API 15
...
Change-Id: Ie6eecb86c441ef71a0677884be4c9fdfcd2737de
2011-11-03 12:31:37 -07:00
David Turner
a04badffcd
Merge "Native media sample app for NDK API level 14"
2011-11-03 04:46:21 -07:00
David Hu
63e5983c9b
Merge "Change the test to user the listener mechanism"
2011-11-02 20:11:20 -07:00
Glenn Kasten
e14b1a23af
Native media sample app for NDK API level 14
...
Change-Id: I72de0406eefb7ccf1a39944e814aa7c240d8184b
2011-11-02 18:04:54 -07:00
David Hu
acf95539c3
Change the test to user the listener mechanism
...
this is to avoid the precision issue with the coordinates
Change-Id: Icfab3fa6fd0a331aef12ee71c73bac04dc9685be
2011-11-02 17:01:23 -07:00
Robert Ly
a3a8cfd25b
adding fountain framebuffer object sdk sample
...
Change-Id: I0156281baf450b4aafcd1d43bf5fd9ef8d4cb6cc
2011-11-02 15:30:37 -07:00
Raphael
d18e045118
Merge "SDK: updating android Windows USB Driver."
2011-11-02 13:56:11 -07:00
Eric Fischer
3e22ceeefe
am 92a00bb6: Import revised translations.
...
* commit '92a00bb671bc65612aa72d57ef0e601e80ecb12e':
Import revised translations.
2011-11-02 17:30:45 +00:00
The Android Automerger
7da5f25160
merge in ics-mr1-release history after reset to ics-mr1
2011-11-02 06:45:30 -07:00
Eric Fischer
92a00bb671
Import revised translations.
...
Change-Id: I7220d09a75e5372acdab213888ecd53665004c71
2011-11-01 13:19:12 -07:00
The Android Automerger
0e91ad7563
merge in ics-mr1-release history after reset to ics-mr1
2011-11-01 06:45:26 -07:00
Svetoslav Ganov
d3837ae622
resolved conflicts for merge of c90e0d59 to master
...
Change-Id: I51f83d9a0df0c9b154936a669e458becec8b38f7
2011-10-31 17:22:41 -07:00
Svetoslav Ganov
c90e0d5936
am bc43ef45: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0
...
* commit 'bc43ef4554c457c499af9e5f998f6f79a484f4a3':
Folding Accessibility Service sample into ApiDemos.
2011-10-31 20:30:29 +00:00
Svetoslav Ganov
bc43ef4554
Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0
2011-10-31 13:28:53 -07:00
The Android Open Source Project
6e26392551
Reconcile with ics-mr1-release
...
Change-Id: I73e9ddce05e732bebb97a86e24c318b009ddceb7
2011-10-31 13:19:08 -07:00
Jack Palevich
a4591cb625
am 48a1cf10: am e864636c: Remove Graphics > OpenGL ES > Hidden Activity from Api Demos
...
* commit '48a1cf10af09f578221933a4e55109fbddf4c270':
Remove Graphics > OpenGL ES > Hidden Activity from Api Demos
2011-10-31 12:26:35 +00:00
The Android Automerger
a3fc6df0db
merge in ics-mr1-release history after reset to ics-mr1
2011-10-30 06:45:57 -07:00
Jack Palevich
48a1cf10af
am e864636c: Remove Graphics > OpenGL ES > Hidden Activity from Api Demos
...
* commit 'e864636c554efa18f83ad9fa405058b51d531998':
Remove Graphics > OpenGL ES > Hidden Activity from Api Demos
2011-10-29 03:15:18 +00:00
Svetoslav Ganov
101f061d35
Folding Accessibility Service sample into ApiDemos.
...
1. Moving Accerssibility Service sample into ApiDemos since
we are putting all accessibility samples there.
2. Fixed regressions (mainly due to adding new event types)
in the Accessibility Service sample.
3. Updated the Query Window Content sample to have some
instructions and to work with touch exploration.
Change-Id: I226ac4130f7f8cae47bb52cbdeab9f104cfaba40
2011-10-28 19:18:24 -07:00
Jack Palevich
e864636c55
Remove Graphics > OpenGL ES > Hidden Activity from Api Demos
...
This activity was accidentally added to the Api Demos manifest
in an earlier checkin.
Because the corresponding Java classes were never checked in,
the activity never actually worked.
Change-Id: I7a7c8c90e8e6b9689f87720fc7f4d53556c2f227
2011-10-28 15:45:43 -07:00
Xavier Ducrohet
1a551d3093
am 4001fcd4: am ded0dc05: Updated source.prop file for updated ICS SDK.
...
* commit '4001fcd43688e81934d3ecbd05187f4d3d9c7081':
Updated source.prop file for updated ICS SDK.
2011-10-28 22:27:24 +00:00
Xavier Ducrohet
4001fcd436
am ded0dc05: Updated source.prop file for updated ICS SDK.
...
* commit 'ded0dc055f64492894445b76fdce060ae9b98b90':
Updated source.prop file for updated ICS SDK.
2011-10-28 19:03:55 +00:00
Alexander Lucas
f574b1389f
resolved conflicts for merge of 1e94a78a (ApiDemos accessibility stuff) to master
...
Change-Id: I0b9d24c7aa527bd74c99cb6270fba5e3b9eae421
2011-10-28 11:55:45 -07:00
Xavier Ducrohet
ded0dc055f
Updated source.prop file for updated ICS SDK.
...
Change-Id: I935e8eb29ae52c56e4f897c69c808010b701e195
2011-10-28 11:27:07 -07:00
Alexander Lucas
1e94a78a1e
am 96c0210e: Adding ICS Accessibility Features to ApiDemos app.
...
* commit '96c0210eb57e60f03c23a8e504782a8ba4b9edfe':
Adding ICS Accessibility Features to ApiDemos app.
2011-10-28 17:26:20 +00:00
Alexander Lucas
96c0210eb5
Adding ICS Accessibility Features to ApiDemos app.
...
Change-Id: I37485821a77fed483308434e7b1d407642379d8c
2011-10-27 18:40:54 -07:00
Raphael
fb5178a947
SDK: updating android Windows USB Driver.
...
This makes it match Change I5508492c.
Change-Id: I191e77e2704efcecf509469f03d60eb395ecad2d
2011-10-27 15:43:22 -07:00
Jack Palevich
61ef1bce8f
am 060c9691: am 1163f69a: Fix activities that want to handle screen size and orientation changes themselves.
...
* commit '060c9691a18b877718b21339af5468898e7900aa':
Fix activities that want to handle screen size and orientation changes themselves.
2011-10-27 18:52:59 +00:00
Jack Palevich
060c9691a1
am 1163f69a: Fix activities that want to handle screen size and orientation changes themselves.
...
* commit '1163f69aac0e72ea3274c2516caa540accd418ca':
Fix activities that want to handle screen size and orientation changes themselves.
2011-10-27 18:49:41 +00:00
Jack Palevich
1163f69aac
Fix activities that want to handle screen size and orientation changes themselves.
...
In API level 13 the android:configChanges property was changed incompatably.
In API level 12 and below, an activity that wanted to handle screen size and orientation changes
could achieve that by specifying
android:configChanges="orientation"
Starting with API level 13 the activity must specify
android:configChanges="orientation|screenLayout|screenSize|smallestScreenSize"
This change updates all the activities in ApiDemos that want to handle screen size and orientation
changes themselves.
Fixes b/5522551 ApiDemos OpenGL ES rotation-without-restarting-Activity broken for API levels 13+
Change-Id: Ibc8b2b77eab9be279b56c026d76787d7185c62c9
2011-10-27 05:45:45 -07:00
Ed Heyl
b7b04d1368
am f3515458: Merge remote branch \'goog/ics-mr0\' into ics-mr1
...
* commit 'f35154588b584509529d4f9dfc217ef6abc7e981':
2011-10-26 14:43:20 +00:00
Svetoslav Ganov
04a5e5eff4
am e824e690: (-s ours) Adding a code sample for how to write a custom action provider.
...
* commit 'e824e69087b3ecdf18278b81e54b0fd554399db9':
Adding a code sample for how to write a custom action provider.
2011-10-26 14:43:19 +00:00
The Android Automerger
1a0bc43075
merge in ics-mr1-release history after reset to ics-mr1
2011-10-26 07:05:23 -07:00
Ed Heyl
f35154588b
Merge remote branch 'goog/ics-mr0' into ics-mr1
2011-10-26 12:46:30 +00:00
Svetoslav Ganov
e824e69087
Adding a code sample for how to write a custom action provider.
...
NOTE: This change does *not* affect the system image rather only the SDK.
bug:5499856
Change-Id: I589ed412b72e94b21dbe1f069006c7c527a06c71
2011-10-25 20:35:52 +00:00
Steve Block
629719e390
Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/#/c/143865
Bug: 5449033
Change-Id: Iad3a485eed0dc273d66607d30a7b9b79b02c03b6
2011-10-25 18:24:59 +01:00
Raphael
bd147be5e4
Merge "SDK: package fastboot in platform-tools on 3 OSes."
2011-10-24 18:18:53 -07:00
Svetoslav Ganov
7d9558522d
Adding a code sample for using AccessibilityNodeProvider to report virtual Views.
...
Note: This is a sample and does *not* affect the system image, rather only the SDK.
bug:5508317
Change-Id: I62bbef4b2a4c2789ddfa128e94ae37246d244ac0
2011-10-24 17:14:54 -07:00
Raphael
94a55ddf0b
SDK: package fastboot in platform-tools on 3 OSes.
...
SDK Bug: 21115
Change-Id: I0a5ded5ac085dce15f53d012c2ea33d82ede908b
2011-10-24 13:54:59 -07:00
Xavier Ducrohet
ded649b809
am 1a9f6bf7: (-s ours) CherryPick 676e13 from master to mr0. do not merge.
...
* commit '1a9f6bf710d1e437b62fe49ff616fca814066982':
CherryPick 676e13 from master to mr0. do not merge.
2011-10-24 13:18:14 -07:00
Xavier Ducrohet
1a9f6bf710
CherryPick 676e13 from master to mr0. do not merge.
...
Move the renderscript include files into platform-tools
The new unique compiler working for all target platforms requires to use
only the latest includes instead of using a different set per target
platforms.
By putting the include in the platform-tools, we ensure that they are
available no matter which platform has been donwloaded and are in sync
with the compiler.
Change-Id: Ib3e8e4e0b02956f60e7f1b4a2e8584a83a33d013
2011-10-24 13:14:51 -07:00
Svetoslav Ganov
a066d76f59
am 43fe209e: Merge "Adding a code sample for how to write a custom action provider." into ics-mr0
...
* commit '43fe209e574d2134adb5dabc76efb0ca81645fcc':
Adding a code sample for how to write a custom action provider.
2011-10-24 12:46:37 -07:00
Svetoslav Ganov
43fe209e57
Merge "Adding a code sample for how to write a custom action provider." into ics-mr0
2011-10-24 12:07:02 -07:00