Commit Graph

2322 Commits

Author SHA1 Message Date
Daniel Sandler
97f2d6acd6 am 4dc0cf7b: am 6cf0c336: Merge "Various notification template cleanups." into jb-dev
* commit '4dc0cf7bf376aa78d7fbccc8481673d98dae7c08':
  Various notification template cleanups.
2012-06-08 14:08:16 -07:00
Daniel Sandler
4dc0cf7bf3 am 6cf0c336: Merge "Various notification template cleanups." into jb-dev
* commit '6cf0c3365a40854f63f0abff2fa67d24432d0218':
  Various notification template cleanups.
2012-06-08 13:40:05 -07:00
Daniel Sandler
619738c9e7 Various notification template cleanups.
Bug: 6597693 // hide line3 in InboxStyle
Bug: 6593691 // vertical centering inconsistencies
Bug: 6592116 // no left action gutter in BigPicture
Bug: 6622757 // missing subtext in BigText expanded
Change-Id: I941af99d0a905b6e0aa6fb74ad4eff29c17d9fc2
2012-06-08 11:41:37 -04:00
Adam Powell
b85afc25d5 resolved conflicts for merge of 1178569b to master
Change-Id: If2bb6ccaee99bcf199cd93f24eba217fe6ff485e
2012-06-05 20:08:41 -07:00
Adam Powell
1178569b26 am f6452d0c: Merge "More fun with MediaRouter" into jb-dev
* commit 'f6452d0cac64b72005af330411b5a895f0038312':
  More fun with MediaRouter
2012-06-05 19:29:57 -07:00
Adam Powell
690ffb4e1f More fun with MediaRouter
Add action provider, button, and styles. Extend ActionProvider to
allow for getting references to MenuItem instances.

Implement toggle mode for the MediaRouteButton/ActionProvider. Dialog
selection yet to come.

Change-Id: Ibe3188570f503bbf8dd00cf154663435656a7171
2012-06-05 19:15:57 -07:00
Dianne Hackborn
33644b9ba7 am 4a683a34: am 1ad66b2f: Merge "Fix issue #6584942 IllegalStateException: Failure saving state..." into jb-dev
* commit '4a683a343083ec2b8aed1ee63669dbade6c0379f':
  Fix issue #6584942 IllegalStateException: Failure saving state...
2012-06-05 12:26:10 -07:00
Dianne Hackborn
4a683a3430 am 1ad66b2f: Merge "Fix issue #6584942 IllegalStateException: Failure saving state..." into jb-dev
* commit '1ad66b2f873496bcbe72e91d1978cf1b2633b3a4':
  Fix issue #6584942 IllegalStateException: Failure saving state...
2012-06-05 11:48:14 -07:00
Dianne Hackborn
ee76efb74b Fix issue #6584942 IllegalStateException: Failure saving state...
...active SuggestFragment{419494f0} has cleared index: -1

There were issues when the same fragment was removed and then
added again before completely finishing the remove (such as due
to a running animation).

Two fixes:

- Now when you call FragmentTransaction.replace() and are replacing
  a fragment with the same fragment, this becomes a no-op, to avoid
  visual artifacts in the transition and bad states.
- When we are moving the fragment state up and it is currently
  animating away to the INITIALIZED state, we could end up making
  the fragment inactive as part of the cleanup.  In this case it
  shouldn't be made inactive; we just need to initialize it but
  keep it active since we are going to continue to use it.

Bug: 6584942
Change-Id: I8bfd73f2d8ef8f67b541b3e2525dfa5db6c3bfa5
2012-06-05 10:52:38 -07:00
Daniel Sandler
d7f13b4f0a am 5bf8f01b: am 7a394abb: Merge "Unused API should be hidden." into jb-dev
* commit '5bf8f01be1cd9800e53b30117fe9ea7fb1153301':
  Unused API should be hidden.
2012-06-04 10:57:02 -07:00
Daniel Sandler
5bf8f01be1 am 7a394abb: Merge "Unused API should be hidden." into jb-dev
* commit '7a394abb549ecbb9ac510d1b62e60b0ad03438df':
  Unused API should be hidden.
2012-06-04 10:52:08 -07:00
Daniel Sandler
7a394abb54 Merge "Unused API should be hidden." into jb-dev 2012-06-04 10:49:53 -07:00
Dianne Hackborn
92bc9393e6 am 5a70063f: am 6593be0c: Merge "Work on issue #6579997: Mariner entrance animation" into jb-dev
* commit '5a70063f7ea8c910eefb025018ef02e84ff319f0':
  Work on issue #6579997: Mariner entrance animation
