Commit Graph

4653 Commits

Author SHA1 Message Date
Adam Powell
40a7c2d85e am af49d7db: am 96b879c7: am b3add4da: Merge "Fix regression in viewing app info from ChooserActivity targets" into mnc-dev
* commit 'af49d7db968d188ff132ff1cf8bf59ba09602819':
  Fix regression in viewing app info from ChooserActivity targets
2015-06-20 05:43:33 +00:00
Adam Powell
af49d7db96 am 96b879c7: am b3add4da: Merge "Fix regression in viewing app info from ChooserActivity targets" into mnc-dev
* commit '96b879c791551b79b6acc703e2a9b80d453bea49':
  Fix regression in viewing app info from ChooserActivity targets
2015-06-20 01:07:57 +00:00
Adam Powell
b3add4dae2 Merge "Fix regression in viewing app info from ChooserActivity targets" into mnc-dev 2015-06-20 00:46:04 +00:00
Adam Lesinski
d28292f319 am 52e7f8c7: am bd9b25ef: am b6a09299: Merge "BatteryStats: Record doze wake locks" into mnc-dev
* commit '52e7f8c76f78176ae33c22118e2f05626923c724':
  BatteryStats: Record doze wake locks
2015-06-19 21:48:37 +00:00
Adam Lesinski
52e7f8c76f am bd9b25ef: am b6a09299: Merge "BatteryStats: Record doze wake locks" into mnc-dev
* commit 'bd9b25efb8cdaa4772f730259418d66ba58beb40':
  BatteryStats: Record doze wake locks
2015-06-19 21:39:57 +00:00
Adam Lesinski
9425fe21c9 BatteryStats: Record doze wake locks
Doze wake locks don't actually hold the CPU awake, so we should record them
separately from full wakelocks, which is what we did before.

Bug:21949905
Change-Id: Ib4db3399069e0ad11f1f0dc6925a87ad0ad21ff9
2015-06-19 14:12:01 -07:00
Adrian Roos
2e0c409806 am f65f06fe: am cefeeb7c: am 4f43dc04: Assist disclosure
* commit 'f65f06fe914253b046bea085a34bed02e54e19a8':
  Assist disclosure
2015-06-19 20:43:31 +00:00
Adrian Roos
f65f06fe91 am cefeeb7c: am 4f43dc04: Assist disclosure
* commit 'cefeeb7c13653f5ba43b61205b22c8f70c843e71':
  Assist disclosure
2015-06-19 20:29:40 +00:00
Adam Powell
98b7f89430 Fix regression in viewing app info from ChooserActivity targets
Also add metrics logging to ChooserActivity

Bug 21953567
Bug 21953720

Change-Id: I6bba2cfe9b9e551e6fe6f2d4f92fc040eebf355c
2015-06-19 12:38:45 -07:00
Abodunrinwa Toki
f2c89ee507 am 1767b1fe: am e497455f: am 6983752a: Merge "Better FloatingToolbar positioning." into mnc-dev
* commit '1767b1fed44dd524f999b0b18bddbf889550a8ab':
  Better FloatingToolbar positioning.
2015-06-19 18:56:28 +00:00
Abodunrinwa Toki
1767b1fed4 am e497455f: am 6983752a: Merge "Better FloatingToolbar positioning." into mnc-dev
* commit 'e497455f637540507a923954cec5bbfad1213a8e':
  Better FloatingToolbar positioning.
2015-06-19 18:41:34 +00:00
Adrian Roos
4f43dc042b Assist disclosure
Add an animation that discloses delivery
of contextual data to the assist component.

Also fixes a bug where contextual data was
delivered to legacy assist activities even
though the user explicitly disabled context.

Bug: 21568059
Change-Id: I27dfaa36e2f677b0d73acfa4730f0f4ea3486919
2015-06-19 11:33:05 -07:00
Abodunrinwa Toki
6983752a10 Merge "Better FloatingToolbar positioning." into mnc-dev 2015-06-19 18:28:20 +00:00
David Srbecky
f32f7a3ffd Merge "Replace --include-cfi with --generate-debug-info." into mnc-dev 2015-06-19 18:26:42 +00:00
Abodunrinwa Toki
9ae95dff1d Better FloatingToolbar positioning.
-The toolbar is now rendered over the IME.
-The toolbar respects the presence of the IME and tries as much as
 possible not to obstruct it.
-The toolbar may obstruct the IME if there is limited space and we
 can't find a position that won't obstruct the IME.

*A side effect of the toolbar over the IME is that TextView handles
 will also always be rendered over the IME where necessary. This was
 the previous behavior before the regression.

Bug: 17510971
Change-Id: I26a49565bf025d7c007ba6bb80468c4988fcc051
2015-06-19 19:15:50 +01:00
Abodunrinwa Toki
32e4e77b8d am 54103b79: am 2508c6df: am 07e440b2: Merge "Fix FloatingToolbar flickers." into mnc-dev
* commit '54103b7968f0817c77a8d7a054adda1673d4b044':
  Fix FloatingToolbar flickers.
2015-06-19 16:26:05 +00:00
Andrei Stingaceanu
6031441a13 am 2bf8d561: am b91c7a76: am 50057943: Merge "Cannot select text after rotation in extract mode" into mnc-dev
* commit '2bf8d56122fd8dbfb73f20bd9fa7ec90896a4515':
  Cannot select text after rotation in extract mode
2015-06-19 16:25:54 +00:00
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
Abodunrinwa Toki
54103b7968 am 2508c6df: am 07e440b2: Merge "Fix FloatingToolbar flickers." into mnc-dev
* commit '2508c6dfafaa71c190b4d0a7346f6a579985bde7':
  Fix FloatingToolbar flickers.
2015-06-19 16:14:54 +00:00
Andrei Stingaceanu
2bf8d56122 am b91c7a76: am 50057943: Merge "Cannot select text after rotation in extract mode" into mnc-dev
* commit 'b91c7a76d525cec54df86fc3558a1c88532ee7a4':
  Cannot select text after rotation in extract mode
2015-06-19 16:14:38 +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
Abodunrinwa Toki
07e440b278 Merge "Fix FloatingToolbar flickers." into mnc-dev 2015-06-19 14:26:11 +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
Andrei Stingaceanu
50057943fb Merge "Cannot select text after rotation in extract mode" into mnc-dev 2015-06-19 09:33:04 +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
David Srbecky
065075e1f9 Replace --include-cfi with --generate-debug-info.
This follows a change in dex2oat.

(cherry picked from commit f39477b592)

Bug: 21924613
Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f
2015-06-19 02:20:06 +01: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