69208 Commits

Author SHA1 Message Date
John Reck
afeecb0740 Merge "Fix focus rings for buttons" 2012-03-06 18:22:14 -08:00
John Reck
ef109b0b70 Fix focus rings for buttons
Bug: 6124914

Change-Id: I8cb63de2636afc297756de7733de7bdda920b694
2012-03-06 18:02:11 -08:00
Adam Powell
494e155a5a Merge "Fix some action bar menu layout bugs around config changes" 2012-03-06 17:43:48 -08:00
Adam Powell
f203e0a44e Fix some action bar menu layout bugs around config changes
Bug 5712010

Fix cases where the transition between split/standard action bar menu
presentation wasn't happening properly for windows in activities that
handle their own config/orientation changes.

Change-Id: I7168555e09c9ed448afb8619fd6f0e1466695365
2012-03-06 17:42:47 -08:00
Jeff Sharkey
a197e37f7f Caliper benchmarks for Parcel.
Bug: 6111276
Change-Id: I4b89e4c14d2dc20e71bbaed78f285e6d539a1f0f
2012-03-06 17:21:01 -08:00
Michael Jurka
7e52caf6db Don't draw layers in buildLayer()
Creating the layer, if necessary, takes the bulk
of the time - just do the creation, and schedule a
deferred update

Change-Id: I21399ebd5d2929a4f242ec1c08e3f97fed1ef58a
2012-03-06 17:18:00 -08:00
Wink Saville
d28111f4f8 Merge "Telephony: Create and use UiccController" 2012-03-06 17:13:16 -08:00
Wink Saville
22c1700378 Telephony: Create and use UiccController
UiccController creates and disposes IccCard
IccRecords and IccFileHandler is part of IccCard

Change-Id: I3dfb476c76162bbe8443271927a06743bb5e39c4
2012-03-06 17:11:49 -08:00
John Reck
e6725bcba5 Merge "Fix unhandled navigation path" 2012-03-06 17:05:48 -08:00
John Reck
ff8025b994 Merge "Fix FOCUS_BACKWARD search if view had no id" 2012-03-06 17:04:13 -08:00
Eric Fischer
f712747333 Mark all of config.xml not translatable in the top-level comment.
Change-Id: Ic123e5db57e47d4aa6cc85e703949ded4a2b468c
2012-03-06 17:03:47 -08:00
Jeff Brown
bba4179dc8 Merge "Don't close the database until all references released." 2012-03-06 16:51:13 -08:00
Alex Sakhartchouk
e51ae26282 Adding more modes to the sampler test app.
Fixing pixel placement.

Change-Id: I355cc611ebe0bfb15af96cc498604d9b9fa1a9d3
2012-03-06 16:43:28 -08:00
Glenn Kasten
ffed04ac3c IAudioFlingerClient::ioConfigChanged param2 const
The 3rd parameter (param2) to AudioFlingerClient::ioConfigChanged
is used as an input.  So changed it from void * to const void *.
It is then cast to const OutputDescriptor *
or const audio_stream_type_t * depending on the event.

Change-Id: Ieec0d284f139b74b3389b5ef69c7935a8e5650ee
2012-03-06 16:43:19 -08:00
Jeff Brown
03bd302aeb Don't close the database until all references released.
SQLiteDatabase.close() should call releaseReference() rather than
closing the database immediately.  SQLiteDatabase should also hold
a reference to itself while performing certain operations to
ensure that they complete normally even if another thread closes
the database at the same time.

Fixed a couple of missing or redundant uses of acquireReference()
related to CursorWindows.

To be honest, the reference counting performed by SQLiteClosable should
not be needed, but we're stuck with it in the API.

Bug: 6104842
Change-Id: I3444a697409905d4a36b56418dc7766f5ba76b59
2012-03-06 16:42:56 -08:00
Eino-Ville Talvala
e69095869c NEW_API: Rework CameraSound into MediaActionSound, and unhide it.
MediaActionSound is a helper class for applications that use the
camera, or include camera-like behavior such as taking
screenshots. This class helps applications match the sound-playing
behavior of the Camera.takePicture, MediaRecorder.start, and
MediaRecorder.stop methods.

This is useful for applications that don't use the above methods, but
still logically capture images or video, such as the panorama capture
feature and the video effects in the platform camera application.

Bug: 5029099
Change-Id: I829f6e2941f167f91f9cb506215b7232cb054958
2012-03-06 16:33:50 -08:00
Glenn Kasten
b7a4007563 Merge "Rename fields of AudioSessionRef" 2012-03-06 16:22:30 -08:00
Glenn Kasten
bf10657c8e Add comments about sequence for setting parameters
Change-Id: Iffa59a34c3c47bdc1d3234cdcb4d8ff99c102825
2012-03-06 16:18:17 -08:00
Scott Main
99e790de9e docs: add troido adk link
Change-Id: Ib7cb1dd821dc17ffc8acd02843218e6d21e15295
2012-03-06 16:17:08 -08:00
John Reck
1ecebbb27f Fix FOCUS_BACKWARD search if view had no id
Bug: 6126875

Change-Id: I113a7125d71dc3e6cc34d31a669e844a4a882266
2012-03-06 16:08:54 -08:00
John Reck
4fa40371b3 Fix unhandled navigation path
Bug: 6109044
 Tab keys are handled via canTakeFocus & takeFocus (new path)
 Arrow keys are handled by seeing if the keyDown was unhandled (similar to old path)

