65671 Commits

Author SHA1 Message Date
Jason Noguchi
365a4ca780 am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
  Adding time lapse test to mediaframework stress suite.
2012-02-28 11:49:36 -08:00
Jason Noguchi
ee32993095 Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 2012-02-28 11:47:46 -08:00
Svetoslav Ganov
4dc090684e am a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit 'a2b41b438d45570867e4682c0caaf93ace5e712e':
  NumberPicker showing IME when its input field  gains focus.
2012-02-28 10:35:28 -08:00
Svetoslav Ganov
a2b41b438d NumberPicker showing IME when its input field gains focus.
1. The NumberPicker was showing the IME if the input field
   gets focus and hiding it when the the arrows are pressed.
   The leads to a nasty behavior when the input is the first
   focusable and the uses presser an arrow button. In such
   a case the IME shows and hides on every arrow press pushing
   the window content up and down - this looks pretty ugly.
   Now the IME is show on double tap of the input field.

2. The NumberPicker input now by default has an IME action
   done, hence after editing it the IME goes away.

3. The NumberPicker input now clears focus when it gets
   IME action done, so the last picker in a sequence
   does not show selection which is focus driven.

4. NumberPicker was incorrectly detecting double tap to
   begin edit and it was possble to start edit on singe tap
   if the user has double tapped before to start an edit.
   Now double tap detection is using the double tap timeout
   correctly.

bug:6071977

Change-Id: I0ff5a491064e51663b3abec675d839d0a65b986a
2012-02-27 17:32:54 -08:00
RoboErik
17ea3ea01e Merge "Fix Audio ramping code" into ics-aah 2012-02-27 09:40:18 -08:00
Robert Ly
56d01eb1d6 am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1
* commit '85cb9dece27c7ebc29b48bd8e5dd3457fa3b6a87':
  docs: fix bug 5990526
2012-02-27 08:42:37 -08:00
Robert Ly
85cb9dece2 Merge "docs: fix bug 5990526" into ics-mr1 2012-02-27 08:40:54 -08:00
Xavier Ducrohet
a097f50bc6 am 44e63a21: Support rendering layout that use the new res-auto namespace.
* commit '44e63a218cf8fcab9b4418246a512bd0b0c9157b':
  Support rendering layout that use the new res-auto namespace.
2012-02-24 19:33:18 -08:00
Xavier Ducrohet
44e63a218c Support rendering layout that use the new res-auto namespace.
Change-Id: I9b89c965dc8c9458e74c15ab8ff765e16e1b32c2
2012-02-24 19:29:31 -08:00
RoboErik
1918d4353c Fix Audio ramping code
The audio ramping was being ignored and we were always adjusting
by the same amount.

Change-Id: I1dc122e033c382f556844c5acadcfb698c8d2092
2012-02-24 17:44:27 -08:00
Dianne Hackborn
46c2c10c20 am 5786f5cf: Merge "Fix build." into ics-mr1
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
  Fix build.
2012-02-24 16:24:45 -08:00
Dianne Hackborn
5786f5cf1b Merge "Fix build." into ics-mr1 2012-02-24 16:23:07 -08:00
Dianne Hackborn
b69b2c01b4 Fix build.
Change-Id: Id3262bff0df598ecc81a4346dee9febd3aaa60c9
2012-02-24 16:10:26 -08:00
Dianne Hackborn
37b5c7cb69 am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '133dc2d7aecc68990c363c861716b134910a4ced':
  Fix issue #6048808: sometimes auto-correct is inactive
2012-02-24 15:38:03 -08:00
Dianne Hackborn
133dc2d7ae Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 2012-02-24 15:36:33 -08:00
Dianne Hackborn
7663d80f6b Fix issue #6048808: sometimes auto-correct is inactive
My previous change to speed up the time the IME is dismissed was
fundamentally flawed.  That change basically switched the order
the application called the input method manager service from doing
startInput() and then windowGainedFocus(), to first windowGainedFocus()
and then startInput().

The problem is that the service relies on startInput() being done
first, since this is the mechanism to set up the new input focus,
and windowGainedFocus() is just updating the IME visibility state
after that is done.  However, by doing the startInput() first, that
means in the case where we are going to hide the IME we must first
wait for the IME to re-initialize editing on whatever input has
focus in the new window.

To address this, the change here tries to find a half-way point
between the two.  We now do startInput() after windowGainedFocus()
only when this will result in the window being hidden.

It is not as easy as that, though, because these are calls on to
the system service from the application.  So being able to do that
meant a fair amount of re-arranging of this part of the protocol
with the service.  Now windowGainedFocus() is called with all of
the information also needed for startInput(), and takes care of
performing both operations.  The client-side code is correspondingly
rearranged so that the guts of it where startInput() is called can
instead call the windowGainedFocus() entry if appropriate.

