Commit Graph

1926 Commits

Author SHA1 Message Date
Jim Miller
048311ca37 am a10b1a73: am 12da2c5e: Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev
* commit 'a10b1a738dfa8fcf094fec555e7d85dba179f5fc':
  Fix 6665117: ACTION_ASSIST visual improvements
2012-06-18 13:34:59 -07:00
Jim Miller
a10b1a738d am 12da2c5e: Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev
* commit '12da2c5eeeadd6c23da5d3003d0da3b6b73d5052':
  Fix 6665117: ACTION_ASSIST visual improvements
2012-06-18 13:32:05 -07:00
Jim Miller
12da2c5eee Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev 2012-06-18 13:29:49 -07:00
Adam Powell
0be17da620 am c92aa2e7: am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-dev
* commit 'c92aa2e7c9112adafc5283921efe25574a95b7a4':
  Volume control in MediaRouter dialogs
2012-06-18 10:49:56 -07:00
Adam Powell
9471faf5dc am 8f695c52: am 706a8699: Merge "Make MediaRouter UI more robust around route count changes" into jb-dev
* commit '8f695c525f5baa623a8b951bd3a1fd2b5efd1ceb':
  Make MediaRouter UI more robust around route count changes
2012-06-18 10:49:53 -07:00
Adam Powell
7e8aac14c3 am bb20575f: am 130b4572: ActionProvider API update
* commit 'bb20575f85ada8ccdacefc53f0da7e00fdf12a16':
  ActionProvider API update
2012-06-18 10:49:41 -07:00
Adam Powell
00b7ae0936 am 772ddc0c: am fd4df469: Merge "Remove workaround for bug that was fixed a while ago." into jb-dev
* commit '772ddc0cf28625964435edc5e86048e353c425fa':
  Remove workaround for bug that was fixed a while ago.
2012-06-18 10:49:35 -07:00
Adam Powell
c92aa2e7c9 am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-dev
* commit '1b4dc0fe00805f82fb4bb89a97b6b0501e117505':
  Volume control in MediaRouter dialogs
2012-06-18 10:34:32 -07:00
Adam Powell
8f695c525f am 706a8699: Merge "Make MediaRouter UI more robust around route count changes" into jb-dev
* commit '706a8699008ce416a7fbd9a4215726fdb00ee803':
  Make MediaRouter UI more robust around route count changes
2012-06-18 10:34:29 -07:00
Adam Powell
bb20575f85 am 130b4572: ActionProvider API update
* commit '130b4572d1f3df702e5b296a655d15a41f6d4c66':
  ActionProvider API update
2012-06-18 10:33:19 -07:00
Adam Powell
772ddc0cf2 am fd4df469: Merge "Remove workaround for bug that was fixed a while ago." into jb-dev
* commit 'fd4df46917c79067416985ac53a3da6b27e8c333':
  Remove workaround for bug that was fixed a while ago.
2012-06-18 10:32:46 -07:00
Adam Powell
4599696591 Volume control in MediaRouter dialogs
MediaRouter dialogs now intercept the volume keys for altering the
current volume. The status icon indicates if the slider/buttons are
currently controlling the local device volume or a remote device's
volume.

Group volume for user routes is handled by using the
RemoteControlClient supplied by the first route in the group.

Change-Id: I40a0d054847ed5acce7a4c3b669487841b4dca15
2012-06-16 17:21:57 -07:00
Adam Powell
39d5c61725 Make MediaRouter UI more robust around route count changes
Improve the API around ActionProvider visibility overriding. Allow the
application to notify whatever is hosting the ActionProvider that
visibility has changed in a way that is friendly to alternate support
library-style reimplementations of MenuItem.

Allow MediaRouter.Callback implementations to add or remove themselves
or other Callbacks during dispatch of callback events.

Make MediaRouteActionProvider track the visibility of corresponding
menu items more accurately.

Change-Id: Ic7ddb6a87c3637904750d2661e4a9fa323b09ea0
2012-06-16 14:49:13 -07:00
Adam Powell
130b4572d1 ActionProvider API update
* Add ActionProvider#overridesItemVisibility and isVisible.
  These methods allow an ActionProvider to override the
  visibility of a MenuItem that it is bound to. If a MenuItem
  has been explicitly hidden by the application, it will not
  be visible.

* Change MediaRouteActionProvider to not require a MediaRouter
  callback, to avoid extra lifecycle management headaches.

Change-Id: I606fa98b3a6a3e60a953dd024274f9bf9c67acdd
2012-06-15 20:19:29 -07:00
Jim Miller
20039ad17b Fix 6665117: ACTION_ASSIST visual improvements
- add generic icon for search providers that don't supply one
- change alpha weighting factor for glow
- don't show ring background

