Sudheer Shanka
eb6195c7a2
am eaa25779: am a0fa30dc: am a408061c: Merge "Use the intent filter icon in ResolveInfo for managed profile." into mnc-dev
...
* commit 'eaa2577953eeff27754f6707ac0efa11b77ed947':
Use the intent filter icon in ResolveInfo for managed profile.
2015-06-19 16:25:48 +00:00
Sudheer Shanka
eaa2577953
am a0fa30dc: am a408061c: Merge "Use the intent filter icon in ResolveInfo for managed profile." into mnc-dev
...
* commit 'a0fa30dc24cfc838deb8919cf6ff7bdea5736b57':
Use the intent filter icon in ResolveInfo for managed profile.
2015-06-19 16:14:33 +00:00
Adam Lesinski
15cafc8d92
am 8542a49d: am 024d8e2f: am 8b156e37: Merge "BatteryStats: Update external stats individually." into mnc-dev
...
* commit '8542a49d06b6bfbe80190bc86c76269d4c085b17':
BatteryStats: Update external stats individually.
2015-06-19 14:18:23 +00:00
Dianne Hackborn
6c32b58bf1
am 50bf0203: am 1594edce: am 0348ba2e: Merge "Fix issue #20494208 : Go out of device idle when headset button is pressed" into mnc-dev
...
* commit '50bf0203b9ed0ac5c72ad6b2e2fcc1a6737bb565':
Fix issue #20494208 : Go out of device idle when headset button is pressed
2015-06-19 14:17:59 +00:00
Adam Lesinski
6c2a8e0da8
am 9f0179cc: am a0578a02: am 00fac635: Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev
...
* commit '9f0179cc5f6f74a6b9957f60526353898f02ac0b':
BatteryStats: Fix regression in wakelock power distribution
2015-06-19 14:17:52 +00:00
Alan Viverette
87fc22c976
am 7da029d5: am ed113f18: am b0ff3a6c: Merge "Ensure ResolverDrawerLayout is visible to accessibility services" into mnc-dev
...
* commit '7da029d5d0631425f63ea944c52f58fbf2976475':
Ensure ResolverDrawerLayout is visible to accessibility services
2015-06-19 14:16:36 +00:00
Adam Lesinski
8542a49d06
am 024d8e2f: am 8b156e37: Merge "BatteryStats: Update external stats individually." into mnc-dev
...
* commit '024d8e2f49522c661e9fc0afdfa3bf435dc337d0':
BatteryStats: Update external stats individually.
2015-06-19 13:58:47 +00:00
Dianne Hackborn
50bf0203b9
am 1594edce: am 0348ba2e: Merge "Fix issue #20494208 : Go out of device idle when headset button is pressed" into mnc-dev
...
* commit '1594edcea1e8862827410f2542d19c5edb403cbe':
Fix issue #20494208 : Go out of device idle when headset button is pressed
2015-06-19 13:58:20 +00:00
Adam Lesinski
9f0179cc5f
am a0578a02: am 00fac635: Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev
...
* commit 'a0578a025949b0759dbd6109b60c2c560b03b2d5':
BatteryStats: Fix regression in wakelock power distribution
2015-06-19 13:58:09 +00:00
Alan Viverette
7da029d5d0
am ed113f18: am b0ff3a6c: Merge "Ensure ResolverDrawerLayout is visible to accessibility services" into mnc-dev
...
* commit 'ed113f1848191bf6baf63d00efe2620e7e7d1a35':
Ensure ResolverDrawerLayout is visible to accessibility services
2015-06-19 13:55:57 +00:00
Sudheer Shanka
a408061cc7
Merge "Use the intent filter icon in ResolveInfo for managed profile." into mnc-dev
2015-06-19 09:25:59 +00:00
Adam Lesinski
8b156e37d5
Merge "BatteryStats: Update external stats individually." into mnc-dev
2015-06-19 01:22:53 +00:00
Adam Lesinski
a7c90c84e4
BatteryStats: Update external stats individually.
...
When wifi traffic causes a stats collection, we shouldn't care about
cpu or bluetooth updates.
Bug:21478443
Change-Id: I177dc0fc09951813cb4a702ad0e5d951d69f8c22
2015-06-18 18:13:36 -07:00
Dianne Hackborn
0348ba2e23
Merge "Fix issue #20494208 : Go out of device idle when headset button is pressed" into mnc-dev
2015-06-19 01:01:38 +00:00
Adam Lesinski
00fac63575
Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev
2015-06-19 00:57:47 +00:00
Dianne Hackborn
b6683c4286
Fix issue #20494208 : Go out of device idle when headset button is pressed
...
Rework how we record active transitions in battery stats to be
more general, and add an API that others can call in to
DeviceIdleController to request that we go out of idle mode.
use this for VOICE_SEARCH_HANDS_FREE.
Change-Id: Ie58de60e63036a4142881283835961fbcceec892
2015-06-18 17:40:33 -07:00
Alan Viverette
b0ff3a6cb3
Merge "Ensure ResolverDrawerLayout is visible to accessibility services" into mnc-dev
2015-06-18 21:37:55 +00:00
Alan Viverette
f45befe6c3
Ensure ResolverDrawerLayout is visible to accessibility services
...
Also removes the class name since it's not helpful to expose framework
internal class names to accessibility services that can't access them.
Bug: 18864087
Change-Id: If9b29d3929970bd893168444584a5dd1ba593c5b
2015-06-18 14:20:35 -07:00
Dan Sandler
7d8e2f656d
am 0e51f73d: am 8c1ce34b: am 50ec9b1b: Merge "Patch up certain kinds of broken notifications." into mnc-dev
...
* commit '0e51f73d9e8b7d0c731163411f74c74a697a4ed3':
Patch up certain kinds of broken notifications.
2015-06-18 20:55:57 +00:00
Dan Sandler
0e51f73d9e
am 8c1ce34b: am 50ec9b1b: Merge "Patch up certain kinds of broken notifications." into mnc-dev
...
* commit '8c1ce34b715db2aa3f714540e3735c7b41a4953d':
Patch up certain kinds of broken notifications.
2015-06-18 20:47:35 +00:00
Chris Wren
ee44e58511
am 68f9a206: am 6d1aa6d5: am 5e275f9f: Merge "instrument volume controls" into mnc-dev
...
* commit '68f9a206d7bac5a3bca83d8ba47d48d53cc151c6':
instrument volume controls
2015-06-18 20:38:18 +00:00
Dan Sandler
50ec9b1bd9
Merge "Patch up certain kinds of broken notifications." into mnc-dev
2015-06-18 20:26:49 +00:00
Chris Wren
68f9a206d7
am 6d1aa6d5: am 5e275f9f: Merge "instrument volume controls" into mnc-dev
...
* commit '6d1aa6d52ea51b6c89cf5dfb61b51e96476bcc45':
instrument volume controls
2015-06-18 20:22:15 +00:00
Chris Wren
5e275f9fc0
Merge "instrument volume controls" into mnc-dev
2015-06-18 19:57:50 +00:00
Dan Sandler
4e78706f43
Patch up certain kinds of broken notifications.
...
Notifications in which the icon resource ID is changed after
Builder.build() is called (even, and particularly, as the
last step in the current implementation of
setLatestEventInfo()) were not having their icons properly
parceled. In these cases we now attempt to catch this at
parcel time and construct the necessary Icon object.
But wait! Parceling does not require a Context. So we don't
actually know which package to load the resource from.
Therefore we now allow an Icon to be constructed with an
empty ("") package name, which allows us to complete this
parceling task despite the fact that a Notification does not
know its own package name. (In case you attempt to load a
drawable for such an Icon, loadDrawable will spot the ""
package and instead substitute the Context from its
parameters to try to load the resource.)
As it happens, even though the Notification does not know
its own package name, BaseStatusBar does, because it was
provided at NM.notify() time and is therefore included in
the StatusBarNotification structure. So we can actually
patch up the Icon (if it is TYPE_RESOURCE) and be sure to
get the icon loaded out of the correct package.
While we've got the hood open, this change fixes a couple of
related problems:
• Foreground service notifications synthetically
constructed for naughty icon==0 notifications (which we
are still allowing...FOR NOW) were losing the
FLAG_FOREGROUND_SERVICE flag (because we're
re-build()-ing them from scratch rather than rewriting
the provided Notification object). Now we set the flag
and hang onto the new notification for next time
setForeground() is called.
• We now allow media notifications to avoid getting bumped
to the top of the notification list if they're
PRIORITY_MIN. You might want to do that, I guess?
Bug: 21333763
Change-Id: Ia5d1f1acb594c7677bcc75ee3d624da4ffca671f
2015-06-18 15:12:44 -04:00
Adam Lesinski
72478f053f
BatteryStats: Fix regression in wakelock power distribution
...
We used to give 50% of the cpu time of each app to any app holding a wakelock
while the screen is off.
Since we switched to the new kernel module for measuring app's cpu time, this distribution
was lost.
Bug:21876567
Change-Id: I42c294547f63d150d9929271ca0e27fedaaa9d77
2015-06-18 12:09:25 -07:00
Clara Bayarri
42d5ebdc1e
am cfb5b615: am 3128692f: am 6bc12244: Fix Select All Option is truncated when device goes from landscape to portrait
...
* commit 'cfb5b615b982a9fcdb05ba000753803baa147f1a':
Fix Select All Option is truncated when device goes from landscape to portrait
2015-06-18 11:58:26 +00:00
Clara Bayarri
cfb5b615b9
am 3128692f: am 6bc12244: Fix Select All Option is truncated when device goes from landscape to portrait
...
* commit '3128692fd4a7d9113becc5bfbd0206413b34ebaa':
Fix Select All Option is truncated when device goes from landscape to portrait
2015-06-18 11:46:13 +00:00
Clara Bayarri
6bc1224448
Fix Select All Option is truncated when device goes from landscape to portrait
...
We were not taking into account configuration changes to update the
available space for the toolbar.
Bug: 21816857
Change-Id: I0f346e8eecb66ab788d1500239d5c1e020b87f97
2015-06-18 11:58:12 +01:00
Hyunyoung Song
0fe8e6a5f5
am 02cf3fc0: am d90fadcc: am 0ff78e7c: Merge "AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873" into mnc-dev
...
* commit '02cf3fc008ee98eec7fbe4682556c3bd923bdd91':
AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873
2015-06-18 06:33:30 +00:00
Hyunyoung Song
02cf3fc008
am d90fadcc: am 0ff78e7c: Merge "AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873" into mnc-dev
...
* commit 'd90fadcc0bbbe729b03b913ee96c6e43c1d9c662':
AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873
2015-06-18 06:19:15 +00:00
Hyunyoung Song
0ff78e7cc8
Merge "AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873" into mnc-dev
2015-06-18 05:58:36 +00:00
Abodunrinwa Toki
d5ddf1a157
am e4c89718: am da0b2bda: am e8378476: Merge "Allow content rect to overshoot the bottom view bounds by 20dp." into mnc-dev
...
* commit 'e4c897189a7b5a194d9f586e4fa00a5634caffd3':
Allow content rect to overshoot the bottom view bounds by 20dp.
2015-06-18 01:41:38 +00:00
Abodunrinwa Toki
e4c897189a
am da0b2bda: am e8378476: Merge "Allow content rect to overshoot the bottom view bounds by 20dp." into mnc-dev
...
* commit 'da0b2bda80d16e9cf3c7705377f7fba6284cb765':
Allow content rect to overshoot the bottom view bounds by 20dp.
2015-06-18 01:29:04 +00:00
Abodunrinwa Toki
e8378476b5
Merge "Allow content rect to overshoot the bottom view bounds by 20dp." into mnc-dev
2015-06-18 01:05:07 +00:00
Adam Powell
af40c099ad
am 3977bad2: am 352e6d77: am 40359f73: Merge "Request application of WindowInsets when setting a content view" into mnc-dev
...
* commit '3977bad2b083bbf88c9b536564595584ce7db638':
Request application of WindowInsets when setting a content view
2015-06-17 23:28:08 +00:00
Adam Powell
3977bad2b0
am 352e6d77: am 40359f73: Merge "Request application of WindowInsets when setting a content view" into mnc-dev
...
* commit '352e6d77ef73d846ee840d26e6ccacb54e485eed':
Request application of WindowInsets when setting a content view
2015-06-17 23:06:48 +00:00
Adam Powell
40359f73b1
Merge "Request application of WindowInsets when setting a content view" into mnc-dev
2015-06-17 22:42:17 +00:00
Hyunyoung Song
ccf6c68147
AppWidgetServiceImpl should use ParceledListSlice as return object
...
b/19904873
> Reason: to prevent TransactionTooLargeException from occuring when
binder transaction size goes over the limit.
Change-Id: I054cb161d235234f3ccdaadd70314163e690b0db
2015-06-17 15:23:31 -07:00
Adam Powell
41607d5a2b
Request application of WindowInsets when setting a content view
...
For both PhoneWindow and VoiceInteractionSession, call
requestApplyInsets when the content view(s) change. This is generally
what the developer expects if the new view tree responds to insets in
any way.
Bug 21620924
Change-Id: I60a88af55bf85217c3587aa37f03fdc3fdce686d
2015-06-17 13:37:06 -07:00
Chris Wren
e565ee6ccb
instrument volume controls
...
Bug: 21474639
Change-Id: I48641ae778f4e274c0f67ca6491102d978d3cd5f
2015-06-17 15:27:38 -04:00
Matthew Williams
e7ed27bf54
am 5df4154b: am 53e8781d: am 15ce3387: Merge "Make sync settings restore more robust" into mnc-dev
...
* commit '5df4154b1ba7d051949eceb3413b6a92e068361b':
Make sync settings restore more robust
2015-06-16 23:07:48 +00:00
Matthew Williams
5df4154b1b
am 53e8781d: am 15ce3387: Merge "Make sync settings restore more robust" into mnc-dev
...
* commit '53e8781dd7702aedd3eb1a12d61477269896b36e':
Make sync settings restore more robust
2015-06-16 22:54:50 +00:00
Matthew Williams
15ce33873e
Merge "Make sync settings restore more robust" into mnc-dev
2015-06-16 22:36:53 +00:00
Abodunrinwa Toki
15a6c89f46
Allow content rect to overshoot the bottom view bounds by 20dp.
...
Bug: 21816429
Change-Id: I84013286896d145c9501351bc6a638cbda12e8c0
2015-06-16 23:27:55 +01:00
Adam Powell
56ee010cd8
am 93af99f2: am 749285a2: am 26b27cab: Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev
...
* commit '93af99f21d5499b3d2100951f9238a296043b355':
Fix crash in ToolbarActionBar when setting null custom view
2015-06-16 22:17:23 +00:00
Adam Powell
93af99f21d
am 749285a2: am 26b27cab: Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev
...
* commit '749285a23873cd134788b3affae39643b1543653':
Fix crash in ToolbarActionBar when setting null custom view
2015-06-16 22:04:01 +00:00
Abodunrinwa Toki
bb6ccf9714
am a9eee504: am 03c70cac: am 98f98dd1: Merge "Fix floating toolbar flickers." into mnc-dev
...
* commit 'a9eee50455ff3894a17273fa1ffac2700cfa0d4c':
Fix floating toolbar flickers.
2015-06-16 22:03:52 +00:00
Abodunrinwa Toki
4165566936
am 686a2e63: am 7ebde83a: am 6161c5b4: Merge "Floating toolbar no longer obstructs the soft keyboard." into mnc-dev
...
* commit '686a2e633c0cb9ab4a31333cd36c30fea9991776':
Floating toolbar no longer obstructs the soft keyboard.
2015-06-16 22:03:20 +00:00
Narayan Kamath
f01ffe05d2
am ba6e9b12: am 2d13fe56: am 275294db: Merge "Better systrace slices for application startup." into mnc-dev
...
* commit 'ba6e9b12a23657995b7761daf1b83366c652626e':
Better systrace slices for application startup.
2015-06-16 22:03:13 +00:00