Commit Graph

2342 Commits

Author SHA1 Message Date
Amith Yamasani
b8151ecd6e Add an icon to the user information.
Store the icon in the user folder under /data/system,
similar to how the wallpaper is stored.

Change-Id: Id8ccb55b9e2ba7b4c557505a7f69f04eca1518cf
2012-06-12 18:18:29 -07:00
Adam Powell
49a0b01bdc am 0d637d6f: am 579ec308: Merge "MediaRouter work" into jb-dev
* commit '0d637d6f888cdddba554174284fb96f8354a15e4':
  MediaRouter work
2012-06-12 13:01:30 -07:00
Dianne Hackborn
d4a0c49ffa am 007f2b40: am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev
* commit '007f2b40f952eab8951c6b22302a59a955a20561':
  Rework media router to be per-context with global process state.
2012-06-12 13:00:47 -07:00
Adam Powell
ea99d9af2d am bee681a1: am fbce66cb: Merge "Further work on MediaRouter" into jb-dev
* commit 'bee681a1d54062dc0833cc9a45aac7b20725c1bb':
  Further work on MediaRouter
2012-06-12 13:00:33 -07:00
Adam Powell
0d637d6f88 am 579ec308: Merge "MediaRouter work" into jb-dev
* commit '579ec3086c9ce3616735bc3cf63246f052973a7f':
  MediaRouter work
2012-06-12 12:46:02 -07:00
Dianne Hackborn
007f2b40f9 am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev
* commit 'f9d80b6b940540b5d7be22ae310e047fcd2472a8':
  Rework media router to be per-context with global process state.
2012-06-12 12:43:20 -07:00
Adam Powell
bee681a1d5 am fbce66cb: Merge "Further work on MediaRouter" into jb-dev
* commit 'fbce66cb259cb63b43fda654db68152b8b4a2c2f':
  Further work on MediaRouter
2012-06-12 12:42:48 -07:00
Adam Powell
b35c445f34 MediaRouter work
Fix a bug where MediaRouter would crash on creation

Add click listener for app-supplied extended settings on the route
selection dialog.

Change-Id: I2991db1720b5c574148e250526984592f4dc3c44
2012-06-12 11:26:39 -07:00
Dianne Hackborn
fdfe58126d am acfb11b7: am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)"
* commit 'acfb11b7c49cd0c3e653700f414c014fccc5aec3':
  Improved documentation (clarify on issue 8727)
2012-06-11 16:41:19 -07:00
Dianne Hackborn
23a947664f am 82b131f2: am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"
* commit '82b131f27418ecdd60d52638a72d01d4ad2b109f':
  ApplicationThread: Check interface before invoking scheduleLowMemory
2012-06-11 16:41:13 -07:00
Dianne Hackborn
acfb11b7c4 am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)"
* commit '2e479fefbfcb388d2aa62978307420357f322441':
  Improved documentation (clarify on issue 8727)
2012-06-11 16:36:49 -07:00
Dianne Hackborn
82b131f274 am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"
* commit 'f6e39b068d1d5491dc3d73d73f598790688a1c4e':
  ApplicationThread: Check interface before invoking scheduleLowMemory
2012-06-11 16:36:42 -07:00
Dianne Hackborn
2e479fefbf am bb536096: Merge "Improved documentation (clarify on issue 8727)"
* commit 'bb5360966668ca8e97c02363b0d87dc9c9ae2451':
  Improved documentation (clarify on issue 8727)
2012-06-11 16:32:26 -07:00
Dianne Hackborn
f6e39b068d am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"
* commit 'a03696dc6b8128bd44dc700b62ef9b5fd3ac4534':
  ApplicationThread: Check interface before invoking scheduleLowMemory
2012-06-11 16:32:20 -07:00
Dianne Hackborn
bb53609666 Merge "Improved documentation (clarify on issue 8727)" 2012-06-11 16:01:38 -07:00
Dianne Hackborn
a03696dc6b Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 2012-06-11 15:58:22 -07:00
Dianne Hackborn
b58b8f832d Rework media router to be per-context with global process state.
Change-Id: Ic1cb6f13e691d22783bcdafae85b7c75aec0a66f
2012-06-11 15:41:08 -07:00
Adam Powell
d0d2cda9d4 Further work on MediaRouter
Remove volume control and tracking. This will be handled by extensions
to existing audio and media APIs for now.

Tweak/refine other aspects of the API. Pass the router to callbacks for
easier future-proofing. Add group/ungroup callback methods.

Change-Id: Ib69e76e5f46280a9002b545bcf4cbc7b839844ee
2012-06-11 13:17:44 -07:00
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