Change-Id: I86c86dc2d623c25ec7b91e206fac8ad9cd60faac
2012-06-15 18:11:00 -07:00
Nick Pelly
10c45b6965 Merge "Include WIFI scan's in Battery Stats." 2012-06-15 16:55:41 -07:00
Nick Pelly
6ccaa540a1 Include WIFI scan's in Battery Stats.
Call noteWifiScanStartedFromSource() when a scan is started.
Call noteWifiScanStoppedFromSource() when a scan is finished.

The current implementation tracks to UID that requested the scan, and
correctly tracks the duration of the scan. It ignores scan requests
that occur when a scan is already in progress. It does not distinguish
between active and passive scans.

Repurpose all the noteScanWifiLockAcquired/Released() plumbing
for WIFI scan tracking. The WIFI scan locks were never reported
to the user. Use noteFullWifiLock() when WIFI scan locks are used -
this makes sense because the power draw for a WIFI scan lock
should be about the same as for a full WIFI lock.

Bug: 6642581
Change-Id: Ida6e87992853698545b89f875c973a239218317d
2012-06-15 16:10:38 -07:00
Adam Powell
307c5cfcdd Remove workaround for bug that was fixed a while ago.
Change-Id: I368dd8fea6b33af6908b6fe3b7691104166a707a
2012-06-15 15:19:09 -07:00
Adam Powell
d1e57d7886 am 15635728: am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" into jb-dev
* commit '15635728a4ff00da6cc3d6468c02d39e5631f124':
  Update MediaRouteChooserDialog grouping UI
2012-06-15 11:57:26 -07:00
Adam Powell
15635728a4 am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" into jb-dev
* commit '27db797e37ea16ea5db6eb3f6a32e0f116c1b824':
  Update MediaRouteChooserDialog grouping UI
2012-06-15 11:54:42 -07:00
Adam Powell
b5e2af5919 Update MediaRouteChooserDialog grouping UI
Move UserRouteInfo tag support to RouteInfo

Change-Id: Ia753924f8613462d5f74736be93a8d748689eef1
2012-06-15 00:11:34 -07:00
Adam Powell
2f115bc007 am 13b5c194: am 90b9f84c: Merge "API updates for MediaRouter" into jb-dev
* commit '13b5c194e1ca2ed5ca9187e15ca0518b8bb052d2':
  API updates for MediaRouter
2012-06-14 18:30:55 -07:00
Adam Powell
13b5c194e1 am 90b9f84c: Merge "API updates for MediaRouter" into jb-dev
* commit '90b9f84c43145c51180c7253cd3a3f59862c2611':
  API updates for MediaRouter
