65360 Commits

Author SHA1 Message Date
Eric Fischer
b14ecd2684 Merge "Import translations. DO NOT MERGE" 2012-01-26 14:26:10 -08:00
Alon Albert
11afa8a466 Throw NPE if s is null
Bug: 5926510
Change-Id: I3d0a38d31695a8b103b3d153d90d83474f56990e
2012-01-26 14:25:19 -08:00
Glenn Kasten
789fef1f83 Use enum mixer_state consistently
Change-Id: I5b71ed20f939dfc4b98143334b7aa064d282f584
2012-01-26 14:23:47 -08:00
Eric Fischer
3b5e2c3bde Import translations. DO NOT MERGE
Change-Id: I9ecc6b7fd129f9b430d96e4d65c656a2b71bd0af
2012-01-26 14:21:26 -08:00
Nick Pelly
1f5badc1cb Add NdefMessage.getByteLength(), and more minor fixes:
Remove NdefMessage from dispatch(). It's already in the Tag.
/*package*/ cleanup
Fix sitemap after removal of NFCDemo

Change-Id: Ie1f6d9ea98144aa97f56bb709a33f5d0ef916e8b
2012-01-26 14:21:19 -08:00
Glenn Kasten
452d6d6efe Use enum effect_state consistently
Also fix indentation

Change-Id: I393ef9e37ffceed5ad4a78df439726ae1fe139df
2012-01-26 14:20:34 -08:00
Glenn Kasten
563562032d Use enum track_state consistently
Change-Id: Ie5ebb7befa092e1de1e4df9c6e2d51e6bcfd176a
2012-01-26 14:13:43 -08:00
Gilles Debunne
e93c51713c Merge "Modified algorithm to remove duplicated suggestions" 2012-01-26 14:09:20 -08:00
Gilles Debunne
89429a4211 Merge "Remove @deprecate in View's fadingEdge" 2012-01-26 14:09:00 -08:00
Stephen Hines
caaac348ed Merge "Fix bugs with unsigned rsAtomicCas/Max/Min." 2012-01-26 13:55:57 -08:00
Gilles Debunne
259c109046 Remove @deprecate in View's fadingEdge
The comment of this field is also aggregated in the android.R.styleable#View
description. As a result, the @deprecated in the comment of this field also
applies to android.R.styleable#View which incorrectly appears deprecated.

This fixes the problem, although fadingEdge will no longer be marked as
deprecated in IDEs. I believe it is less important that to make View
deprecated.

Change-Id: I96d8e868001c4c853eb1536f8401275b9b1e689b
2012-01-26 13:46:25 -08:00
Roman Nurik
3ba792c7f4 docs: Update designing-navigation training class to link to Android Design
Change-Id: I1cdda032f31798f9a32b7bec583dcfaa6eafb8c2
2012-01-26 13:12:22 -08:00
Daniel Sandler
70828a1d40 am 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
* commit '5b08738a62ece5bf0ca5d22a6f062e2fb67af272':
  Suppress mobile-out-of-service label if wifi connected.
2012-01-26 13:04:17 -08:00
Daniel Sandler
5b08738a62 Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1 2012-01-26 13:02:32 -08:00
Chet Haase
53f2d55740 Fix old issue with compatibility-scaled apps and Animations
Previously, we'd pass in a scale factor (based on whether the app was
being scaled by the compatibility mode) to Animation.getTransformation().
This scales the pivot point of the animation based on thes cale factor.
However, the pivot points were already using information that took the
compatibility mode scale into account. For example, using ABSOLUTE and basing
pixel values on the width/height of the view would give you values relative to the
width/height of the view (pre-scaled). Using RELATIVE_TO_* would use percentages
for the pivot point, again taking the scaling of the view into account. So scaling
the pivot point added in another scale on top of that already being applied.

The net effect was to scale the pivot point in cases where it should not be scale.
For example, setting a pivot point to half-way (.5 and RELATVE_TO_SELF) would
end up with an animation that would pivot around the bottom/right of the view.

The fix is to simply remove the scale factor being passed in; we've already accounted
for it in the pivot point, so we shouldn't concatenate it into the transform
calculated by the animation.

Change-Id: I9daa7581b1b9d0dfb10515e96947160c28c5130e
2012-01-26 12:44:46 -08:00
Daniel Sandler
62a1eb8972 Suppress mobile-out-of-service label if wifi connected.
Carrier name is shown if
 - in service and connected to mobile data
 - in service and connected to wifi

Carrier name is blanked if out of service and connected to
wifi.

"No internet connection" is shown if out of service without
any other route.

