Commit Graph

2775 Commits

Author SHA1 Message Date
Jeffrey Brown
352d84b841 am 0d47af11: Merge "Clear loaders array after they are destroyed."
# By Roman Mazur
# Via Gerrit Code Review (1) and Roman Mazur (1)
* commit '0d47af1131c4d4f9f29dad790d919d8599e3a3cc':
  Clear loaders array after they are destroyed.
2013-02-06 20:49:54 -08:00
Jeffrey Brown
e4ce25177b am b314f433: Merge "add reply.writeNoException() for quick response"
# By Sungmin Choi
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit 'b314f433905ea2cbc62bd5af658f05261a752e5a':
  add reply.writeNoException() for quick response
2013-02-06 20:49:41 -08:00
Jeffrey Brown
0d47af1131 Merge "Clear loaders array after they are destroyed." 2013-02-07 03:59:20 +00:00
Jeffrey Brown
b314f43390 Merge "add reply.writeNoException() for quick response" 2013-02-07 03:46:48 +00:00
Adam Powell
a41f9cfbbd am 53d49f17: am 17f05497: am c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Android Git Automerger (2) and others
* commit '53d49f1702df41a4ca342a1df6e720b16e094797':
  Touch action bar title text: you will go to space today!
2013-01-23 15:48:52 -08:00
Adam Powell
53d49f1702 am 17f05497: am c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Adam Powell (1) and others
* commit '17f05497be90004c0263c6de173af8c19ece07b0':
  Touch action bar title text: you will go to space today!
2013-01-23 15:46:20 -08:00
Adam Powell
27cba38952 Touch action bar title text: you will go to space today!
Title/subtitle text in an action bar is now a full alias for home/up.

Add some prototype ActionBar functionality around titles for future
API consideration.

Bug 7966136

Change-Id: I14377121dcb976d0a5f1e1862f35c3d267eb5458
2013-01-23 15:14:31 -08:00
Scott Kennedy
aebeea4cf3 am 5d6d6aab: am 8e45679a: am 026f9191: am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev
* commit '5d6d6aab255aa17fde979d954c839402837b4243':
  docs: Fix a bunch of issues
2013-01-14 11:15:55 -08:00
Scott Kennedy
5d6d6aab25 am 8e45679a: am 026f9191: am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev
* commit '8e45679adfe03271dd1cc627d6c4542649a0446a':
  docs: Fix a bunch of issues
2013-01-14 11:13:25 -08:00
Scott Kennedy
026f91915f am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev
* commit '083426980dbe6607a0cfc8b4ec5944d5b414ecbe':
  docs: Fix a bunch of issues
2013-01-14 11:09:27 -08:00
Scott Kennedy
7ed189e457 docs: Fix a bunch of issues
External tracker 42609
External tracker 42607
External tracker 42604
External tracker 42600
External tracker 42574
External tracker 42450
External tracker 41050
External tracker 40995
External tracker 40970
External tracker 40935
External tracker 40507
External tracker 40481
External tracker 40435
External tracker 40406
External tracker 40297
External tracker 40281
External tracker 39978
External tracker 39929
External tracker 39803
External tracker 39715
External tracker 39441

Change-Id: If4215cef850ba8e4e8df356a68192566806e7914
2013-01-11 23:44:11 -08:00
Scott Main
b484f8e1a4 am 782b0f71: am 4459827f: am 25505f95: am cdf5106a: docs: a few doc bugs
* commit '782b0f7141972e0535f1e905d650073f4e7f55dd':
  docs: a few doc bugs
2013-01-08 20:21:17 -08:00
Scott Main
782b0f7141 am 4459827f: am 25505f95: am cdf5106a: docs: a few doc bugs
* commit '4459827f7db379031e658b2153aac1f7c882adc6':
  docs: a few doc bugs
2013-01-08 20:18:35 -08:00
Scott Main
25505f959c am cdf5106a: docs: a few doc bugs
* commit 'cdf5106aafb77d17584d5401b207cbcc7a20f5f3':
  docs: a few doc bugs
2013-01-08 20:13:40 -08:00
Scott Main
cdf5106aaf docs: a few doc bugs
Change-Id: I20d2ff2f3abfe674ca20f713c7213ee031c9bb1d
2013-01-08 20:07:31 -08:00
Dianne Hackborn
c02bbfb3ea am 9fae2ecc: Merge "Handle nested folder case"
* commit '9fae2ecc5fb777230bde74e4a099fb4e98bf34b4':
  Handle nested folder case
2013-01-07 15:56:20 -08:00
Dianne Hackborn
9fae2ecc5f Merge "Handle nested folder case" 2013-01-07 15:20:45 -08:00
Dianne Hackborn
138a3d3f1a am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf."
* commit 'd5d6f04f2ab0db0aea03e3ab1cdd378fcc952bad':
  Hopefully fix PendingIntent.getActivities() documentation wtf.
2013-01-07 12:16:23 -08:00
Dianne Hackborn
d5d6f04f2a Merge "Hopefully fix PendingIntent.getActivities() documentation wtf." 2013-01-07 11:19:11 -08:00
Roger Chen
1740ada533 Handle nested folder case
Change-Id: Id6d6a5899e8255d18192adbc766d8d9a0e6825d0
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
2013-01-03 18:39:34 -08:00
Adam Powell
b7de79d027 am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected"
* commit '41bb82becea5dd1f995dbca5bf5a719f559102de':
  Fix NullpointException problem in onMenuItemSelected
2013-01-03 17:37:49 -08:00
Sungmin Choi
cdb86bb157 add reply.writeNoException() for quick response
In case of SET_ACTIVITY_CONTROLLER_TRANSACTION, there is no reply transaction.
So makes same to other transactions.

Change-Id: I3b9527682662a12f78cc96b6084904f18178fee7
2012-12-20 14:08:59 +09:00
zobject
686a805ef9 Fix NullpointException problem in onMenuItemSelected
If both title and condensed title is null,
item.getTitleCondensed() could be return null value
in onMenuItemSelected. therefore need to check
whether retun value is null or not.

Change-Id: Ib08f52b949a794aa7bd6cc25414041e820f62969
2012-12-15 08:23:26 +09:00
Roman Mazur
1da8e8ce89 Clear loaders array after they are destroyed.
See change Ia577caecbacb226a3ce525a01a66283efb6ba754 for details.

Change-Id: I9f07eeceaa3829f71008e6f6a38ab849095bd69c
Signed-off-by: Roman Mazur <mazur.roman@gmail.com>
2012-12-13 08:20:11 +02:00
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
Tim Hutt
5313c9f027 Hopefully fix PendingIntent.getActivities() documentation wtf.
The first intent is the key. No wait, last! Or was it first?

I haven't actually read the code, didn't write it, and haven't tested
its behaviour, but surely it can't be both, and last is the only one
that makes sense.

Change-Id: Ie8435981f09be618c93680fb6056afd015090161
2012-12-10 12:34:19 +00: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