Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,428 Commits 3 Branches 0 Tags
01b76dcbddb05d1267409088284fc13b1e55accf
Commit Graph

2357 Commits

Author SHA1 Message Date
Jeff Brown
2c89d171fa am fc959a38: am 9e197141: Merge "Add new ASSIST key and map it to the global assist intent." into jb-dev 
* commit 'fc959a389564f2ffef9c4ceba0b1ff119dd53933':
  Add new ASSIST key and map it to the global assist intent.
 2012-06-14 11:40:10 -07:00
Jeff Brown
fc959a3895 am 9e197141: Merge "Add new ASSIST key and map it to the global assist intent." into jb-dev 
* commit '9e197141f8249e36d3f19aeda332ae40dac7da05':
  Add new ASSIST key and map it to the global assist intent.
 2012-06-14 11:33:31 -07:00
Jeff Brown
9e197141f8 Merge "Add new ASSIST key and map it to the global assist intent." into jb-dev 2012-06-14 11:28:52 -07:00
Daniel Sandler
185951004e am cb629f38: am 4365d066: Merge "Remove line3 in big notification unless there\'s text to show." into jb-dev 
* commit 'cb629f38008ad4f48a956a8d74daa65eff351a75':
  Remove line3 in big notification unless there's text to show.
 2012-06-14 10:33:30 -07:00
Adam Powell
cf815b56bf am 6c143590: am 4b4a947b: Merge "MediaRouter dialog" into jb-dev 
* commit '6c14359074ff5a93695ed37083c9178a4ca2d1f1':
  MediaRouter dialog
 2012-06-14 10:32:49 -07:00
Jeff Brown
de7a8ead24 Add new ASSIST key and map it to the global assist intent. 
Moved some duplicate code from SearchPanelView and LockScreen
over to SearchManager to avoid creating yet another copy of it
in PhoneWindowManager.

Bug: 6594275
Change-Id: Ib4ebcd6817639d17548952ab2ce7cb876c05777c
 2012-06-14 04:16:26 -07:00
Daniel Sandler
cb629f3800 am 4365d066: Merge "Remove line3 in big notification unless there\'s text to show." into jb-dev 
* commit '4365d066e8beed17b61ba51c728d60a9baa499be':
  Remove line3 in big notification unless there's text to show.
 2012-06-13 18:03:40 -07:00
Daniel Sandler
4365d066e8 Merge "Remove line3 in big notification unless there's text to show." into jb-dev 2012-06-13 18:00:56 -07:00
Adam Powell
6c14359074 am 4b4a947b: Merge "MediaRouter dialog" into jb-dev 
* commit '4b4a947b5e4913d7f8b7df15d3a7cdf8f343471f':
  MediaRouter dialog
 2012-06-13 14:05:24 -07:00
Adam Powell
70e11e50ee MediaRouter dialog 
Add the dialog behavior for MediaRouteActionProvider/MediaRouteButton.

Still TODO:

* Switch audio icon based on source; speaker/bt/user

* Rig up volume slider

* Rig up item icons

* Rig up group button for groupable categories

* Make grouping work

Change-Id: I3f992516b184d5ae940ddb7bbb7f94ff58914589
 2012-06-13 11:42:10 -07:00
Daniel Sandler
916ad91c38 Remove line3 in big notification unless there's text to show. 
If you have no subText or summaryText in a big template, but
you *do* have a number, the overflow bar (below the big text
or inbox or whatever) would have shown; now it does not.

Bug: 6657006
Change-Id: Ib2af2712da3a98227bd8d697560893adbdc427e9
 2012-06-13 12:17:07 -04:00
Daniel Sandler
eb859df3f9 am e63d952a: am 7d2e8960: Merge ""Two actions ought to be enough for anybody."" into jb-dev 
* commit 'e63d952a9294c1257598edc13b3457b7a0d81e63':
  "Two actions ought to be enough for anybody."
 2012-06-13 07:14:31 -07:00
Daniel Sandler
e63d952a92 am 7d2e8960: Merge ""Two actions ought to be enough for anybody."" into jb-dev 
* commit '7d2e8960d0fcebf924c60dbd0f6934368ceb80e3':
  "Two actions ought to be enough for anybody."
 2012-06-13 07:10:03 -07:00
Daniel Sandler
7d2e8960d0 Merge ""Two actions ought to be enough for anybody."" into jb-dev 2012-06-13 07:07:02 -07:00
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
Daniel Sandler
602ad1c978 "Two actions ought to be enough for anybody." 
Bug: 6650170
Change-Id: I5ee6990a8e556f9ee1fbfb0989db33f75b07f4ea
 2012-06-12 16:06:27 -04: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