88326 Commits

Author SHA1 Message Date
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
Dianne Hackborn
ba4ac51823 Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev 2012-11-27 11:06:35 -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
The Android Open Source Project
6f3b20ccc1 Reconcile with jb-mr1-release - do not merge
Change-Id: I60dc4bad2244ed88aec29926b08dcecf3a07462e
2012-11-27 07:33:31 -08:00
Satoshi Kataoka
1af0841137 Merge "Hide current soft input when a background user gains window focus." into jb-mr1.1-dev 2012-11-26 19:39:20 -08:00
Svetoslav Ganov
de0bf8bc2c am abb4a700: Update the content shell command\'s usage instructions.
* commit 'abb4a7008a1f5eab6cfaf7e9dd4779e549c21714':
  Update the content shell command's usage instructions.
2012-11-26 17:22:40 -08:00
Amith Yamasani
7be52cbc33 Merge "Logging to help find the cause of widget crash in clock widget." into jb-mr1.1-dev 2012-11-26 16:22:41 -08:00
Winson Chung
2b847c3933 Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev 2012-11-26 16:20:23 -08:00
Michael Jurka
ab972a6dce Merge "Fix bug where icon animation is sometimes skipped" into jb-mr1.1-dev 2012-11-26 16:15:20 -08:00
Amith Yamasani
791f877473 Logging to help find the cause of widget crash in clock widget.
This will continue to crash as before, but will show some useful
information in the exception.

Bug: 7450247

Change-Id: Ib3160a5f64154517791d165973c12294ecd09901
2012-11-26 15:22:31 -08:00
Winson Chung
f7614fc744 Removing unecessary additional lock metadata from QuickSettings user tile.
Change-Id: I89ec94385eb3cdd46ad6942bf8989fb04d5c0370
2012-11-26 14:44:03 -08:00
Winson Chung
9a0fbd4c6d Merge "Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)" into jb-mr1.1-dev 2012-11-26 11:46:39 -08:00
Winson Chung
4752e7d1a9 Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)
- Also adding feedback on the plus page (Bug 7500328)

Change-Id: Iddd09b7a3d5347a43bc040052114879cbaecccd9
2012-11-26 11:36:40 -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
Daniel Sandler
53d9659978 Merge "Allow long-press on Wifi and Bluetooth tiles to toggle." into jb-mr1.1-dev 2012-11-26 11:33:06 -08:00
Chet Haase
a004ff880e Merge "Use correct alpha value when a color is not set on a GradientDrawable." into jb-mr1.1-dev 2012-11-26 10:20:30 -08:00
Svetoslav Ganov
abb4a7008a Update the content shell command's usage instructions.
The usage instructions of the content shell command were missing some
excape charecters which caused the examples not to work. As a result
of the incorrect instructions users are prone to constructing incorrect
commands.

bug:7526252

Change-Id: I2fcc4dd1fd05806fe951245651b97e40a4786d24
2012-11-26 09:50:51 -08:00
Romain Guy
18bbcf7f68 Merge "Copy missing state in DrawableContainer" into jb-mr1.1-dev 2012-11-26 09:45:29 -08:00
Romain Guy
ce180c10f7 Merge "Cleanup: add PointF.toString()/equals()/hashcode()" into jb-mr1.1-dev 2012-11-26 09:44:28 -08:00
Baligh Uddin
a722789b4f Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-26 09:18:37 -08:00
Baligh Uddin
01dfc6655b am f7f1c6a7: Import translations. DO NOT MERGE
* commit 'f7f1c6a78ec12ca6618313f010b30d9dffee9b49':
  Import translations. DO NOT MERGE
2012-11-26 09:18:00 -08:00
Baligh Uddin
bbe3cbee5b Import translations. DO NOT MERGE
Change-Id: I33e42bf56fda90ee829e0ad91c46ecd859eca0ae
Auto-generated-cl: translation import
2012-11-22 21:54:25 -08:00
Baligh Uddin
f7f1c6a78e Import translations. DO NOT MERGE
Change-Id: I9f2a464733eb765385c3f8f83bbcd1a1e33b0e26
Auto-generated-cl: translation import
2012-11-22 21:52:46 -08:00
Baligh Uddin
f9eca9ec7c Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-22 11:04:44 -08:00
Baligh Uddin
2817d682ab am 0edbc0eb: Import translations. DO NOT MERGE
* commit '0edbc0eb76eb0b493f9cd9971d41543ec79136d5':
  Import translations. DO NOT MERGE
2012-11-22 11:03:31 -08:00
Adam Cohen
2b0501bf58 Fix a couple issues with page / outline alphas (issue 7488857)
-> Fix bug where page hints didn't disappear on boot
-> Fix bug where you see a weird rotated page under the
   lock affordance (usually after adding a widget)

Change-Id: I75b04ceadbc296d033cc9fb1cff32ab9d6e5ce9b
2012-11-21 17:18:57 -08:00
Michael Jurka
545043e59e Fix reboot loop caused by keyguard appwidget cleanup
Bug: 7591092
2012-11-21 14:02:34 -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
Michael Jurka
d894c8cdd1 Fix bug where icon animation is sometimes skipped
Bug: 7406230
Bug: 7406304

Change-Id: I9058acffa6587a5f8e757f1031750a8ba578c635
2012-11-21 11:55:23 -08:00
Chet Haase
813680780f Use correct alpha value when a color is not set on a GradientDrawable.
A previous fix ensured that color filters would have a default (black) color to
interact with if no color was set on the GradientDrawable object. However, that fix
assumed an opaque alpha value, which is not always the case. Specifically, calling
setImageAlpha() on an ImageView with a shape drawable source (as in the bug here)
caused the alpha to be set to a translucent value, which was then ignored in the fix
above.