2012-06-04 10:38:48 -07:00
Dianne Hackborn
5a70063f7e am 6593be0c: Merge "Work on issue #6579997: Mariner entrance animation" into jb-dev
* commit '6593be0c200f69d932e40e05e9df54b89c157c48':
  Work on issue #6579997: Mariner entrance animation
2012-06-04 10:34:24 -07:00
Daniel Sandler
a90513d5f4 Unused API should be hidden.
Change-Id: Ifed4d06e620c990ccecc1ee1aaf3adedbdc7c2da
2012-06-04 02:11:17 -04:00
Dianne Hackborn
84375876fc Work on issue #6579997: Mariner entrance animation
Add a new variation of ActivityOptions that allows you to
supply custom animation resources and get a callback when the
animation starts.

Use this in SearchPanelView to determine when to start hiding
the search panel instead of having a fixed delay.

Fix some issues in the activity manager where we would cancel
the options in cases where we should actually keep them to give
to the window manager for a transition.  (Basically when the
activity being started is not actually ending up launched, but
just results in a shift in the activity stack.)

Note that this is not quite what the design calls for -- the
entire search UI is waiting and then disappearing when the
animation starts, instead of the ring first disappearing while
waiting for the time to fade out the circle.

Change-Id: Iee9a404ba530908d73cdbd4a9d0d2907ac03428f
2012-06-01 19:13:55 -07:00
Dianne Hackborn
c3d808b3c0 am c3895253: am d53710ce: Merge "Extend process observer to be usable for media routing." into jb-dev
* commit 'c3895253bb833611df8c8f62347ede70153eb5b9':
  Extend process observer to be usable for media routing.
2012-05-31 19:11:26 -07:00
Dianne Hackborn
c3895253bb am d53710ce: Merge "Extend process observer to be usable for media routing." into jb-dev
* commit 'd53710ce644e7f1df417a8fe42ec26233a751b2e':
  Extend process observer to be usable for media routing.
2012-05-31 19:07:03 -07:00
Dianne Hackborn
a93c2c117d Extend process observer to be usable for media routing.
It now has a new callback to report changes in the "importance"
of processes.  Rewrote the dispatching code to be a bit more
efficient now that we are sending more reports.

Change-Id: Ie865cfd286455819f04e8c14e9b6fd54d028f8f2
2012-05-31 18:58:34 -07:00
Dianne Hackborn
e075d5099b am 11855f31: am 388d4801: Merge "Working on issue #6561352: java.lang.RuntimeException: Unable to start..." into jb-dev
* commit '11855f31a3f7074d9fbccd1ee460b99fc47162c6':
  Working on issue #6561352: java.lang.RuntimeException: Unable to start...
2012-05-30 18:17:41 -07:00
Dianne Hackborn
11855f31a3 am 388d4801: Merge "Working on issue #6561352: java.lang.RuntimeException: Unable to start..." into jb-dev
* commit '388d4801d5f314c804c5ab2dff76f764ed28a991':
  Working on issue #6561352: java.lang.RuntimeException: Unable to start...
2012-05-30 18:14:19 -07:00
Dianne Hackborn
388d4801d5 Merge "Working on issue #6561352: java.lang.RuntimeException: Unable to start..." into jb-dev 2012-05-30 18:11:23 -07:00
Dianne Hackborn
61af8a8ef7 Working on issue #6561352: java.lang.RuntimeException: Unable to start...
...activity ComponentInfo{com.google.android.googlequicksearchbox
/com.google.android.googlequicksearchbox.SearchActivity}

Add check for a situation where we are saving the state of a
fragment with a -1 index, and fail early in that case with more
debug information.

Change-Id: I03a928dde521fa06664d0036dd9f90eef3247afc
2012-05-30 16:38:30 -07:00
Daniel Sandler
73ac11ae37 am bb702f57: am c5d20509: Merge "Visual tweaks to notifications." into jb-dev
* commit 'bb702f576a8b566279a2a728c7aded380c5d50a5':
  Visual tweaks to notifications.
2012-05-30 13:03:29 -07:00
Daniel Sandler
bb702f576a am c5d20509: Merge "Visual tweaks to notifications." into jb-dev
* commit 'c5d2050961a06c0931b7de338324968a509f4f00':
  Visual tweaks to notifications.
2012-05-30 12:57:25 -07:00
Daniel Sandler
c5d2050961 Merge "Visual tweaks to notifications." into jb-dev 2012-05-30 12:55:00 -07:00
Daniel Sandler
6387d2f6da Visual tweaks to notifications.
- Smaller right_icons
  - Higher-contrast text colors
  - Dividers between actions
  - Dividers above actions and overflows
  - Consistent 8dp gutter on left of content
  - BigTextStyle should not show line3 unless there is a subtext.
  - Collapse summary ("overflow") text into line3. This is a
    little wild because now the contentText, subText, and
    summaryText all share this spot, but the various
    variables all have different times when they're
    expressed so you have greater control over what shows
    where in the 1U and the expanded form.
  - Do not show contentText in BigText's line3. If you have
    subtext or summarytext, show that; otherwise suppress
    line3 entirely.

