Yu Shan Emily Lau
cc72c4c2fd
am 1baa142c: do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
...
* commit '1baa142c06f3500f02dfc8d2fc15f5f70b77f3b0':
do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
2011-11-09 14:37:25 +00:00
Yu Shan Emily Lau
6b415b7d05
Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0
2011-11-08 16:03:19 -08:00
Yu Shan Emily Lau
1baa142c06
do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
...
Change-Id: Ia54463c93a7f941d7de3cc003ce773749d1f016e
2011-11-08 15:35:28 -08:00
Ken Wakasa
e53fd02f84
am c7160d8d: am c3b08379: Fix wrong paths to class references
...
* commit 'c7160d8dcb9861af67eea4b822889b3ce93be0b9':
Fix wrong paths to class references
2011-11-07 17:37:20 +00:00
Ken Wakasa
c7160d8dcb
am c3b08379: Fix wrong paths to class references
...
* commit 'c3b0837982378fc1277295fb2322e33f6414a0b9':
Fix wrong paths to class references
2011-11-07 16:44:19 +00:00
Ken Wakasa
c3b0837982
Fix wrong paths to class references
...
Change-Id: I778be2217165185fbb8eef08b8a232ea7ba986f0
2011-11-07 20:00:25 +09:00
Yu Shan Emily Lau
887527429d
do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
...
Change-Id: I21f83b96afc5c3a00a6570e8284adc23191b6dd2
2011-11-05 17:09:57 -07:00
Raphael
a2c602839d
am d960df40: cherrypick 76bd108d from master. do not merge.
...
* commit 'd960df40f2c762c02cc2b47c53444b9b0f8374f1':
cherrypick 76bd108d from master. do not merge.
2011-11-03 22:45:52 +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
4b148ed4f9
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:57:14 +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
Robert Ly
a3a8cfd25b
adding fountain framebuffer object sdk sample
...
Change-Id: I0156281baf450b4aafcd1d43bf5fd9ef8d4cb6cc
2011-11-02 15:30:37 -07:00
Eric Fischer
37ce92f9a2
am 92a00bb6: Import revised translations.
...
* commit '92a00bb671bc65612aa72d57ef0e601e80ecb12e':
Import revised translations.
2011-11-01 20:26:38 +00:00
Eric Fischer
92a00bb671
Import revised translations.
...
Change-Id: I7220d09a75e5372acdab213888ecd53665004c71
2011-11-01 13:19:12 -07:00
Svetoslav Ganov
ef9a8adcab
am c90e0d59: am bc43ef45: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0
...
* commit 'c90e0d59360db5bb1b94712fc87737c9ab2ce475':
Folding Accessibility Service sample into ApiDemos.
2011-10-31 20:32:42 +00: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
Ed Heyl
39858d19e9
Merge remote branch 'goog/ics-mr1' into ics-aah
2011-10-31 05:54:41 -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
Ed Heyl
595ae2826b
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
2011-10-28 19:05:45 +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
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
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
9d3c0fd8f6
undo reset to ics-mr1 until we have a better method
2011-10-26 21:53:16 +00:00
Ed Heyl
18faee9d08
reset to ics-mr1, but keep history
2011-10-26 18:50:11 +00:00
Ed Heyl
831d767c61
am b7b04d13: am f3515458: Merge remote branch \'goog/ics-mr0\' into ics-mr1
...
* commit 'b7b04d1368c1fa0a88450ab9e5258a1f38ae260e':
2011-10-26 07:45:37 -07:00
Svetoslav Ganov
2dfaabbe1e
am 04a5e5ef: am e824e690: (-s ours) Adding a code sample for how to write a custom action provider.
...
* commit '04a5e5eff4262bc1ec81a4692ab4a7234dfacca0':
Adding a code sample for how to write a custom action provider.
2011-10-26 07:45:36 -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
Ed Heyl
f35154588b
Merge remote branch 'goog/ics-mr0' into ics-mr1
2011-10-26 12:46:30 +00:00
Steve Block
58d8ea3ce6
am 629719e3: (-s ours) Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
...
* commit '629719e390ce66be822c3563bbd248ce15eaae7b':
Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
2011-10-26 04:48:18 -07: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
ca6ad3b17b
am bd147be5: Merge "SDK: package fastboot in platform-tools on 3 OSes."
...
* commit 'bd147be5e44147271af0c8a4506a25760e0c076b':
SDK: package fastboot in platform-tools on 3 OSes.
2011-10-24 18:20:25 -07:00
Raphael
bd147be5e4
Merge "SDK: package fastboot in platform-tools on 3 OSes."
2011-10-24 18:18:53 -07:00
Svetoslav Ganov
910a234e97
am 7d955852: Adding a code sample for using AccessibilityNodeProvider to report virtual Views.
...
* commit '7d9558522d0a3dc8004b05d97e043a5e8896e193':
Adding a code sample for using AccessibilityNodeProvider to report virtual Views.
2011-10-24 17:38:04 -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
005caa1562
am ded649b8: (-s ours) am 1a9f6bf7: (-s ours) CherryPick 676e13 from master to mr0. do not merge.
...
* commit 'ded649b809c3bf66fe54d98e8c0cd017f8a504be':
CherryPick 676e13 from master to mr0. do not merge.
2011-10-24 13:19:57 -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
d6e21ba66f
am a066d76f: am 43fe209e: Merge "Adding a code sample for how to write a custom action provider." into ics-mr0
...
* commit 'a066d76f59a95bac91a4a1d8207a7087b2e8a4cc':
Adding a code sample for how to write a custom action provider.
2011-10-24 12:48:37 -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
2d237315a3
am 140d57bb: Merge "Updated the Monkey runner to reflect changes to some private APIs it uses."
...
* commit '140d57bba7bc53b027df366e854a891203d5418c':
Updated the Monkey runner to reflect changes to some private APIs it uses.
2011-10-24 12:09:00 -07:00