Commit Graph

2750 Commits

Author SHA1 Message Date
Christopher Tate
1de6239390 am 534de491: Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev
* commit '534de491e6522465a7ad12d7cba9b2f80deab364':
  Make immersive mode public & imply update locking
2012-12-11 16:13:51 -08:00
Christopher Tate
73c2aee40a Make immersive mode public & imply update locking
Activity.setImmersive(boolean) / android:immersive="bool" are now public.
In addition, if the foreground activity is immersive then an update lock
will be held on its behalf.  This lets applications such as movie players
suppress the display of intrusive notifications, OTA-availability dialogs,
and the like while they are displaying content that ought not to be
rudely interrupted.

The update lock aspect of this mode is *advisory*, not binding -- the
update mechanism is not actually constrained; it simply uses this information
in deciding whether/when to prompt the user.  It's more a guideline than
a rule.

Bug 7681380

Change-Id: I3c412a84cbf3933e3bf0168f2c71c54a86e4b7e5
2012-12-10 18:40:57 -08:00
Adam Powell
a52b4792d1 am d692c2c6: Merge "Fix EventLog string class problem in onOptionMenuSelected"
* commit 'd692c2c6856072a3ec8bec4550466d15a9fef8d7':
  Fix EventLog string class problem in onOptionMenuSelected
2012-12-10 11:41:29 -08:00
zobject
332944f8a0 Fix EventLog string class problem in onOptionMenuSelected
EventLog function can handle string,integer class and long class. (in android_util_EventLog.cpp)
If menu title string are used bold tag(like <b>test</b>), it'll be android.text.SpannedString.
In onOptionMenuSelected, it is using item.getTitleCondensed() function for writing event log.
therefore any android activity using tag menu string(like <b></b>) can be crashed by IllegalArgumentException.

I found this crash on GMS Application.
change locale chinese -> launch Google+ -> hangout -> menu key -> Invite(expressed chinese) click -> Google+ crash

Change-Id: I0437be81699925e29bf4510eb615ef2424432763
2012-12-10 23:19:45 +09:00
Daniel Sandler
b38ecce234 am 40ddc2bf: am bc305e55: Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev
* commit '40ddc2bf4062caf5ce64cff69b697a874802ad9a':
  Fix longstanding nonsense in javadocs.
2012-12-06 19:00:22 -08:00
Daniel Sandler
40ddc2bf40 am bc305e55: Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev
* commit 'bc305e554427d22420746c66ab67a236c424fec0':
  Fix longstanding nonsense in javadocs.
2012-12-06 11:34:40 -08:00
Daniel Sandler
8aa9ae69a2 Fix longstanding nonsense in javadocs.
Change-Id: Iea2c7b8e5dc7591a9586a628e891d71d215daec6
2012-12-04 23:32:27 -05:00
Dianne Hackborn
84ea428d24 am ed8c323a: am 38e84700: Merge "Fix issue #7585876: When changing the font settings, the movie..." into jb-mr1.1-dev
* commit 'ed8c323a6c776540de356d6fc7d902cc5916fef5':
  Fix issue #7585876: When changing the font settings, the movie...
2012-11-29 14:28:24 -08:00
Adam Powell
2a1f11e975 am 57c23a46: am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev
* commit '57c23a464a8428f089531a5d3cab20c81eb6ccee':
  Clean up behavior of type arguments for MediaRouter#getSelectedRoute
2012-11-29 14:26:57 -08:00
Dianne Hackborn
221d59f723 am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev
* commit 'afdd978ccd8d45ac789873dd4cf0ab0dd3f46d20':
  Quiet down a lot of logging.
2012-11-29 14:25:40 -08:00
Dianne Hackborn
ed8c323a6c am 38e84700: Merge "Fix issue #7585876: When changing the font settings, the movie..." into jb-mr1.1-dev
* commit '38e847004978031c2b914714e92bc5407ba3ce65':
  Fix issue #7585876: When changing the font settings, the movie...
2012-11-29 12:08:41 -08:00
Dianne Hackborn
38e8470049 Merge "Fix issue #7585876: When changing the font settings, the movie..." into jb-mr1.1-dev 2012-11-29 12:05:33 -08:00
Dianne Hackborn
7ac8bbddfc Fix issue #7585876: When changing the font settings, the movie...
...just keeps attempting to load and doesn't play on the TV

Change-Id: Ifcdc969a037a113224632f907d55f60a168dd05a
2012-11-29 11:59:58 -08:00
Adam Powell
57c23a464a am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev
* commit '10479a29cbdc55cfd25b30cd792a151234b55fa6':
  Clean up behavior of type arguments for MediaRouter#getSelectedRoute
2012-11-28 19:50:43 -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
Dianne Hackborn
afdd978ccd am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev
* commit '68e0da7e397f6808a90509615c08c62bb00af6ba':
  Quiet down a lot of logging.
2012-11-28 15:06:36 -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
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
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
690d2052b2 am 6684a2ce: am bf0e106a: Merge "Cleanups in Notification.java." into jb-mr1.1-dev
* commit '6684a2ce1abd94972d5480c2214a9509781c755b':
  Cleanups in Notification.java.
2012-11-27 18:43:46 -08:00
Daniel Sandler
6684a2ce1a am bf0e106a: Merge "Cleanups in Notification.java." into jb-mr1.1-dev
* commit 'bf0e106a7d755355d7ff53a2b319e2e91c154641':
  Cleanups in Notification.java.