Change-Id: I825de102de31443b1383a8126992c65a4957dcce
2012-03-06 15:38:09 -08:00
Glenn Kasten
6be5247cc5 Merge "Fix indentation for re-organized code" 2012-03-06 15:23:58 -08:00
Roman Nurik
23b39217a5 am ce8697f8: am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
* commit 'ce8697f8d5368aa617b853fdabb6d7fb980bc5ce':
2012-03-06 14:54:19 -08:00
Android Git Automerger
30e9f8807e Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-03-06 14:54:13 -08:00
Roman Nurik
f4d8fa6090 am c4b44be6: am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
* commit 'c4b44be63d0dd315ddc499c3e939af0f4b5de594':
  docs: move Android Design from static HTML to JD
2012-03-06 14:45:19 -08:00
Roman Nurik
ce8697f8d5 am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
* commit '96c757e557ed40da4400b82fd62dfbd4bc8151d1':
  docs: move Android Design from static HTML to JD
2012-03-06 14:43:38 -08:00
Roman Nurik
c4b44be63d am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
* commit '96c757e557ed40da4400b82fd62dfbd4bc8151d1':
  docs: move Android Design from static HTML to JD
2012-03-06 14:42:59 -08:00
Roman Nurik
96c757e557 Merge "docs: move Android Design from static HTML to JD" into ics-mr1 2012-03-06 14:39:54 -08:00
Scott Main
30f954dd2d am bf03ee12: am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
* commit 'bf03ee12dba1504f8733297158a412b3eab40deb':
  Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
2012-03-06 14:28:44 -08:00
Scott Main
842b4e22e3 am fff19ee8: am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
* commit 'fff19ee88baff16e144d1bfc23c25a4b7f2cb191':
  Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
2012-03-06 14:28:37 -08:00
Scott Main
fff19ee88b am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
* commit '66895ad5f7cdb9a8a292c9e6c04347a10b4212a3':
  Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
2012-03-06 14:25:27 -08:00
Scott Main
bf03ee12db am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1
* commit '66895ad5f7cdb9a8a292c9e6c04347a10b4212a3':
  Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
2012-03-06 14:24:55 -08:00
Scott Main
66895ad5f7 Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1 2012-03-06 14:23:23 -08:00
Nicolas Roard
b4827c089f Merge "Pass the version down to native" 2012-03-06 14:13:54 -08:00
Scott Main
3f6912e5e8 am f3cbcf43: am 97b94e78: docs: a few more Market -> Play strings
* commit 'f3cbcf439692b180ec5081cc68ed67c8f2a9d16d':
2012-03-06 14:01:48 -08:00
Scott Main
15b7481d34 am 40dbc3db: am 97b94e78: docs: a few more Market -> Play strings
* commit '40dbc3db62006f81656043e174e9019c89686e9b':
  docs: a few more Market -> Play strings
2012-03-06 13:59:34 -08:00
Scott Main
f3cbcf4396 am 97b94e78: docs: a few more Market -> Play strings
* commit '97b94e784c012ca2bff273ff74a00c6eadd1a1a2':
  docs: a few more Market -> Play strings
2012-03-06 13:58:04 -08:00
Scott Main
40dbc3db62 am 97b94e78: docs: a few more Market -> Play strings
* commit '97b94e784c012ca2bff273ff74a00c6eadd1a1a2':
  docs: a few more Market -> Play strings
2012-03-06 13:57:32 -08:00
Gilles Debunne
957c800ac0 Merge "Ellipsize avoids spaces and starts right after text" 2012-03-06 13:57:16 -08:00
Glenn Kasten
dbaf2cc1bf Merge "Rename updateWaitTime since a lock is held" 2012-03-06 13:44:56 -08:00
Glenn Kasten
2bad67f3e3 Rename updateWaitTime since a lock is held
Change-Id: I9bb978cbd0debf5b21676467060f72eebafea3e6
2012-03-06 12:46:21 -08:00
Roman Nurik
b99ae73cc5 docs: move Android Design from static HTML to JD
Change-Id: I6e451599998cb8b69489cada482ab5db9d71d6f8
2012-03-06 12:26:15 -08:00
Glenn Kasten
26bbc5c0d3 Fix indentation for re-organized code
Change-Id: I63471cebdbd095b7ad4e481611b785f9b02c7941
2012-03-06 12:14:54 -08:00
Scott Main
97b94e784c docs: a few more Market -> Play strings
Change-Id: Icd09ec82362ff9aac511260f0fa295ddbc7e1369
2012-03-06 12:10:17 -08:00
Adam Powell
75d022af1f Action buttons are now 1 view instead of 3.
Change-Id: I42afe0e4bd20c3dbe86e2c43a6bc1d776361dca9
2012-03-06 12:06:15 -08:00
Nicolas Roard
18e9886342 Pass the version down to native
Change-Id: Ie240ea9875862288cf09fcfa1113b8e6cb3a7b1d
2012-03-06 11:53:56 -08:00
Fabrice Di Meglio
42b40c0ed8 Merge "Fix bug #4972463 Update CTS tests for TextView textDirection" 2012-03-06 11:48:14 -08:00
Scott Main
19fa8fee25 Fix badge generator URLs and images, and update
script to generate different alt text for the different button styles.
Also change homepage announce link for blog post.

Change-Id: Ibbdc2e8abad3c218d030299eb60ba5bee75db232
2012-03-06 11:46:30 -08:00
Glenn Kasten
9a42ac982e Rename fields of AudioSessionRef
Change-Id: I9f2a66094135c4ac6bec2d3e9db3ac5fbf988ede
2012-03-06 11:43:55 -08:00
Robert Greenwalt
06402e91e9 Merge "Make NDC not block forever and handle restart." 2012-03-06 11:30:28 -08:00