25853 Commits

Author SHA1 Message Date
Fabrice Di Meglio
cdc6d5cf88 Merge "Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev 2012-11-28 19:08:45 -08:00
Adam Powell
66cedab63b Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev 2012-11-28 19:06:51 -08:00
Adam Powell
10479a29cb Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev 2012-11-28 19:03:01 -08:00
Adam Powell
7232b0ad67 Fix time-related ScaleGestureDetector methods
Bug 7626515

Change-Id: Ie7abf9c166284a74b4e7bcf9de25520cf08e3b2d
2012-11-28 18:29:22 -08:00
Dianne Hackborn
860d0cd452 Merge "Cleaner initial boot." into jb-mr1.1-dev 2012-11-28 18:19:25 -08:00
Dianne Hackborn
13579ed330 Cleaner initial boot.
This does some cleanup of the initial boot, especially when
booting in "no core apps" mode for encryption/decryption.

Change-Id: Ifb3949f580e52f54559e603c4b0b104f6bac2f6c
2012-11-28 18:09:01 -08:00
Adam Cohen
035352b4d6 Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 2012-11-28 17:47:22 -08:00
Fabrice Di Meglio
13705eda8c Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode
- fix onMeasure() in RTL mode: need to compute width before computing layout params
that are used for layout
- fix getRelatedView() so that it uses the resolved rules
- add some extra "final" statements

Change-Id: I7c3bf841cd18c5f77b010a9be20fa78069e88d94
2012-11-28 17:13:54 -08:00
Adam Cohen
d9e5af3851 Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
Change-Id: I25acb7bde2e8e5ac3185a009f5c7151b81f0ae19
2012-11-28 16:36:56 -08:00
Fabrice Di Meglio
71175f727b Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev 2012-11-28 15:05:55 -08:00
Dianne Hackborn
68e0da7e39 Merge "Quiet down a lot of logging." into jb-mr1.1-dev 2012-11-28 15:03:39 -08:00
Fabrice Di Meglio
b878ddb56e Fix bug #7621927 Radio button/TextView drawable regression in 4.2
- as we remove the 9 patch padding trick, we need also to do the correct
positioning of the radio / checkbox / star during draw

Change-Id: I02b67bef9c0f2dc1c0c65361de14ab20ce9b881d
2012-11-28 11:59:27 -08:00
Adam Powell
1cf2ca8358 Clean up behavior of type arguments for MediaRouter#getSelectedRoute
MediaRouter's policy so far has been around a single selected route,
but when route types are entirely orthogonal this should not be the
case. However we still don't want to get into a situation where we
have multiple, very different routes selected for different types at
the same time, we still want to have more of an element of
predictability.

Behavior of getSelectedRoute is now:

* If the selected route matches at least one type with the requested
  type flags, it is still considered selected for that request.

* If the caller specifically requested the selected user route and the
  currently selected route is not a user route, return null.

* If the requested type flags do not match any types with the selected
  route, return the default system route.

Note that this is "any" behavior instead of "all" - this matches
existing usage of the method. We may consider adding an "all" variant
later on.

Bug 7588042

Change-Id: I3a79d8153ca6b882fd3ef6b9b1de8f538873dec2
2012-11-28 11:22:01 -08:00
Scott Main
7538ff0920 am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev
* commit '35473e6e6d2d17c859173ca0cf0dfdcfcb0b4663':
  docs: update dreamservice description
2012-11-28 10:40:18 -08:00
Scott Main
35473e6e6d Merge "docs: update dreamservice description" into jb-mr1-dev 2012-11-28 10:05:54 -08:00
Andreas Huber
f0afad008b Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev 2012-11-28 09:39:27 -08:00
Dianne Hackborn
40e9f2922c Quiet down a lot of logging.
Also fix a little problem where the USER_STARTED broadcasts
were not being sent as ordered broadcasts(!).

Change-Id: I3aa3e0a9b3900967cdd2d115ee103371b0a50c41
2012-11-27 19:12:23 -08:00
Daniel Sandler
bf0e106a7d Merge "Cleanups in Notification.java." into jb-mr1.1-dev 2012-11-27 18:38:33 -08:00
Andreas Huber
585c07e9ac Stop caching stream duration, it might change (increase) dynamically.
Change-Id: Ia829f47602e6961f24464da36a0162b8c1d7d6c8
related-to-bug: 6870049
2012-11-27 15:50:43 -08:00
Chet Haase
47a8e863e3 Merge "Fix infinite recursive loop DO NOT MERGE" into jb-mr1.1-dev 2012-11-27 12:47:19 -08:00
László Dávid
6ead9418ff Fix infinite recursive loop DO NOT MERGE
FindBugs description:

There is an apparent recursive loop at IntProperty.java
in method set(Object, Integer)

This method unconditionally invokes itself. This would seem
to indicate an infinite recursive loop that will result in a stack overflow.

Note: Checked into AOSP. Cherry-picking for mr1.1.

Issue #7621806 IntProperty has infinite recursion bug

Change-Id: I2f52dd3689198cb948925aa65dd9c95be7888fe7
2012-11-27 11:11:10 -08:00
Dianne Hackborn
8103890a59 Improve debugging for issue #7586414: AlarmManager wakelocks held
In alarm manager, print a summary of the top 10 alarms by time
being executed.  Keep track of execution time (and wake count) of
each type of alarm for each application so this can be printed in
the summary (and used to compute the top 10 alarms).  Rework how
the alarm summary stats are tracked so that we don't need to hold
on to the full Intent for each stat and can get the Intent information
at the time the alarm is sent rather than waiting for whatever Intent
comes back in the result.

Also in the battery stats: sort the kernel wake locks by time, add
a new section showing all partial wake locks across all applications
sorted by time.

Finally a new LocalLog class that is used by AlarmManager to log
important warning messages, so these can also be later found in
its dumpsys output.

Change-Id: Icc07810053e60fb623a49937e696819cb8352b06
2012-11-27 11:05:42 -08:00
Craig Mautner
7f2a989675 Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev 2012-11-26 11:34:40 -08:00
Craig Mautner
6edb6db512 Ignore invalid combination of PowerManager flags.
ACQUIRE_CAUSES_WAKEUP is supposed to be ignored if combined with
PARTIAL_WAKE_LOCK. Instead it was being carried out for any values
of the WakeLock level.

This change reverts behavior to closely match
previous releases of the framework by only honoring
ACQUIRE_CAUSES_WAKEUP for screen wake lock levels. The only
difference being that in previous releases ACQUIRE_ could have been
combined with PROXIMITY_SCREEN_OFF_WAKE_LOCK (it never was) and
now such a combination will ignore the ACQUIRE_ flag.

Bug 7532258 fixed.

Change-Id: I46e848d8fd1b57e54c63141bf3d4f353986b5bdf
2012-11-21 13:19:39 -08:00
Fabrice Di Meglio
4d931acdb8 Merge "Fix for bug #7417949 TextView / EditText error Drawable is not put on the left in RTL mode" into jb-mr1.1-dev 2012-11-20 14:37:55 -08:00
Svetoslav Ganov
1586168302 am e9812bae: Merge "Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)" into jb-mr1-dev
* commit 'e9812bae0e0ce08bd232dc2371fdb959e4f7a318':
  Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)
2012-11-20 08:38:16 -08:00
Svetoslav Ganov
7018cfdc05 Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)
This reverted change was adjusting the min and max values for the NumberPicker
which is not desirable since it changes behavior and it will be possible for
an app that works on the current platform to crash on an older one. Also the
adjustment was not implemented correctly.

Updated the documentation to clarify the reltionship between the min value,
max value, and the displayed values array.

Bug:7518172

This reverts commit a1410e6789ce72bc423793315a51aea8b6bad6c7

Change-Id: I109f1b1f54c1e609941243cabab9241871b6b12b
2012-11-19 15:20:27 -08:00
Fabrice Di Meglio
b0f895b330 Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev 2012-11-19 14:27:45 -08:00
Scott Main
6c9a1a1004 docs: update dreamservice description
Change-Id: I7e7295a3d67ca1760ba52b3958bf91540692e542
2012-11-19 11:58:59 -08:00
Michael Jurka
75b5cfb4a4 Delete appWidgetId when removing lockscreen widgets
Bug: 7550012