So...  in theory this is safer than the previous change, since it
should not be impacting the behavior as much.  In practice, however,
we are touching and re-arranging a lot more code, and "should" is
not a promise.

Change-Id: Icb58bef75ef4bf9979f3e2ba88cea20db2e2c3fb
2012-02-24 13:18:23 -08:00
Xavier Ducrohet
38b9ca514b am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85':
  Move the automatic namespace outside of the res namespace. do not merge.
2012-02-23 18:42:04 -08:00
inazaruk
f2ba32d2d7 am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit 'eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd':
  Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
2012-02-23 18:42:02 -08:00
Xavier Ducrohet
816b873df1 Move the automatic namespace outside of the res namespace. do not merge.
(cherry picked from commit d9fe8018ffbf94f18a840005e688ad1d712f0225)

Change-Id: I48ca78d5fccc75392b3f1cf9525890e5145293c4
2012-02-23 18:10:20 -08:00
inazaruk
eed8d0b3af Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
Added support for predefined namespace http://schemas.android.com/apk/res/auto
that aapt tool recognizes and treats as namespace with package name
taken from current application's AndroidManifest.xml, //manifest/package attribute.

Signed-off-by: inazaruk <ievgenii.nazaruk@gmail.com>

(cherry picked from commit e348909c1966c3d192841cc131a32be6ed90da18)

Change-Id: I4bff836c42a309bac36e5d1ce1899131b3c4c194
2012-02-23 18:09:31 -08:00
Joe Fernandez
e9d8d14bed am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
* commit '566328a2a5fcd8c40fc67d8974d6df0df48b0056':
  docs: NDK overview, remove x86 instruction set mention (b/6044027)