2012-06-14 17:58:05 -07:00
Adam Powell
90b9f84c43 Merge "API updates for MediaRouter" into jb-dev 2012-06-14 17:51:27 -07:00
Adam Powell
0d03c042f9 API updates for MediaRouter
* Accept a Context when fetching the names of routes and
  categories. This lets string resources resolve at time of access
  with the correct configuration. The older versions remain available
  that will use the static resources from the application. (There are
  enough cases where applications will populate this from external
  data that requiring it each time even when it was not initialized
  from a resource doesn't seem reasonable.)

* Remove the ability for apps to programmatically select non-user
  routes.

* Make MediaRouter.Callback an abstract class instead of an interface.
  This will make further extensions easier to keep compatible in the
  future.

Change-Id: If981c511dfbdfaf41ef0d1cfe4a377fc14bb5600
2012-06-14 16:16:31 -07:00
Michael Jurka
8c3ce3b6ca am cf6e1455: am 71fc205d: Merge "Change snap behavior for lock screen" into jb-dev
* commit 'cf6e14558f693ae215d5030ce562a649b4cb973f':
  Change snap behavior for lock screen
2012-06-14 11:47:58 -07:00
Michael Jurka
cf6e14558f am 71fc205d: Merge "Change snap behavior for lock screen" into jb-dev
* commit '71fc205d11490872927e279c4a0cfa3176b15f20':
  Change snap behavior for lock screen
2012-06-14 11:41:55 -07:00
Michael Jurka
71fc205d11 Merge "Change snap behavior for lock screen" into jb-dev 2012-06-14 11:39:21 -07:00
Adam Powell
a587b449c4 am 0f03d771: am f9b7f9f5: Merge "Support route grouping in the MediaRouter dialog UI." into jb-dev
* commit '0f03d771b29ff0fc6919a514c56128de9a5ecd5e':
  Support route grouping in the MediaRouter dialog UI.
2012-06-14 11:34:17 -07:00
Adam Powell
0f03d771b2 am f9b7f9f5: Merge "Support route grouping in the MediaRouter dialog UI." into jb-dev
* commit 'f9b7f9f5080100043df3c8868bca4df84becf5a1':
  Support route grouping in the MediaRouter dialog UI.
2012-06-14 11:28:37 -07:00
Michael Jurka
53f109bf49 Change snap behavior for lock screen
Use angle and distance from center, rather than
distance from target.

Change-Id: Ic970bc4b05d341dbb6aab334e3f630794f2a211c
2012-06-14 10:56:33 -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
Winson Chung
58c35bbe34 Merge "Updating AppWidgetHost to receive a callback when any appWidget has changed. (Bug 6602951)" 2012-06-14 10:30:34 -07:00
Adam Powell
d6d0bddee3 Support route grouping in the MediaRouter dialog UI.
Change-Id: Idcae12cedfb7ca13950e7fa45441fba2029a9f68
2012-06-13 23:27:09 -07:00
Winson Chung
7fbd28438c Updating AppWidgetHost to receive a callback when any appWidget has changed. (Bug 6602951)
Change-Id: I76d688b10ee7775b4ebe81259713f2aaf0009d05
2012-06-13 15:29:19 -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
Jim Miller
79cb9b52e8 am 5f190731: am 955a0169: Fix 6613962: Update keyguard to use new GlowPadView UX design.
* commit '5f1907316e0085073a314dcfa41bfb35a7f31f9f':
  Fix 6613962: Update keyguard to use new GlowPadView UX design.
2012-06-12 19:47:37 -07:00
Jim Miller
5f1907316e am 955a0169: Fix 6613962: Update keyguard to use new GlowPadView UX design.
* commit '955a016922ea49f154d190b054a202559b41a4d3':
  Fix 6613962: Update keyguard to use new GlowPadView UX design.
2012-06-12 19:41:44 -07:00
Jim Miller
955a016922 Fix 6613962: Update keyguard to use new GlowPadView UX design.
Change-Id: I4f1ef3107e5550f7df9dcb412943a84b66432b7d
2012-06-12 19:16:08 -07:00
Chia-chi Yeh
7c727e50f1 am a2becffc: am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev
* commit 'a2becffcf2a19889b90256a8479e276081ce6108':
  VPN: move VpnDialogs away from system uid.
2012-06-12 12:59:59 -07:00
Chia-chi Yeh
a2becffcf2 am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev
* commit 'd667aebfb34085960e2b41a2f52d10ae749ec44c':
  VPN: move VpnDialogs away from system uid.
2012-06-12 12:41:12 -07:00
Amith Yamasani
d1645f8d0f Disable lockscreen using a system property.
For factory testing.

Change-Id: Ie5b8be432ab8ad40d8752f978899987c95a5aef9
2012-06-12 11:53:26 -07:00
Chia-chi Yeh
d667aebfb3 Merge "VPN: move VpnDialogs away from system uid." into jb-dev 2012-06-11 11:49:46 -07:00
Chia-chi Yeh
dadc857d9d VPN: move VpnDialogs away from system uid.
Bug: 6632536
Change-Id: Iece647c077caf5298ccfe7d7aba5f0911a4ed0d1
2012-06-08 13:05:58 -07:00
Adam Powell
f6e03e5540 am 72329952: am 4c38fe36: Merge "Protect against bogus input for ListViews" into jb-dev
* commit '72329952168fd86b911109602882b92494e9ccc5':
  Protect against bogus input for ListViews
2012-06-07 12:17:48 -07:00
Adam Powell
7232995216 am 4c38fe36: Merge "Protect against bogus input for ListViews" into jb-dev
* commit '4c38fe369fee76b8d4fca5a7b0b8d81a96f0219f':
  Protect against bogus input for ListViews
2012-06-07 12:14:21 -07:00
Adam Powell
4c38fe369f Merge "Protect against bogus input for ListViews" into jb-dev 2012-06-07 12:12:00 -07:00
Adam Powell
28048d011c Protect against bogus input for ListViews
Guard against cases where ListView might receive touch events while
detached.

Update ListMenuPresenter to dispatch a data set change when the
backing menu is changed.

Bug 6543282

Change-Id: If2fb9b6aa3cf4a1b7070a7cd0de0edf0fc2f4cca
2012-06-06 22:47:56 -07:00
Dianne Hackborn
9a8eed3a4d am 18aa041a: am 6cd19e02: Merge "Fix some divide by zero errors that could crash the system." into jb-dev
* commit '18aa041a62d36b9f2d4ead8ca0945ec87af582b4':
  Fix some divide by zero errors that could crash the system.
2012-06-06 14:22:43 -07:00