Bug: 6558134 // line3
Bug: 6508804 // other visuals
Change-Id: Ib79e818a332d17000e9a8fce333eff8f8cf043aa
2012-05-30 15:28:22 -04:00
Dianne Hackborn
357046525b am 2e73f4c0: am f46bd06c: Merge "Fix issue #6579824: Email crash observed after updating..." into jb-dev
* commit '2e73f4c059e366489c50ad0dd4e05890afa522d8':
  Fix issue #6579824: Email crash observed after updating...
2012-05-30 11:25:24 -07:00
Dianne Hackborn
2e73f4c059 am f46bd06c: Merge "Fix issue #6579824: Email crash observed after updating..." into jb-dev
* commit 'f46bd06c6822752acd24265a7db5c86d6036bc38':
  Fix issue #6579824: Email crash observed after updating...
2012-05-30 11:20:51 -07:00
Dianne Hackborn
5f48fca218 Fix issue #6579824: Email crash observed after updating...
...device from JRN59D to JRN60

Deal correctly with multiprocess content providers that need to
be loaded into a secondary process; wasn't correctly detecting the
case where the IContentProvider returned by the activity manager
is null.  (installProvider used to be given the direct IContentProvider,
now it gets the ContentProviderHolder and much check whether the
provider inside is null.)

Change-Id: I888622e275a459031ab849952941f39cf9c02ee0
2012-05-30 11:06:31 -07:00
Christopher Tate
0a406096bd am 03ab4eb5: am aefe4aa4: Merge "Prevent construction/use of invalid restore session proxies" into jb-dev
* commit '03ab4eb550d3f1c5b3959d9433e925731a215c4e':
  Prevent construction/use of invalid restore session proxies
2012-05-29 16:01:44 -07:00
Dianne Hackborn
ce783749b1 am f3b4c93e: am ae5811c7: Merge "Fix (mostly) issue #5109947: Race condition between retrieving a..." into jb-dev
* commit 'f3b4c93e0da9af2db9e16864faa734cf70fecfe3':
  Fix (mostly) issue #5109947: Race condition between retrieving a...
2012-05-29 15:57:52 -07:00
Christopher Tate
03ab4eb550 am aefe4aa4: Merge "Prevent construction/use of invalid restore session proxies" into jb-dev
* commit 'aefe4aa4d470d308f17a71b16bf1a0d58c79c05c':
  Prevent construction/use of invalid restore session proxies
2012-05-29 15:57:34 -07:00
Dianne Hackborn
f3b4c93e0d am ae5811c7: Merge "Fix (mostly) issue #5109947: Race condition between retrieving a..." into jb-dev
* commit 'ae5811c71405878b09eace395ec2b28e54eeb427':
  Fix (mostly) issue #5109947: Race condition between retrieving a...
2012-05-29 15:53:38 -07:00
Christopher Tate
aefe4aa4d4 Merge "Prevent construction/use of invalid restore session proxies" into jb-dev 2012-05-29 15:52:24 -07:00
Dianne Hackborn
6ae8d18218 Fix (mostly) issue #5109947: Race condition between retrieving a...
...content provider and updating its oom adj

This introduces the concept of an "unstable" reference on a content
provider.  When holding such a reference (and no normal stable ref),
the content provider dying will not cause the client process to be
killed.

This is used in ContentResolver.query(), .openAssetFileDescriptor(),
and .openTypedAssetFileDescriptor() to first access the provider
with an unstable reference, and if at the point of calling into the
provider we find it is dead then acquiring a new stable reference
and doing the operation again.  Thus if the provider process dies
at any point until we get the result back, our own process will not
be killed and we can safely retry the operation.

Arguably there is still the potential for a race -- if somehow the
provider is killed way late by the OOM killer after the query or
open has returned -- but this should now be *extremely* unlikely.
We also continue to have the issue with the other calls, but these
are much less critical, and the same model can't be used there (we
wouldn't want to execute two insert operations for example).

The implementation of this required some significant changes to the
underlying plumbing of content providers, now keeping track of the
two different reference counts, and managing them appropriately.  To
facilitate this, the activity manager now has a formal connection
object for a client reference on a content provider, which hands to
the application when opening the provider.

These changes have allowed a lot of the code to be cleaned up and
subtle issues closed.  For example, when a process is crashing, we
now have a much better idea of the state of content provider clients
(olding a stable ref, unstable ref, or waiting for it to launch), so
that we can correctly handle each of these.