2012-02-23 14:25:08 -08:00
Joe Fernandez
566328a2a5 Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 2012-02-23 14:22:41 -08:00
John Grossman
4aea858564 Switch the way we configure for MediaPlayer retransmission.
Move in the direction of a more publishable API for configuring a
media player for retransmission.  It used to be that we used a custom
invoke and a modified URL (prefixed with aahTX://).  There are many
issues with this technique and it was never meant to stand the test of
time.

This CL gets rid of all that.  A new (but currently hidden) method was
introduced to the java level MediaPlayer API, called
setRetransmitTarget(InetSocketAddress), which allows an app writer to
set the retransmit target.  For now, this method needs to be called
before a call to setDataSource (which is pretty unusual for the
MediaPlayer API) because this mid level code uses this as a cue to
instantiate an aahTX player instead of relying on the data source to
select a player.  When retranmit functionality becomes part of the
existing android player implemenation, this
set-retrans-before-set-data-source behavior can go away, along with
the aahTX player itself.

Change-Id: I6ab07d89b2eeb0650e634b8c3b7a0b36aba4e7dd
2012-02-23 12:02:04 -08:00
John Grossman
fa4a191d0d Revert "Add a way to play file descriptor data sources using the A@H transmitter media player."
This reverts commit 64006cb1642b2ec0ee74c66007d869b884391fd1.

Back out this change in order to get ready to implement a longer term,
more media-team approved way of selecting a retransmit player.

Change-Id: I97b68b9859a174eab858598cb00d4445a14fbc17
2012-02-23 09:29:51 -08:00
Michael Jurka
af88907d0e am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit 'bf378fd7d7a91085685fe9e5528b84c485041c77':
  Don't allow screen invalidations to go outside bounds of screen
2012-02-23 08:08:09 -08:00
Michael Jurka
bf378fd7d7 Don't allow screen invalidations to go outside bounds of screen
Fixes invalidation issue in Launcher

Change-Id: Iab32149489aed6884e917f0ac5a548d4ae26896e
2012-02-23 00:19:58 -08:00
Jason Noguchi
27c8d9ba16 Adding time lapse test to mediaframework stress suite.
Change-Id: Ia244352cd16f77c090c4f1dad6f9b09a8b3e8f47
2012-02-22 16:46:37 -08:00
Scott Main
5b10e06a3e am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
* commit '68d97aa2c1ff16f327491fed5afb8b318f034a01':
  docs: fix broken link
2012-02-22 16:23:27 -08:00
Scott Main
68d97aa2c1 Merge "docs: fix broken link" into ics-mr1 2012-02-22 16:20:49 -08:00
Joe Fernandez
224741afda docs: NDK overview, remove x86 instruction set mention (b/6044027)
Change-Id: I37ee68fb78f2ed5edc1c34ff7198340b1ab5c49b
2012-02-22 15:52:53 -08:00
Xavier Ducrohet
a61f470dcc am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1
* commit '503247f213ef2894324a22e7608101e90a7fe8fb':
  Make sure resource references are resolved.
2012-02-22 10:49:24 -08:00
Xavier Ducrohet
503247f213 Merge "Make sure resource references are resolved." into ics-mr1 2012-02-22 10:47:32 -08:00
Robert Ly
51ec506596 docs: fix bug 5990526
Change-Id: Ife7e9a66c5fc23a9caa2c26046741880833f4b9a
2012-02-22 09:20:43 -08:00
Rich Hyndman
9156e9d139 am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1
* commit '942b823ce4b2e0e11d395dffb2d340de01811612':
  docs: Added Lint into Android Training and removed Layoutopt.
2012-02-22 03:43:32 -08:00
Rich Hyndman
942b823ce4 Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1 2012-02-22 03:41:05 -08:00
Dianne Hackborn
f3b7653c15 am 01011c3d: Fix issue #6037252: Screen shifts after all apps are upgraded
* commit '01011c3d7ce4f76c1a76b33a04fc63da784ddbea':
  Fix issue #6037252: Screen shifts after all apps are upgraded
2012-02-21 14:57:47 -08:00
Xavier Ducrohet
c3f979f6fe Make sure resource references are resolved.
XmlPullAttribute can query for attributes and return them in a given
format. We need to make sure they are first resolved before
trying to convert them to int/float/boolean/...

Change-Id: I2aaced022a0382e501978c396e49d6191d53bdc8
2012-02-21 14:33:37 -08:00
Dianne Hackborn
01011c3d7c Fix issue #6037252: Screen shifts after all apps are upgraded
Two things: (1) make sure the boot message is always positioned within
the entire unrestricted display, and (2) allow the dim background to go
on top of the nav bar when being used for the boot message (this latter
is really a hack that should be more generally fixed in the future).

Change-Id: I7261b044eb802a39cadff931b50a679ff18781d6
2012-02-21 13:54:21 -08:00
John Grossman
13bca89cd5 LibAAH_RTP: Add support for AAC in MP4.
Change-Id: Ie8298eb9d253fc6ede448da87660a60d23170987
2012-02-21 11:13:32 -08:00
Rich Hyndman
0980e41e97 docs: Added Lint into Android Training and removed Layoutopt.
Change-Id: Ib818ba3ab12fff79dbede69ebf543a8e4be6f3df
2012-02-20 12:49:10 +01:00
Mike Lockwood
06d4329f38 Merge "WifiStateMachine: Move wifi teardown delay to a framework resource" into ics-aah 2012-02-19 12:56:53 -08:00
Christopher Tate
842c99f7ea Merge "Add an empty stub status bar service implementation" into ics-aah 2012-02-17 17:23:04 -08:00
Christopher Tate
5717f80927 Add an empty stub status bar service implementation
For kiosk-type devices that do not present any navigation UI.  This allows
for clean selection of the implementation based on resource overlays,
without the need for the tablet or phone status bar implementations to
accomodate the desired behaviors.

Bug 5824373

Change-Id: Ia5aca7df70a11e632eaf9be6e67900ded8ea2f7d
2012-02-17 16:44:30 -08:00
Tsu Chiang Chuang
9379ba291b am 2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '2d559b5311be1cd909e5a445afe75a840688b822':
  fix NPE in race condition.
2012-02-17 15:55:49 -08:00
Tsu Chiang Chuang
2d559b5311 Merge "fix NPE in race condition." into ics-mr1 2012-02-17 15:53:50 -08:00
Adam Powell
0d89e18c7b am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks
* commit '482ae5f2388a07d60d7f3b54432120172af25eee':
  Bug 6021294 - Contextual action bar animation tweaks
2012-02-17 15:25:53 -08:00
Adam Powell
482ae5f238 Bug 6021294 - Contextual action bar animation tweaks
Remove the right-to-left cascade effect from action mode menu
items. Animation time is now fixed at 300ms for scaling in menu items.

Change-Id: I8eef2ed9f93c2af804663dd5e6b3f4915ed45cb1
2012-02-17 15:18:01 -08:00
Scott Main
ef0314b2c6 docs: fix broken link
Change-Id: I13e29ec18bb503ea33ee59d187f588c5be8fd109
2012-02-17 14:37:58 -08:00
Marc Blank
aaef6d6d18 am 094bf51e: Use &#39; for apostrophe in HTML encoding DO NOT MERGE
* commit '094bf51ec0911057263a27db4d79db4eface2d63':
  Use &#39; for apostrophe in HTML encoding DO NOT MERGE
2012-02-16 16:54:48 -08:00
Marc Blank
094bf51ec0 Use &#39; for apostrophe in HTML encoding DO NOT MERGE
* We were using &apos; which is not correct

Chery-pick of CL: https://android-git.corp.google.com/g/165367
2012-02-16 16:47:28 -08:00