Bug: 5903914
Change-Id: I59d4d0c90e4153d73c38f7f0e150becf7e021a5b
2012-01-26 15:35:03 -05:00
Scott Main
7e4ef61732 am 2de74f5f: am 6c055bbd: docs: add action bar icons ZIP
* commit '2de74f5fa9acc5fae5fc09aad861c13f7162d5cb':
  docs: add action bar icons ZIP
2012-01-26 11:47:35 -08:00
Scott Main
2de74f5fa9 am 6c055bbd: docs: add action bar icons ZIP
* commit '6c055bbdf475e6cd324912326c802244b9a76c3b':
  docs: add action bar icons ZIP
2012-01-26 11:44:58 -08:00
Scott Main
6c055bbdf4 docs: add action bar icons ZIP
Change-Id: Id38d82655d6bcc468890a4db93a19ac4e385db13
2012-01-26 11:35:20 -08:00
Ben Cheng
f429ff7077 Merge "Preserve NEON callee-save registers d8-d15." 2012-01-26 11:16:59 -08:00
Ben Cheng
44094486b0 Preserve NEON callee-save registers d8-d15.
BUG:5918479
Change-Id: I574bd5845d9e7e007c637aabbf170d03217d10ad
2012-01-26 10:34:52 -08:00
Svetoslav Ganov
c6fd88e213 Incorrect behavior of View clear focus.
The framework tries to have a focused view all the time. For
that purpose when a view's focus is cleared the focus is given
to the first focusable found from the top. The implementation
of this behavior was causing the following issues:

1. If the fist focusable View tries to clear its focus it
   was getting focus but the onFocusChange callbacks were not
   properly invoked. Specifically, the onFocusChange for
   gaining focus was called first and then the same
   callback for clearing focus. Note that the callback
   for clearing focus is called when the View is already
   focused. Also note that at the end the View did not
   clear its focus, hence no focus change callbacks
   should be invoked.

2. If not the first focusable View tries to clear focus,
   the focus is given to another one but the callback
   for getting focus was called before the one for clearing,
   so client code may be mislead that there is more than
   one focused view at a time.

3. (Nit) The implementaion of clearFocus and unFocus in ViewGroup
   was calling the super implementaion when there is a
   focused child. Since there could be only one focused View,
   having a focused child means that the group is not focused
   and the call to the super implementation is not needed.

4. Added unit tests that verify the correct behavior, i.e.
   the focus of the first focused view cannot be cleared
   which means that no focus change callbacks are invoked.
   The callbacks should be called in expected order.
   Now the view focus clear precedes the view focus gain
   callback. However, in between is invoked the global
   focus change callback with the correct values. We may
   want to call that one after the View callbacks. If
   needed we can revisit this.

Change-Id: Iee80baf5c75c82d3cda09679e4949483cad475f1
2012-01-25 23:38:31 -08:00
Jim Miller
93708af132 Fix 5620754: don't show pattern unlock after SIM unlock if not enabled.
This fixes a bug where the device would show pattern unlock after the user
entered the SIM PUK unlock code.  The code now correctly determines that
the device isn't secure and thus shouldn't show the unlock screen.

Change-Id: I49fd749592154a4c5840038b92d54ca7ca086074
2012-01-25 18:26:12 -08:00
Stephen Hines
109116bb2f Fix bugs with unsigned rsAtomicCas/Max/Min.
BUG=5888007

rsAtomicMax/Min did not have proper semantics for unsigned integers. They were
always using signed comparisons. rsAtomicCas had the wrong function signature
in our math library, leading to no way to properly link/execute it.

Change-Id: I336cdd8cd9f2d8093f12e101b55b2797515f039b
2012-01-25 18:17:34 -08:00
Scott Main
9413752f30 am e7ffc5a6: am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit 'e7ffc5a6335c5da24af9e2d6ffde6d6e4b8e5a23':
  docs: remove the 1.0 icon template pack
2012-01-25 18:03:20 -08:00
Scott Main
e7ffc5a633 am 9ac4dd82: Merge "docs: remove the 1.0 icon template pack" into ics-mr1
* commit '9ac4dd828065410efbb380992d996c7e93daf437':
  docs: remove the 1.0 icon template pack
2012-01-25 18:00:42 -08:00
Scott Main
9ac4dd8280 Merge "docs: remove the 1.0 icon template pack" into ics-mr1 2012-01-25 17:58:54 -08:00
Scott Main
8a89e93ba4 am 1f9026ca: am f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
* commit '1f9026caf1af0f7d3eb9de81641ac290fd340b4b':
  docs: remove ADL presentation PDFs to conserve site space
2012-01-25 17:54:48 -08:00
Scott Main
3fe452906d docs: remove the 1.0 icon template pack
Change-Id: Ia73426f67b95bc3c5aa39150a6518ee28a215b42
2012-01-25 17:54:28 -08:00
Scott Main
1f9026caf1 am f466db14: Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1
* commit 'f466db14ec32fbaf08a868df40f7685a7e7df3db':
  docs: remove ADL presentation PDFs to conserve site space