Change-Id: Ia9f5266256016eb91bfd6a2d5a7f910c42948f1e
2012-11-16 15:22:06 -08:00
Daniel Sandler
6738eeec00 Cleanups in Notification.java.
Bug: 7555827 // remove named TODO, fix toString output
Bug: 6440961 // remove longstanding and mysterious "MUMBLE MUMBLE"
Change-Id: I8b5e16fb1f7ccbe5cbda37f260fdc6bc0e1b8ee3
2012-11-16 12:03:32 -05:00
Fabrice Di Meglio
674a131cb6 Merge "Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev 2012-11-15 12:21:00 -08:00
Jeff Sharkey
f5377a7242 Merge "Useful annotations for code documentation." into jb-mr1.1-dev 2012-11-15 11:48:38 -08:00
Jeff Sharkey
7420ab681e Merge "Utility to format human-friendly durations." into jb-mr1.1-dev 2012-11-15 11:47:36 -08:00
Jeff Sharkey
445767c14c Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev 2012-11-15 11:45:23 -08:00
Fabrice Di Meglio
8701bb90db Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR
- change heuristic to LTR.

Change-Id: I3c5f413e48ceddbd931d713eb8c168431fcd09a2
2012-11-14 19:57:11 -08:00
Fabrice Di Meglio
7d529cd6eb Fix Javadoc for View layoutDirection / textDirection / textAlignment
Change-Id: I2fa2f02bd2f59ee93ccd56fc6bd28b93e4713cc4
2012-11-14 18:09:30 -08:00
Fabrice Di Meglio
bb0cbae441 Fix for bug #7417949 TextView / EditText error Drawable is not put on the left in RTL mode
- keep the Error Drawable infos into the Drawables cache
- reset left/right Drawable state before resolving where to put the Error Drawable
- get the mirrored Drawable for the Error popup background
- set the Error popup position depending on the layout direction (so that the "triangle"
of the background is pointing to the middle of the Error icon)

One restriction: we load the Error popup background Drawable corresponding to the layout
direction of the System Locale. So if you set the Layout direction on a TextView (or
an EditText) to RTL and set an error to it when you are in a RTL System Locale, then you
see that the background "triangle" is not pointing to the Error icon. This is working as
intended as the AssetManager load the Drawable resource depending on the configuration
which is in that case the RTL one thus loading the RTL version of the background (and not
the LTR one).

Thus there can be a discrepancy between the "layout direction" of the TextView
and the one from the Error popup background. This would happen only thru using the SDK and
not in a normal case when running an App.

Change-Id: I91bbfbe46ac20efe0e585c5d4c766db23b5c709d
2012-11-14 16:41:24 -08:00
Jeff Sharkey
53f6e8a9b9 Utility to format human-friendly durations.
Bug: 6777872
Change-Id: Ie7ebcb456306f4f88b4707030dd7beda3fc90368
2012-11-13 17:26:39 -08:00
Joe Malin
faa38a08d5 am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '4422596ddb295f812bb0970ec7f75d3c45d05020':
  Notification.java javadoc: addAction
2012-11-13 14:26:44 -08:00
Joe Malin
4422596ddb am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit 'ce37f1da3619dcb4e53ca014cf4a17885cc3af0f':
  Notification.java javadoc: addAction
2012-11-13 14:25:09 -08:00
Joe Malin
ce37f1da36 am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '4979a0b59486d737a4d9267af9b38f237705e26f':
  Notification.java javadoc: addAction
2012-11-13 14:22:58 -08:00
Joe Malin
4979a0b594 am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '5f32d3375b13e581d3101ed8e928fd6a463f3809':
  Notification.java javadoc: addAction
2012-11-13 14:20:54 -08:00
Fabrice Di Meglio
9d82d324de Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev 2012-11-13 11:03:19 -08:00
Craig Mautner
c10914ca5c Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 2012-11-13 10:00:04 -08:00
Fabrice Di Meglio
5acc379c54 Fix bug #7457897 Error icons are not shown in credit card entry form
- fix regression: the error icon was no more showing is the widget was not focused

Change-Id: I24cc00a0cb79d38e365d413f9820b5a6981de4f4
2012-11-12 14:31:19 -08:00
Jeff Sharkey
7407c948cb Watch for leaked ParcelFileDescriptors.
Bug: 7426029
Change-Id: I18f7ac7d7b357b092bf9ec91ffb9fa3de5ca0271
2012-11-12 13:43:09 -08:00
Jeff Sharkey
8b2c3a1460 Useful annotations for code documentation.
Bug: 6537978
Change-Id: I806c3c09e3255f8789455f13bf37c1dde2a93f1f
2012-11-12 12:42:17 -08:00
John Spurlock
f6f47e950d Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev 2012-11-12 07:52:08 -08:00
John Spurlock
43d84518f2 Disable navbar searchlight if search assist not available.
Bug:7506441
Change-Id: I55c740d4c3a45b9f7fdfa38346d1bc3fb1299153
2012-11-09 10:27:33 -05:00