OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "[Companion] Dont crash if started with bluetooth off" into oc-dev am: c55f7d2180
Eugene Susla [Thu, 29 Jun 2017 02:22:03 +0000 (02:22 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev am: c55f7d2180
am: a96ef94e0d

Change-Id: I0c9f433041911a4f908074b89df088ee1557796b

7 years agoMerge "Selectively disable filtering if estimated safe" into oc-dev am: 38c97237e3
John Reck [Thu, 29 Jun 2017 02:20:55 +0000 (02:20 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev am: 38c97237e3
am: dfce81961d

Change-Id: I8bf7663f2f5aecf22fc83304e09dc7d7f5cc1028

7 years agoMerge "Properly check for orientation mismatch" into oc-dev am: a96d749140
Jorim Jaggi [Thu, 29 Jun 2017 02:19:49 +0000 (02:19 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev am: a96d749140
am: 9d41ce8c4f

Change-Id: I31e4258b225d3cd23409f0f901d8fe00fb1feecb

7 years agoMerge "[Companion] Dont crash if started with bluetooth off" into oc-dev
Eugene Susla [Thu, 29 Jun 2017 02:14:22 +0000 (02:14 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev
am: c55f7d2180

Change-Id: I024af9dfe70fb340b2dc481f8aad6b12351b56cb

7 years agoMerge "Selectively disable filtering if estimated safe" into oc-dev
John Reck [Thu, 29 Jun 2017 02:13:18 +0000 (02:13 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev
am: 38c97237e3

Change-Id: Ic3be7167429e8cd6a291ac0465e883522afcf9e3

7 years agoMerge "resolve merge conflicts of 91870d158748 to oc-dr1-dev" into oc-dr1-dev
Evan Laird [Thu, 29 Jun 2017 02:12:02 +0000 (02:12 +0000)]
Merge "resolve merge conflicts of 91870d158748 to oc-dr1-dev" into oc-dr1-dev
am: 423022e8ab

Change-Id: I5f81cfde196fc801c4141c35e708d8f27032c621

7 years agoMerge "Properly check for orientation mismatch" into oc-dev
Jorim Jaggi [Thu, 29 Jun 2017 02:12:02 +0000 (02:12 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev
am: a96d749140

Change-Id: I5f11ef2c520e418242b44db32d087656c4eb3984

7 years agoMerge "resolve merge conflicts of 91870d158748 to oc-dr1-dev" into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 02:00:51 +0000 (02:00 +0000)]
Merge "resolve merge conflicts of 91870d158748 to oc-dr1-dev" into oc-dr1-dev

7 years agoMerge changes from topic 'fix_broken_overlay' into oc-dr1-dev
Lucas Dupin [Thu, 29 Jun 2017 01:53:04 +0000 (01:53 +0000)]
Merge changes from topic 'fix_broken_overlay' into oc-dr1-dev
am: 4b535d93f7

Change-Id: I74f15490d9a71386230fd6f326bd0a1866c7f7d3

7 years agoMerge changes from topic 'fix_broken_overlay' into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 01:43:52 +0000 (01:43 +0000)]
Merge changes from topic 'fix_broken_overlay' into oc-dr1-dev

* changes:
  Revert "Replaced overlay target package"
  Revert "Support dark text on Recents"

7 years agoMerge "Fixes getting the wrong app transition going home after minimized (1/2)" into...
Matthew Ng [Thu, 29 Jun 2017 00:16:12 +0000 (00:16 +0000)]
Merge "Fixes getting the wrong app transition going home after minimized (1/2)" into oc-dr1-dev
am: eb36d83901

Change-Id: I01f2882da4d75a127a872858b351130f6da6aa1e

7 years agoMerge "Fixes getting the wrong app transition going home after minimized (1/2)" into...
TreeHugger Robot [Thu, 29 Jun 2017 00:09:25 +0000 (00:09 +0000)]
Merge "Fixes getting the wrong app transition going home after minimized (1/2)" into oc-dr1-dev

7 years agoMerge "[Companion] Dont crash if started with bluetooth off" into oc-dev
TreeHugger Robot [Wed, 28 Jun 2017 23:54:49 +0000 (23:54 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev

7 years agoMerge "Adjustments to PIP position while flinging" into oc-dr1-dev
Mady Mellor [Wed, 28 Jun 2017 23:53:23 +0000 (23:53 +0000)]
Merge "Adjustments to PIP position while flinging" into oc-dr1-dev
am: 176f2533a1

Change-Id: Ic5d38c862c155ac025884e53d688826b57829529

7 years agoMerge "Adjustments to PIP position while flinging" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 23:45:37 +0000 (23:45 +0000)]
Merge "Adjustments to PIP position while flinging" into oc-dr1-dev

7 years agoRevert "Replaced overlay target package"
Lucas Dupin [Wed, 28 Jun 2017 23:00:39 +0000 (16:00 -0700)]
Revert "Replaced overlay target package"

This reverts commit ae885416dddd684fab2369fde234dc9e48db5051.

7 years agoRevert "Support dark text on Recents"
Lucas Dupin [Wed, 28 Jun 2017 23:00:26 +0000 (16:00 -0700)]
Revert "Support dark text on Recents"

This reverts commit 512ce6c9b75ce7d3f4f70280a414ab8fb994e809.

7 years agoMerge "Selectively disable filtering if estimated safe" into oc-dev
John Reck [Wed, 28 Jun 2017 22:39:46 +0000 (22:39 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev

7 years agoresolve merge conflicts of 91870d158748 to oc-dr1-dev
Evan Laird [Wed, 28 Jun 2017 22:00:02 +0000 (18:00 -0400)]
resolve merge conflicts of 91870d158748 to oc-dr1-dev

Test: mp sysuig; visual
Change-Id: Id329cd7f08667b29e8d430cff6576d8894cd9cf4

7 years agoMerge "Properly check for orientation mismatch" into oc-dev
Jorim Jaggi [Wed, 28 Jun 2017 21:55:27 +0000 (21:55 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev

7 years agoMerge "Adding fields for time elapsed for headset device events." into oc-dr1-dev
Charlie Wang [Wed, 28 Jun 2017 21:37:55 +0000 (21:37 +0000)]
Merge "Adding fields for time elapsed for headset device events." into oc-dr1-dev
am: b5e79ad0d3

Change-Id: I717159a360b1aeb2f928c88b76ad060f4d8516c7

7 years agoMerge "This import got lost in the merge. Restore to fix build." into oc-dr1-dev
Alison Cichowlas [Wed, 28 Jun 2017 21:30:46 +0000 (21:30 +0000)]
Merge "This import got lost in the merge. Restore to fix build." into oc-dr1-dev
am: 29c70316df

Change-Id: Ia1864af61669029ac5596d3477b3d959e824422a

7 years agoMerge "Fix empty signal line thickness / color in status bar" into oc-dev
Evan Laird [Wed, 28 Jun 2017 21:30:15 +0000 (21:30 +0000)]
Merge "Fix empty signal line thickness / color in status bar" into oc-dev

7 years agoMerge "Merge "Don't break key event stream when enabling a11y" into oc-dev am: bb8a79...
Android Build Merger (Role) [Wed, 28 Jun 2017 21:26:45 +0000 (21:26 +0000)]
Merge "Merge "Don't break key event stream when enabling a11y" into oc-dev am: bb8a7983ff am: aec87eab5b" into oc-dr1-dev-plus-aosp

7 years agoMerge "Adding fields for time elapsed for headset device events." into oc-dr1-dev
Charlie Wang [Wed, 28 Jun 2017 21:26:38 +0000 (21:26 +0000)]
Merge "Adding fields for time elapsed for headset device events." into oc-dr1-dev

7 years agoMerge "Don't break key event stream when enabling a11y" into oc-dev am: bb8a7983ff
Phil Weaver [Wed, 28 Jun 2017 21:25:36 +0000 (21:25 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev am: bb8a7983ff
am: aec87eab5b

Change-Id: I615ef6fb2fa5786895a385f721bc929df780906f

7 years agoMerge "Don't break key event stream when enabling a11y" into oc-dev am: bb8a7983ff
Phil Weaver [Wed, 28 Jun 2017 21:24:42 +0000 (21:24 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev am: bb8a7983ff
am: 2bf63f4fde

Change-Id: I5a6fe8947017b7a8b3cfdf41c4b5583dc114bf44

7 years agoMerge "This import got lost in the merge. Restore to fix build." into oc-dr1-dev
Alison Cichowlas [Wed, 28 Jun 2017 21:23:49 +0000 (21:23 +0000)]
Merge "This import got lost in the merge. Restore to fix build." into oc-dr1-dev

7 years agoMerge "NavBar: Don't reorient as much, its a waste of work" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 21:19:19 +0000 (21:19 +0000)]
Merge "NavBar: Don't reorient as much, its a waste of work" into oc-dr1-dev
am: 587b673e5b

Change-Id: I0c7b9118cdf37f321772865caa835cdb76b79b97

7 years agoMerge "IMS: Check for binderstate before calling endSession" into oc-dr1-dev
Brad Ebinger [Wed, 28 Jun 2017 21:17:52 +0000 (21:17 +0000)]
Merge "IMS: Check for binderstate before calling endSession" into oc-dr1-dev
am: 58d47a6f04  -s ours

Change-Id: Ie857dfb83ecbfd36f965ad91caddcf3b80848e20

7 years agoMerge "Don't break key event stream when enabling a11y" into oc-dev
Phil Weaver [Wed, 28 Jun 2017 21:17:42 +0000 (21:17 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
am: bb8a7983ff

Change-Id: I0e796089c9768ddd8de1c371f0511d7967833e9d

7 years agoMerge "Don't break key event stream when enabling a11y" into oc-dev
Phil Weaver [Wed, 28 Jun 2017 21:17:42 +0000 (21:17 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
am: bb8a7983ff

Change-Id: I5deb45f1e2b2c0f667c5a37e70cdabe643f905ee

7 years agoMerge "NavBar: Don't reorient as much, its a waste of work" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 21:14:43 +0000 (21:14 +0000)]
Merge "NavBar: Don't reorient as much, its a waste of work" into oc-dr1-dev

7 years agoMerge "Don't break key event stream when enabling a11y" into oc-dev
Phil Weaver [Wed, 28 Jun 2017 21:09:03 +0000 (21:09 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev

7 years agoMerge "IMS: Check for binderstate before calling endSession" into oc-dr1-dev
Brad Ebinger [Wed, 28 Jun 2017 21:06:34 +0000 (21:06 +0000)]
Merge "IMS: Check for binderstate before calling endSession" into oc-dr1-dev

7 years agoMerge changes from topics 'embms-cleanup-action', 'embms-download-token' am: c2f33f18...
Hall Liu [Wed, 28 Jun 2017 20:53:00 +0000 (20:53 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token' am: c2f33f18eb am: 761bad1c53
am: 8f42a3a281

Change-Id: Ib6c8e17b0d6664ded17ce8eb4314124eb676713c

7 years agoAdd download request tokens and enforce destination clear am: 2043f70acb am: 8763c625a3
Hall Liu [Wed, 28 Jun 2017 20:51:57 +0000 (20:51 +0000)]
Add download request tokens and enforce destination clear am: 2043f70acb am: 8763c625a3
am: fc156f357a

Change-Id: I929fd3306a7bb8bbc2eeb31eb1732c99ec0fb743

7 years agoMerge changes from topics 'embms-cleanup-action', 'embms-download-token' am: c2f33f18eb
Hall Liu [Wed, 28 Jun 2017 20:44:48 +0000 (20:44 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token' am: c2f33f18eb
am: 761bad1c53

Change-Id: I7625defdce4fb4c69355f45d801729828646e659

7 years agoAdd download request tokens and enforce destination clear am: 2043f70acb
Hall Liu [Wed, 28 Jun 2017 20:43:45 +0000 (20:43 +0000)]
Add download request tokens and enforce destination clear am: 2043f70acb
am: 8763c625a3

Change-Id: I6704e20ad1182fc8f97bd36700c54c3d2329da28

7 years agoThis import got lost in the merge. Restore to fix build.
Alison Cichowlas [Wed, 28 Jun 2017 20:42:09 +0000 (16:42 -0400)]
This import got lost in the merge. Restore to fix build.

Test: built
Change-Id: Iba7e4449ed8ddfb535a45f087e3baf43b52a5f08

7 years agoIMS: Check for binderstate before calling endSession
Brad Ebinger [Tue, 27 Jun 2017 17:08:55 +0000 (17:08 +0000)]
IMS: Check for binderstate before calling endSession

ImsRegistrationListenerProxy listener, which is registered
as part of ImsManager.open, is not cleared even after moving
feature state to NOT_AVAILABLE because end session
is never called.

Check for binder state instead of feature state READY before
calling end session. End session will be triggered after
moving feature state to NOT_AVAILABLE.

Notify Ims state change only for the supported feature state
change to clients.

Test: Manual
Bug: 62816014
Merged-In: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
Change-Id: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
(cherry picked from commit 913e11fcdfc9cbd7fd3eee1c94d1cb3fced37da9)

7 years agoMerge changes from topics 'embms-cleanup-action', 'embms-download-token'
Hall Liu [Wed, 28 Jun 2017 20:36:49 +0000 (20:36 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
am: c2f33f18eb

Change-Id: I7c2b0b34ed56bc506ce6139fb39649aec8319e81

7 years agoAdd download request tokens and enforce destination clear
Hall Liu [Wed, 28 Jun 2017 20:35:54 +0000 (20:35 +0000)]
Add download request tokens and enforce destination clear
am: 2043f70acb

Change-Id: I91e61d8f15815efc9f4d08d71d01944c096dc05f

7 years agoMerge changes from topics 'embms-cleanup-action', 'embms-download-token'
Hall Liu [Wed, 28 Jun 2017 20:26:15 +0000 (20:26 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token'

* changes:
  Implement the cleanup action in MbmsDownloadReceiver
  Add download request tokens and enforce destination clear

7 years agoMerge "Disable failing RoundedCornersTest" into oc-dr1-dev
Alison Cichowlas [Wed, 28 Jun 2017 20:17:11 +0000 (20:17 +0000)]
Merge "Disable failing RoundedCornersTest" into oc-dr1-dev
am: e5c09e42eb

Change-Id: I7924f3e138bdd26e47e6f1c0c7f2526abc0b52f5

7 years agoAdjustments to PIP position while flinging
Mady Mellor [Wed, 7 Jun 2017 21:53:58 +0000 (14:53 -0700)]
Adjustments to PIP position while flinging

Rather than using a scroller, find the actual edge intercept
based on the trajectory of the fling.

This is done by finding the two points it could intersect with
and checking which point is 'closer' (i.e. would be hit first
by the PIP).

Bias towards using the intersection with the top / bottom edge
if the PIP is being flung along the side it's currently on.

Also increases the maximum time for the fling.

Bug: 35358634
Test: manual - fling PIP around screen while in landscape
      and portrait
Change-Id: I26e943a5ddbc726ab86bc11e4271d4db034f3d47

7 years agoMerge "Disable failing RoundedCornersTest" into oc-dr1-dev
Alison Cichowlas [Wed, 28 Jun 2017 20:08:21 +0000 (20:08 +0000)]
Merge "Disable failing RoundedCornersTest" into oc-dr1-dev

7 years agoMerge "Merge "Restrict launching activities on virtual displays" into oc-dev am:...
Android Build Merger (Role) [Wed, 28 Jun 2017 20:04:10 +0000 (20:04 +0000)]
Merge "Merge "Restrict launching activities on virtual displays" into oc-dev am: b0c5d67bf1 am: 6355cb7afa" into oc-dr1-dev-plus-aosp

7 years agoMerge "Restrict launching activities on virtual displays" into oc-dev am: b0c5d67bf1
Andrii Kulian [Wed, 28 Jun 2017 20:03:04 +0000 (20:03 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev am: b0c5d67bf1
am: cd02bf1676

Change-Id: Ieb098ddfdfb5deeb8c505b96c010e1e4281b754c

7 years agoMerge "Restrict launching activities on virtual displays" into oc-dev am: b0c5d67bf1
Andrii Kulian [Wed, 28 Jun 2017 20:03:02 +0000 (20:03 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev am: b0c5d67bf1
am: 6355cb7afa

Change-Id: Ic73a2d9b97901826e7697168238c932a1d70cf22

7 years agoMerge "Restrict launching activities on virtual displays" into oc-dev
Andrii Kulian [Wed, 28 Jun 2017 19:56:48 +0000 (19:56 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev
am: b0c5d67bf1

Change-Id: Ib8d85b8c96ff2590669e39134623456a2004d008

7 years agoMerge "Restrict launching activities on virtual displays" into oc-dev
Andrii Kulian [Wed, 28 Jun 2017 19:56:33 +0000 (19:56 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev
am: b0c5d67bf1

Change-Id: Ic2361cab5ee66552f7d1714cfca0cc320c02ed30

7 years agoMerge "Restrict launching activities on virtual displays" into oc-dev
Andrii Kulian [Wed, 28 Jun 2017 19:50:27 +0000 (19:50 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev

7 years agoMerge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev
Alison Cichowlas [Wed, 28 Jun 2017 19:23:04 +0000 (19:23 +0000)]
Merge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev
am: 22f0dfcff5

Change-Id: I8a0cad0e372b39ce237e9ff82f959e0d4b3f05dd

7 years agoMerge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev
Alison Cichowlas [Wed, 28 Jun 2017 19:12:50 +0000 (19:12 +0000)]
Merge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev

7 years agoDisable failing RoundedCornersTest
Alison Cichowlas [Wed, 28 Jun 2017 18:49:21 +0000 (14:49 -0400)]
Disable failing RoundedCornersTest

Bug: 63098063
Test: literally just test changes
Change-Id: Ibde220ccc049baa56f76c385543f97b241b4dc30

7 years agoMerge changes from topic 'theme_overlay_sysui' into oc-dr1-dev
Lucas Dupin [Wed, 28 Jun 2017 18:42:00 +0000 (18:42 +0000)]
Merge changes from topic 'theme_overlay_sysui' into oc-dr1-dev
am: b02863eba6

Change-Id: I81906c7fc634135f979316dd3c5d8d825bcf6c32

7 years agoProperly check for orientation mismatch
Jorim Jaggi [Wed, 28 Jun 2017 18:40:27 +0000 (14:40 -0400)]
Properly check for orientation mismatch

Previous check tested against the display, which is wrong. Now
we properly check against the configuration.

Test: go/wm-smoke
Test: Enter split screen, go home, launch app, go home, relaunch
app, ensure no splash screen shown
Test: Enter split screen with 2 apps, lock phone, unlock phone

Change-Id: I62d45b6d3e5aa91dcb5edffed4233a5fed7ac9aa
Fixes: 63075521

7 years agoMerge changes from topic 'theme_overlay_sysui' into oc-dr1-dev
Lucas Dupin [Wed, 28 Jun 2017 18:34:28 +0000 (18:34 +0000)]
Merge changes from topic 'theme_overlay_sysui' into oc-dr1-dev

* changes:
  Support dark text on Recents
  Replaced overlay target package

7 years agoFix empty signal line thickness / color in status bar
Evan Laird [Wed, 28 Jun 2017 18:27:47 +0000 (14:27 -0400)]
Fix empty signal line thickness / color in status bar

Parameterize the line thickness to the height of the drawable. Also draw
the empty state as background signal instead of foreground.

Test: visual
Change-Id: I39a7ef3164b784008e3dba5284b7fe83e4666607
Fixes: 63097113

7 years agoIf the menu hasn't been created yet don't do things with it am: 104be2e019
Mady Mellor [Wed, 28 Jun 2017 18:20:21 +0000 (18:20 +0000)]
If the menu hasn't been created yet don't do things with it am: 104be2e019
am: ded383d8b3

Change-Id: Id4ca0a39f39855133b384f87bb535dd1f01f5a93

7 years agoMerge "If the menu hasn't been created yet don't do things with it am: 104be2e019...
Android Build Merger (Role) [Wed, 28 Jun 2017 18:17:38 +0000 (18:17 +0000)]
Merge "If the menu hasn't been created yet don't do things with it am: 104be2e019 am: ef9a16202d" into oc-dr1-dev-plus-aosp

7 years agoIf the menu hasn't been created yet don't do things with it am: 104be2e019
Mady Mellor [Wed, 28 Jun 2017 18:16:02 +0000 (18:16 +0000)]
If the menu hasn't been created yet don't do things with it am: 104be2e019
am: ef9a16202d

Change-Id: I3f8bbe102215bf3c15f9cfa1556a2a51fc66449c

7 years agoMerge "Shrink the nav buttons some" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 18:15:27 +0000 (18:15 +0000)]
Merge "Shrink the nav buttons some" into oc-dr1-dev
am: 082a4e254f

Change-Id: I82666e8068b7c660052004f438333bfd0ec3150a

7 years agoMerge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 18:13:35 +0000 (18:13 +0000)]
Merge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev
am: 3ad6233685

Change-Id: I3d90b93e7dd896157dc1f645f3d8327bb0afd59a

7 years agoSelectively disable filtering if estimated safe
John Reck [Wed, 28 Jun 2017 18:08:07 +0000 (11:08 -0700)]
Selectively disable filtering if estimated safe

If the output matches the source rect then use
GL_NEAREST instead of GL_FILTER. This is a more
pixel-exact capture.

Bug: 38242146
Test: CtsUiRendering & CtsViewTestCases:.PixelCopyTest passes on fugu
Change-Id: I9f57a4124374568f83d45fdc8f83cc767ded888a

7 years agoIf the menu hasn't been created yet don't do things with it
Mady Mellor [Wed, 28 Jun 2017 18:10:07 +0000 (18:10 +0000)]
If the menu hasn't been created yet don't do things with it
am: 104be2e019

Change-Id: I6bf4197736f6a6c6760ac091a2ca71402e44dec8

7 years agoIf the menu hasn't been created yet don't do things with it
Mady Mellor [Wed, 28 Jun 2017 18:08:52 +0000 (18:08 +0000)]
If the menu hasn't been created yet don't do things with it
am: 104be2e019

Change-Id: I670206eb1da007b1eeea5f022124a352b0644b6a

7 years agoMerge "Add API to RuntimePermissionPresenter" into oc-dr1-dev
Lei Yu [Wed, 28 Jun 2017 18:05:18 +0000 (18:05 +0000)]
Merge "Add API to RuntimePermissionPresenter" into oc-dr1-dev
am: a023184bbc

Change-Id: Ibd5d41feaf18aacad79345404c944f365aa19587

7 years agoMerge "Shrink the nav buttons some" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 18:03:24 +0000 (18:03 +0000)]
Merge "Shrink the nav buttons some" into oc-dr1-dev

7 years agoMerge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 18:01:17 +0000 (18:01 +0000)]
Merge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev

7 years ago[Companion] Dont crash if started with bluetooth off
Eugene Susla [Wed, 28 Jun 2017 17:58:46 +0000 (10:58 -0700)]
[Companion] Dont crash if started with bluetooth off

Bug: 63068644
Test: Turn BT off, and ensure the attached bud doesn't reproduce
Change-Id: I0de5ba6d28d7195dd3ebc7a3af36f057c762de60

7 years agoMerge "Add API to RuntimePermissionPresenter" into oc-dr1-dev
Lei Yu [Wed, 28 Jun 2017 17:55:04 +0000 (17:55 +0000)]
Merge "Add API to RuntimePermissionPresenter" into oc-dr1-dev

7 years agoMerge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev
Jeff Davidson [Wed, 28 Jun 2017 17:33:01 +0000 (17:33 +0000)]
Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev
am: f28843dd3f

Change-Id: Ibd7c9c673c9272696cd955ddc50d4b55755d5429

7 years agoMerge "Switch PackageStatusStorage to XML-based storage" am: 4e77ae6d1a am: 4a7e3de5e7
Neil Fuller [Wed, 28 Jun 2017 17:28:11 +0000 (17:28 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage" am: 4e77ae6d1a am: 4a7e3de5e7
am: c1bf6505c8

Change-Id: I3342b515252fd5169a59b5b7d93d1d109036445c

7 years agoDon't break key event stream when enabling a11y
Phil Weaver [Wed, 28 Jun 2017 16:46:32 +0000 (09:46 -0700)]
Don't break key event stream when enabling a11y

Bug: 62862624
Test: Enable magnification, then enable TalkBack with the
a11y shortcut. Verify that volume keys work.
A11y service CTS, a11y units tests.

Change-Id: I729ab17d24f758b5ce534ffde43d2126a1f9536c

7 years agoMerge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev
Jeff Davidson [Wed, 28 Jun 2017 17:23:49 +0000 (17:23 +0000)]
Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev

7 years agoMerge "Switch PackageStatusStorage to XML-based storage" am: 4e77ae6d1a
Neil Fuller [Wed, 28 Jun 2017 17:20:30 +0000 (17:20 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage" am: 4e77ae6d1a
am: 4a7e3de5e7

Change-Id: I5db1d32b6141653e7971c4f1dd9931d4042bb19b

7 years agoNavBar: Don't reorient as much, its a waste of work
Jason Monk [Wed, 28 Jun 2017 17:18:33 +0000 (13:18 -0400)]
NavBar: Don't reorient as much, its a waste of work

Test: runtest systemui
Change-Id: Iea9955fb48bc7f2a3da772af34109d972e11e7d7
Fixes: 62620242

7 years agoMerge "Switch PackageStatusStorage to XML-based storage"
Neil Fuller [Wed, 28 Jun 2017 17:13:35 +0000 (17:13 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage"
am: 4e77ae6d1a

Change-Id: Ib30177ef93ecacfbd6ab0fb98f933fbf8af0e270

7 years agoRevert "Hide power dialog when lockscreen comes and goes."
Alison Cichowlas [Wed, 28 Jun 2017 14:58:05 +0000 (14:58 +0000)]
Revert "Hide power dialog when lockscreen comes and goes."

This reverts commit 0a2026430e789d5a7ddd837d6091b26bb190ac69.

Bug: 6309241437434614

Change-Id: I6b3e190b5107e0516ade0c93b586dfbdde00c9c1

7 years agoRestrict launching activities on virtual displays
Andrii Kulian [Wed, 28 Jun 2017 16:42:48 +0000 (09:42 -0700)]
Restrict launching activities on virtual displays

If an app creates a Surface and a virtual display backed by that
Surface, it can then launch activities and hijack their content.
This CL restrict activities that can be launched to virtual displays
created by apps only to those who set "allowEmbedded" attribute.
If a virtual display was created by system, apps won't get access to
the surface, so we're not limiting in this case.

Bug: 63094482
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testLaunchNotEmbeddedOnVirtualDisplay
Change-Id: Ied216bdf33df4b5a6cc8cac0e006a4883a36f94f

7 years agoMerge "Switch PackageStatusStorage to XML-based storage"
Neil Fuller [Wed, 28 Jun 2017 17:01:56 +0000 (17:01 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage"

7 years agoMerge "Use Bundle for inter-process message" into oc-dr1-dev
Ying Xu [Wed, 28 Jun 2017 16:54:19 +0000 (16:54 +0000)]
Merge "Use Bundle for inter-process message" into oc-dr1-dev
am: e5ad3821e3

Change-Id: Ia847e54c387fc145b36313048860aa6b281d4c56

7 years agoMerge "Use Bundle for inter-process message" into oc-dr1-dev
Ying Xu [Wed, 28 Jun 2017 16:47:50 +0000 (16:47 +0000)]
Merge "Use Bundle for inter-process message" into oc-dr1-dev

7 years agoIf the menu hasn't been created yet don't do things with it
Mady Mellor [Wed, 21 Jun 2017 00:18:53 +0000 (17:18 -0700)]
If the menu hasn't been created yet don't do things with it

Test: runtest systemui
Fixes: 62594598
Change-Id: I1050e2b2bf1ece960d19ad13cb6a9bf71512db57
(cherry picked from commit 0b3f004acbb0eef38ee5e8d920e934f7ab2f7cde)

7 years agoEnable "Reboot to safe mode" confirmation on GlobalActions
Shunta Sato [Fri, 14 Apr 2017 07:01:54 +0000 (16:01 +0900)]
Enable "Reboot to safe mode" confirmation on GlobalActions

Android N or prior GlobalActions showed "Reboot to safe mode",
when user do long-press of "power off" button on GlobalActions.

Currently, no confirmation dialog is shown. It's not user friendly.
This commit make it enable again.

 - Also dismiss global actions on long press.

Test: manual
Bug: 37333890
Change-Id: I3bfefff3cd34ba35b003281e94a4181cebb74fcf

7 years agoMerge "AOD: Proximity check doze triggers" into oc-dr1-dev
Adrian Roos [Wed, 28 Jun 2017 15:31:56 +0000 (15:31 +0000)]
Merge "AOD: Proximity check doze triggers" into oc-dr1-dev
am: 939171ee8b

Change-Id: Id9694514f9f48f659d7df56f05c5e4492a30de2b

7 years agoMerge "Merge "Import translations. DO NOT MERGE" into oc-dev am: f36a995424 -s ours...
Android Build Merger (Role) [Wed, 28 Jun 2017 15:29:37 +0000 (15:29 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: f36a995424  -s ours am: 8a6ee58aa0  -s ours" into oc-dr1-dev-plus-aosp

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev am: f36a995424 -s ours
Bill Yi [Wed, 28 Jun 2017 15:28:49 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am: f36a995424  -s ours
am: 8a6ee58aa0  -s ours

Change-Id: Ib7fab968af53d8cc0986ee18f1e0a7cd6c27dde2

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev am: f36a995424 -s ours
Bill Yi [Wed, 28 Jun 2017 15:28:14 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am: f36a995424  -s ours
am: 270ef883af  -s ours

Change-Id: I8b5f947a09796fdc59cc170b894ba48c844faef3

7 years agoMerge "AOD: Proximity check doze triggers" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 15:27:02 +0000 (15:27 +0000)]
Merge "AOD: Proximity check doze triggers" into oc-dr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Wed, 28 Jun 2017 15:21:46 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: f36a995424  -s ours

Change-Id: Icf392e8e462ed9bb42b9b8b67850ab702078e559

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Wed, 28 Jun 2017 15:21:44 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: f36a995424  -s ours

Change-Id: I5a453dd7e4e36f992cf55e8b633cf766280b0fae

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 28 Jun 2017 15:11:54 +0000 (15:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoShrink the nav buttons some
Jason Monk [Wed, 28 Jun 2017 14:45:13 +0000 (10:45 -0400)]
Shrink the nav buttons some

Test: visual
Bug: 37115488
Change-Id: Ie013f1644ac9782c10000dc4e4019d99c91680f8

7 years agoMerge changes I66f2c52b,I95f72c9d into oc-dr1-dev
Selim Cinek [Wed, 28 Jun 2017 14:38:21 +0000 (14:38 +0000)]
Merge changes I66f2c52b,I95f72c9d into oc-dr1-dev
am: 68e459918a

Change-Id: Id7fc79cb3aa02889c73efa27f0db9262c3ea7c12

7 years agoMerge changes I66f2c52b,I95f72c9d into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 14:30:47 +0000 (14:30 +0000)]
Merge changes I66f2c52b,I95f72c9d into oc-dr1-dev

* changes:
  Fixed the accessibility of the reply button
  Avoiding weird icon positions

7 years agoMerge "Add system to avoid a crash stopping tests from running" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 13:44:40 +0000 (13:44 +0000)]
Merge "Add system to avoid a crash stopping tests from running" into oc-dr1-dev
am: f10fcafcdf

Change-Id: Ib5a821f92aefb4200ab2aef958813d38820bea74

7 years agoMerge "Add system to avoid a crash stopping tests from running" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 13:37:51 +0000 (13:37 +0000)]
Merge "Add system to avoid a crash stopping tests from running" into oc-dr1-dev