The fix is to account for the current alpha value of the GradientDrawable object
when setting the color used by the paint object.

Issue #7592193 ImageView.setImageAlpha() broken when colorFilter is in use

Change-Id: Ie622ffca776fdd8731ced78ce1f683ca6a51dec8
2012-11-21 11:21:13 -08:00
Maxim Siniavine
007c64ffbf Merge "Added app launch test." into jb-mr1.1-dev 2012-11-21 11:10:20 -08:00
John Spurlock
3f64edec6c Merge "Fix IME down caret in keyguard nav bar bug." into jb-mr1.1-dev 2012-11-21 06:44:00 -08:00
Baligh Uddin
458f43b550 Import translations. DO NOT MERGE
Change-Id: I646dee02eeb319d87d5210faaa3025c50f85da86
Auto-generated-cl: translation import
2012-11-20 22:37:24 -08:00
Baligh Uddin
0edbc0eb76 Import translations. DO NOT MERGE
Change-Id: Ia01f5cbaa9a00034cf6bd277cb483bf0465d12e6
Auto-generated-cl: translation import
2012-11-20 22:35:34 -08:00
Romain Guy
9f8af6546d Cleanup: add PointF.toString()/equals()/hashcode()
PointF was missing these methods found in Point.

This change also properly implements equals() and hashcode() for
Point to match the PointF implementations.

Change-Id: Ic97280fb9f8c7011d8a13103c67d6e898adf00c0
2012-11-20 18:35:20 -08:00
Romain Guy
fa9b396dbc Copy missing state in DrawableContainer
The copy constructor of DrawableContainerState was not properly
copying all the state. This change adds the missing two fields
that should be copied over.

Change-Id: Ic92ba17ccf8fb3c8cbb5ead18690287da21c48a4
2012-11-20 18:32:37 -08:00
Maxim Siniavine
f58e5b6cdc Added app launch test.
The test will start each app and report the time it takes for
the app to start in milliseconds.

Change-Id: I974ac36f70f0d982aa01e46824fe138eb641d680
2012-11-20 18:01:55 -08:00
Jean-Michel Trivi
c7dd664024 Merge "Fix audio focus evaluation order for display update" into jb-mr1.1-dev 2012-11-20 18:01:34 -08:00
Jean-Michel Trivi
4dd3fb3e2c Fix audio focus evaluation order for display update
Change 1f9196a8e5de9b004e61afabc70b18caf7cf9c7e introduced
 an issue when trying to ignore audio focus entries in the
 stack that don't use the music stream, or are for transient
 audio focus gain, for remote control display updates.
The bug was that the audio focus stack traversal was not
 starting from the top, as it should. It was using
 the iterator order, which, in the case of a stack, starts
 with the bottom-most entry.
The fix consists in traversing the stack from the top, i.e.
 from the last element of the vector used to hold the stack
 entries.

Bug 7311023

Change-Id: I0c1900dbf98599a621a420ab55531a3eee838fe5
2012-11-20 17:59:34 -08:00
John Spurlock
dc3d76f246 Merge "Refactor the lockscreen camera widget, removing the bitmap." into jb-mr1.1-dev 2012-11-20 16:01:22 -08:00
Daniel Sandler
15db00eb94 Merge "DEFAULT_VIBRATE must always use the default vibe pattern" into jb-mr1.1-dev 2012-11-20 15:48:01 -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
Maxim Siniavine
d85b8d57a0 Switched to another method for launching apps.
Started using a separate thread which calls startActivityAndWait
for starting apps. Also increased the minimum and maximum lengths
of time to wait for apps to stabilize.

Change-Id: I49935a0ed1d1c230e58dc1629e5e4da6b3887903
2012-11-20 12:10:27 -08:00
Chris Craik
89ac38bf70 Merge "Add missing variable copies in Path copy constructor" into jb-mr1.1-dev 2012-11-20 11:38:05 -08:00
John Spurlock
bc7b6fc2a4 Fix IME down caret in keyguard nav bar bug.
The input method manager service now keeps track of whether or not
the ime was shown on the keyguard.  This prevents activities behind
the keyguard from incorrectly showing the down-caret in the keyguard.

Bug:7498792
Change-Id: I0de01ec29cb544e902305b0f9d9fb94a73835e7b
2012-11-20 14:06:56 -05:00
Daniel Sandler
4a7a9b963b DEFAULT_VIBRATE must always use the default vibe pattern
The logic here was backwards, causing the (softer) fallback vibe
pattern to be applied if the notification specified a sound
(or DEFAULT_SOUND) and also DEFAULT_VIBRATE. The fallback
vibe should only play if you have *no* vibration set.

Bug: 7588655
Change-Id: Iecdd362729bccedf779b51cc9b90a12014328aff
2012-11-20 12:59:41 -05:00
kmccormick@google.com
a711d1ee76 am 55340e51: am 7112cd46: am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs
* commit '55340e51343a248260f89e953476b1c6e731842a':
  Doc Update: Removed "no guaranteed delivery" line.
2012-11-20 08:38:19 -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
Daniel Sandler
272247aa1f am aaec7269: (-s ours) Notification vibration improvements: [DO NOT MERGE]
* commit 'aaec726948078dad0bcc5cbbb41bb2ee6a5a085b':
  Notification vibration improvements: [DO NOT MERGE]
2012-11-20 08:38:11 -08:00
Satoshi Kataoka
8d03305b57 Hide current soft input when a background user gains window focus.
Bug: 7507226
Change-Id: If58f68469e21eaaba8536c4b54b3aa8cf8c08eb5
2012-11-20 11:12:07 +09:00