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
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
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
Svetoslav Ganov
140d57bba7
Merge "Updated the Monkey runner to reflect changes to some private APIs it uses."
2011-10-24 12:05:50 -07:00
Eddy Talvala
8807dcadc5
am e53a7733: Merge "Added white balance settings to the camera Emulator."
...
* commit 'e53a773396e977793f5fed465d93068f345deb9a':
Added white balance settings to the camera Emulator.
2011-10-24 11:22:10 -07:00
Eddy Talvala
e53a773396
Merge "Added white balance settings to the camera Emulator."
2011-10-24 09:41:20 -07:00
Xavier Ducrohet
bef291d86f
am 676e13ff: Move the renderscript include files into platform-tools
...
* commit '676e13ff606ee52393d8f26e0d37826b9167fbd8':
Move the renderscript include files into platform-tools
2011-10-21 19:43:27 -07:00
Svetoslav Ganov
30073fb13b
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-21 18:30:40 -07:00
Xavier Ducrohet
676e13ff60
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: Ia5d3d155eeb45c546656123f8cc75d8efe6e631c
2011-10-21 16:25:21 -07:00
Svetoslav Ganov
7055af8dfb
am d9c6ed7e: am 44bec431: Merge "Adding a sample showing how to use the accessibility API in the compat library." into ics-mr0
...
* commit 'd9c6ed7ee8ca7eb0a5db3db44e60ea0a0b192645':
Adding a sample showing how to use the accessibility API in the compat library.
2011-10-21 12:03:19 -07:00
Svetoslav Ganov
d9c6ed7ee8
am 44bec431: Merge "Adding a sample showing how to use the accessibility API in the compat library." into ics-mr0
...
* commit '44bec4313178cfa6b3c3ba9cc634e350370df697':
Adding a sample showing how to use the accessibility API in the compat library.
2011-10-21 12:01:07 -07:00
Svetoslav Ganov
44bec43131
Merge "Adding a sample showing how to use the accessibility API in the compat library." into ics-mr0
2011-10-21 10:59:01 -07:00
Raphael
18d31cfb76
am e6f6b8fb: Merge "SDK: Fix missing min-tools-rev in platform source props"
...
* commit 'e6f6b8fb9bedbc04006ce7c7512ba3855ce17365':
SDK: Fix missing min-tools-rev in platform source props
2011-10-20 19:11:54 -07:00
Raphael
e6f6b8fb9b
Merge "SDK: Fix missing min-tools-rev in platform source props"
2011-10-20 19:10:39 -07:00
Ken Wakasa
0a887cf2d8
am f7ebe22f: am 562cd271: Remove a garbage file. Follow up to I938ba499.
...
* commit 'f7ebe22f1b20b9bfa49c889cd2c17448804bee89':
Remove a garbage file. Follow up to I938ba499.
2011-10-20 18:57:19 -07:00
Ken Wakasa
f7ebe22f1b
am 562cd271: Remove a garbage file. Follow up to I938ba499.
...
* commit '562cd2716939f5394a9a38d4f2a4841433653b1d':
Remove a garbage file. Follow up to I938ba499.
2011-10-20 18:55:51 -07:00
Ken Wakasa
562cd27169
Remove a garbage file. Follow up to I938ba499.
...
Change-Id: Id0b89c382339722b4c7c61e2bf35a05a947fc8aa
2011-10-21 10:48:24 +09:00
Svetoslav Ganov
bd9f43a8e8
Adding a sample showing how to use the accessibility API in the compat library.
...
NOTE: This affects only the SDK and not the system image.
bug:5485208
Change-Id: I2b086e880cfe147883a0db8222522710132d67a3
2011-10-20 18:33:59 -07:00
Christine Chen
12c0b21abe
Added white balance settings to the camera Emulator.
...
- Added the white balance control to the fake camera.
Change-Id: I5ada253a3ae7195ca5625a3601c9e4ed819fa2cc
2011-10-20 17:49:35 -07:00
Iliyan Malchev
0a390e475d
am 10fc4be1: a3dconvert: add -ldl for host builds
...
* commit '10fc4be16b2408c5e65d157407ede8dfcd8a88c1':
a3dconvert: add -ldl for host builds
2011-10-20 16:25:10 -07:00
Iliyan Malchev
10fc4be16b
a3dconvert: add -ldl for host builds
...
Change-Id: I6f594bc3d2e0e4306eee1719ee81e2ff53177aa6
Signed-off-by: Iliyan Malchev <malchev@google.com >
2011-10-20 16:20:45 -07:00