The client side code is also a fair amount cleaner, though in the
future there is more than should be done.  In particular, the two
ProviderClientRecord and ProviderRefCount classes should be combined
into one, part of which is exposed to the ContentResolver internal
API as a reference on a content provider with methods for updating
reference counts and such.  Some day we'll do that.

Change-Id: I87b10d1b67573ab899e09ca428f1b556fd669c8c
2012-05-29 13:33:09 -07:00
Christopher Tate
f5491fc1b6 Prevent construction/use of invalid restore session proxies
Possible (rare) null return was not being handled.  Fixes
bug 6554812.

Change-Id: I470e916f2156ff7ed2947d6ce21ef2816fc7f97d
2012-05-25 14:14:49 -07:00
Jean-Baptiste Queru
4b33266935 am c6df8417: am 541803cc: am fd63c857: Merge "Wipe the user data out in any case."
* commit 'c6df8417eaf60f80b2741ec29e8188324de95af3':
  Wipe the user data out in any case.
2012-05-25 08:17:49 -07:00
Jean-Baptiste Queru
c6df8417ea am 541803cc: am fd63c857: Merge "Wipe the user data out in any case."
* commit '541803ccc530b8cc1d8d95aa5a82ebc191fc218c':
  Wipe the user data out in any case.
2012-05-25 08:13:03 -07:00
Jean-Baptiste Queru
541803ccc5 am fd63c857: Merge "Wipe the user data out in any case."
* commit 'fd63c85742f4b12065418d48ae10be4bb12468f5':
  Wipe the user data out in any case.
2012-05-25 08:09:39 -07:00
Jean-Baptiste Queru
fd63c85742 Merge "Wipe the user data out in any case." 2012-05-25 07:31:27 -07:00
Jean-Michel Trivi
3266873f7f am b3db8dc9: am 97594d6c: Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev
* commit 'b3db8dc9f1c164dedd7282f8d6e392641e4e8cc9':
  Unhide KeyguardManager locked and secure state getters
2012-05-24 18:34:07 -07:00
Jean-Michel Trivi
37fde0aca0 Unhide KeyguardManager locked and secure state getters
Unhide the following methods:
  android.app.KeyguardManager.isKeyguardLocked()
  android.app.KeyguardManager.isKeyguardSecure()

Fix some javadoc typos

Change-Id: Iedcd9f6a5261b7a3b47431edff013f629e1dc45d
2012-05-24 18:09:44 -07:00
Chris Wren
e1ee12650e am 7ecc8974: am b72ac9dd: Merge "BigPicture notifications for screenshots." into jb-dev
* commit '7ecc89743d43adeaf3d80c8d630fe37b23f8346e':
  BigPicture notifications for screenshots.
2012-05-23 13:39:36 -07:00
Chris Wren
3745a3da75 BigPicture notifications for screenshots.
Needed a little extra help from the builder to make this
happen (like the title, you might want a different largeIcon
in the expanded view if---as in this case---it is redundant
with the big picture).

Needed to fix BigPicture template to reveal actions.

Bug: 6289107
Change-Id: I19dc62e693ee2c87cbe82f7327fe9115768b4102
2012-05-22 17:47:33 -04:00
Daniel Sandler
859260ef5c am f2326a49: am c40a7fe0: Merge "Fix three-line notifications." into jb-dev
* commit 'f2326a49951e2b1bf8449ee35eaf0c443f678012':
  Fix three-line notifications.
2012-05-22 08:24:09 -07:00
Daniel Sandler
c40a7fe002 Merge "Fix three-line notifications." into jb-dev 2012-05-22 08:17:29 -07:00
Romain Guy
abafe372ee am 6fa51de8: am 46a8b1ac: Merge "Remove unused, obsolete debug code" into jb-dev
* commit '6fa51de80bae65a93346ed18628010a0867607cc':
  Remove unused, obsolete debug code
2012-05-21 14:32:43 -07:00
Chris Wren
085eb02de2 am 56a02e6e: am 29bb6d92: Support more items in the Notification.InboxStyle, plus an overflow.
* commit '56a02e6e61f7ae437f06b095e8c4310edcb5e9ab':
  Support more items in the Notification.InboxStyle, plus an overflow.
2012-05-21 14:31:30 -07:00
Dianne Hackborn
b1b0058346 am 72669b5f: am 13a0271c: Merge "Add aapt support for generating proguard rules for onClick methods." into jb-dev
* commit '72669b5f4663937b09d33f9d951f0b86a03fa98b':
  Add aapt support for generating proguard rules for onClick methods.
2012-05-21 14:29:14 -07:00