2012-01-25 17:52:08 -08:00
Scott Main
f466db14ec Merge "docs: remove ADL presentation PDFs to conserve site space" into ics-mr1 2012-01-25 17:50:20 -08:00
Scott Main
948eb9b29e docs: remove ADL presentation PDFs to conserve site space
Change-Id: Ie606dc02943eb27a318b183b8ebd7201e3ee38bb
2012-01-25 17:47:46 -08:00
Joe Malin
bf80175cca am ba8dd79f: am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics
* commit 'ba8dd79f4eb690fc7922fc4c9b0507d901a2d320':
  DOC CHANGE: New Content Provider topics
2012-01-25 17:33:06 -08:00
Joe Malin
ba8dd79f4e am 9f426604: am a2a46f62: DOC CHANGE: New Content Provider topics
* commit '9f426604e6f21e31f8a2194dcff0ea7bf488eee2':
  DOC CHANGE: New Content Provider topics
2012-01-25 17:30:13 -08:00
Joe Malin
9f426604e6 am a2a46f62: DOC CHANGE: New Content Provider topics
* commit 'a2a46f629446af0935e8ebbbd7cdb55e395f79f3':
  DOC CHANGE: New Content Provider topics
2012-01-25 17:27:46 -08:00
Svetoslav Ganov
758d97c312 Merge "Fixing failing focus tests" 2012-01-25 17:09:54 -08:00
Gilles Debunne
7af1f9669b Fix for IOOB when suggestions have disappeared
This new test is required since the suggestion popup is now triggered by a
Runnable. We have to make sure there is still at least one SuggestionSpan
at that position.

Change-Id: I5c84ba0ca412f51a0201bee5c2e63b5bd3717338
2012-01-25 17:06:38 -08:00
Svetoslav Ganov
36a561b4ee Fixing failing focus tests
Change-Id: I3df6a72f6340cbf2e42ce4913e28471e9358088b
2012-01-25 17:05:04 -08:00
Teng-Hui Zhu
99b46be97b Merge "Make sure WebView get notified before the EGL context destroyed." 2012-01-25 16:53:05 -08:00
Dianne Hackborn
52da22f273 Merge "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc." 2012-01-25 16:15:43 -08:00
Gilles Debunne
868121f296 Handle tap and move cursor before showing suggestions
Otherwise the suggestions do not correspond to the tapped location.

Change-Id: Id0bd87931e73513ca7e50c6212a17b0fc7d6179d
2012-01-25 15:38:27 -08:00
Teng-Hui Zhu
096f5579cb Revert "Hack to workaround the fact that the EGL context can be"
This reverts commit 2bc0b01ffe481af877de312f3a87fa769642d2f4.

A hack no longer needed.

Change-Id: Ia5162535e6683919c368f93428bac0fb258af506
2012-01-25 15:25:03 -08:00
Teng-Hui Zhu
a34eb91a20 Make sure WebView get notified before the EGL context destroyed.
bug:5639899

Change-Id: Id778cf3dac1d2f6d6b8014b7a911b51dc14fcc8a
2012-01-25 15:23:59 -08:00
Dianne Hackborn
d96e3dfa02 Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
2012-01-25 15:14:50 -08:00
Gilles Debunne
3f696b264e Merge "Unbalanced batch edit begin and end leave TextView unresponsive" 2012-01-25 15:08:29 -08:00
Gilles Debunne
6e0b22bea9 Modified algorithm to remove duplicated suggestions
Bug 5916225

Duplicates were removed when received from SpellChecker, in a way
that could move the top candidates lower in the list.

Moved that code to the part that creates the actual suggestion list,
to make it more generic. The order of the first SuggestionSpan is
guaranteed to be respected.

Also mentionned non null suggestions and fixed a problem in SuggestionSpan
constructor.

Change-Id: Iaa3b1b84ae512451e439e5c5e63448c2a19145b5
2012-01-25 15:07:50 -08:00
Fabrice Di Meglio
842e379074 Merge "Update Javadoc for InputConnection.deleteSurroundingText()" 2012-01-25 14:52:40 -08:00
Gilles Debunne
c6854d43fc Merge "TextView's display list updated on layout" 2012-01-25 14:07:08 -08:00
Wink Saville
b675f516da Merge "Add additional debug" 2012-01-25 14:04:59 -08:00
Wink Saville
c7d7eafb66 Add additional debug
When ConnectivityService#startUsingNetworkFeature is called and the
special network is not available output some additional information.

Change-Id: I34b226a208596fa6418f1f37a0feec1d274d493c
2012-01-25 13:47:54 -08:00