2012-11-27 18:41:01 -08:00
Daniel Sandler
bf0e106a7d Merge "Cleanups in Notification.java." into jb-mr1.1-dev 2012-11-27 18:38:33 -08:00
Dianne Hackborn
360acd03bf am 78551bc7: am ba4ac518: Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev
* commit '78551bc7d5541c86503b32db0e3e2564218bf179':
  Improve debugging for issue #7586414: AlarmManager wakelocks held
2012-11-27 11:36:34 -08:00
Dianne Hackborn
78551bc7d5 am ba4ac518: Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev
* commit 'ba4ac51823c59152e2167365b81ac56857b6b4d0':
  Improve debugging for issue #7586414: AlarmManager wakelocks held
2012-11-27 11:31:53 -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
5132d62600 Merge jb-mr1-dev into aosp/master - do not merge
Change-Id: Iee4af268c5c2930c59ee237e796467d79cedbbfc
2012-11-27 08:21:11 -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
Joe Malin
9ae6845ae8 am 27b587b6: am faa38a08: am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '27b587b6867768860c2e3f13567ba3d312d9b952':
  Notification.java javadoc: addAction
2012-11-13 14:30:51 -08:00
Joe Malin
27b587b686 am faa38a08: am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit 'faa38a08d5998e32dcfe21e084076cbbb64ca0ea':
  Notification.java javadoc: addAction
2012-11-13 14:28:40 -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
John Spurlock
4299f63e54 am b340fe4f: am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev
* commit 'b340fe4f88226ec35f0a4058f514b764b0f3977d':
  Disable navbar searchlight if search assist not available.
2012-11-12 07:58:09 -08:00
John Spurlock
b340fe4f88 am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev
* commit 'f6f47e950ddbb91fcce30f2f3e610a4d249b9bdb':
  Disable navbar searchlight if search assist not available.
2012-11-12 07:55:24 -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
Daniel Sandler
7f83ef619a am ccbfd617: am 7b5a9276: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
* commit 'ccbfd617e730e5c3660fb3b9edf4f272db4abfd0':
  Fix docs to refer to the correct class.
2012-11-08 15:42:51 -08:00
Jean-Baptiste Queru
40a419c2a5 Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEAD 2012-11-08 14:44:35 -08:00
Jean-Baptiste Queru
ce2a3746b8 merge 19f8aa180a
Change-Id: I9922b99379cd653b7a707cb2b635c1d544972f51
2012-11-08 14:13:21 -08:00
Daniel Sandler
ccbfd617e7 am 7b5a9276: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
* commit '7b5a92766a0b04af7cb6a9e9905ec37e7885ea64':
  Fix docs to refer to the correct class.
2012-11-07 12:40:30 -08:00
Joe Malin
8d40d04afa Notification.java javadoc: addAction
Change-Id: I86fe116f50d8462494cfc9f138e1c885ae5a41ea
2012-11-07 12:39:22 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files"
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
2012-11-07 11:52:12 -08:00
Daniel Sandler
8768278974 Fix docs to refer to the correct class.
Bug: 6676920
Change-Id: Ib79635cb3ff464b4686268fcf64b99cacaa9e627
2012-11-07 14:04:42 -05:00
Kenny Root
3a084af2e9 Correct executable bit for source files
Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
2012-11-07 10:27:31 -08:00
Baligh Uddin
19f8aa180a am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev
* commit '00b5ed8fa9f2f38e15894519f3afeaae56e97e94': (21 commits)
  Clearing connected message in stop fixes 7401152
  bouncer: hide more text and frame less.
  Recover from badly behaving 3rd party secure cameras.
  Show bouncer mode for Slide mode in keyguard if widget isn't expanded
  Making challenge come back if within the same gesture you return to the original page (issue 7422999)
  Ensure edge swiping is enforced immediately upon showing keyguard (issue 7453156)
  Fix issue 7468224, make sure to size pages if page changes
  If a default keyguard layout isn't specified, fallback to the default layout
  Use better signal for camera launch.
  Render camera widget on a background thread.
  Fully block user interactions when transitioning to camera.
  Fixing up overscroll / hints on tablet
  Cleaning up the overscroll effect
  Updating UI to new design, widget shouldn't expand until page settles (issue 7467435)
  Making screen hints just side page outlines, as per new design (issue 7467968)
  Clean up separator string in keyguard view
  Attempt to fix MENU key issue.
  Update DevicePolicyManager documentation with new keyguard flags
  Polish user selector accessibility.
  Fix pages disappearing (issue 7456885)
  ...
2012-11-05 15:58:55 -08:00
Scott Main
fccddd2965 am 06b3b0bd: am 44c4bba2: Merge "docs: fix markup error bug: 7456071" into jb-mr1-dev
* commit '06b3b0bd0c5220abd6563c276711e21e353c1320':
  docs: fix markup error bug: 7456071
2012-11-05 14:15:33 -08:00
Scott Main
06b3b0bd0c am 44c4bba2: Merge "docs: fix markup error bug: 7456071" into jb-mr1-dev
* commit '44c4bba2530b430895ef1c72e8ce2712e8ca9f6e':
  docs: fix markup error bug: 7456071
2012-11-05 14:12:17 -08:00
Scott Main
7c6863be50 am 44c4bba2: Merge "docs: fix markup error bug: 7456071" into jb-mr1-dev
* commit '44c4bba2530b430895ef1c72e8ce2712e8ca9f6e':
  docs: fix markup error bug: 7456071
2012-11-05 11:38:10 -08:00
Scott Main
44c4bba253 Merge "docs: fix markup error bug: 7456071" into jb-mr1-dev 2012-11-05 11:35:24 -08:00
Scott Main
9cc531cc26 docs: fix markup error
bug: 7456071

Change-Id: I3d34a2d6741784d9b33af54afd6d97803720264d
2012-11-05 11:25:17 -08:00