OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Thu, 13 Jul 2017 19:00:21 +0000 (19:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: e210bf7a40  -s ours

Change-Id: I5ae2c4e17952f0f5ca5cea8255fa2d68647c6dab

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 18:53:12 +0000 (18:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoMerge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev
Evan Laird [Thu, 13 Jul 2017 18:45:23 +0000 (18:45 +0000)]
Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev
am: 31ff02ecd2

Change-Id: I86b352ed009cf2889974d724a4cf8daf41fb61d7

7 years agoMerge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 18:39:39 +0000 (18:39 +0000)]
Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev

7 years agoMerge "Do not use rotation as indicator to relaunch from config change." into oc...
Bryce Lee [Thu, 13 Jul 2017 18:34:30 +0000 (18:34 +0000)]
Merge "Do not use rotation as indicator to relaunch from config change." into oc-dr1-dev
am: fa62d79a02

Change-Id: Iaff54dcb133a4169f70f7ea2d7ded68cc313e946

7 years agoMerge "Do not use rotation as indicator to relaunch from config change." into oc...
Bryce Lee [Thu, 13 Jul 2017 18:28:09 +0000 (18:28 +0000)]
Merge "Do not use rotation as indicator to relaunch from config change." into oc-dr1-dev

7 years agoMerge "More fine-grained exception handling so we can still use non-excepting descrip...
Paul McLean [Thu, 13 Jul 2017 18:00:55 +0000 (18:00 +0000)]
Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev
am: 84a60bf9e8

Change-Id: Ica095cfa4d341916fdb3ab1f9948c693c9471733

7 years agoMerge "Fixed a bug where status icons were not animating" into oc-dr1-dev
Selim Cinek [Thu, 13 Jul 2017 17:54:13 +0000 (17:54 +0000)]
Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev
am: c8c121757e

Change-Id: I796e63264ddbba810a1def709594fa73977f50ca

7 years agoMerge "More fine-grained exception handling so we can still use non-excepting descrip...
TreeHugger Robot [Thu, 13 Jul 2017 17:48:23 +0000 (17:48 +0000)]
Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev

7 years agoMerge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 17:47:52 +0000 (17:47 +0000)]
Merge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev
am: a926dbf5d2

Change-Id: I3f1dd4938ed37af093d326a951b9eb1854e60611

7 years agoMerge "Fixed a bug where status icons were not animating" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 17:40:44 +0000 (17:40 +0000)]
Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev

7 years agoMerge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 17:38:48 +0000 (17:38 +0000)]
Merge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev

7 years agoMerge "In-app gradient color based on systemui theme." into oc-dr1-dev
Lucas Dupin [Thu, 13 Jul 2017 17:09:59 +0000 (17:09 +0000)]
Merge "In-app gradient color based on systemui theme." into oc-dr1-dev
am: 717dd58c52

Change-Id: I35c7baae2e373f4d8bea87d1afc175833de7f59e

7 years agoMerge "In-app gradient color based on systemui theme." into oc-dr1-dev
Lucas Dupin [Thu, 13 Jul 2017 17:03:47 +0000 (17:03 +0000)]
Merge "In-app gradient color based on systemui theme." into oc-dr1-dev

7 years agoMerge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev
Selim Cinek [Thu, 13 Jul 2017 16:36:48 +0000 (16:36 +0000)]
Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev
am: ac77186d34

Change-Id: Ia5c6852cce42eb3fe600086c3140266a141bca03

7 years agoMerge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev
Selim Cinek [Thu, 13 Jul 2017 16:29:21 +0000 (16:29 +0000)]
Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Thu, 13 Jul 2017 16:06:11 +0000 (16:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 4c44a3059c  -s ours

Change-Id: I0474490ef308e2df768be086ad76e8aae671891d

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 16:01:10 +0000 (16:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoMore fine-grained exception handling so we can still use non-excepting descriptors.
Paul McLean [Tue, 11 Jul 2017 17:18:59 +0000 (11:18 -0600)]
More fine-grained exception handling so we can still use non-excepting descriptors.

Bug: 63655391
Test: Manual - connect various devices and verify the connection state is correct.
Change-Id: Iae6143d2e853e916c8588e0c6f771c00714b3a8a

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Thu, 13 Jul 2017 15:39:12 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 482b2c3b12  -s ours

Change-Id: I943722c47109b65dee52ad67292b14ec53074a24

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 15:31:41 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoFixed a bug where status icons were not animating
Selim Cinek [Thu, 13 Jul 2017 15:27:20 +0000 (17:27 +0200)]
Fixed a bug where status icons were not animating

Initializing should be done to true

Test: manual, add animating notification, observe statusbar
Change-Id: I53c7667184b1e9e0d065816982236b9a7b919b6f
Fixes: 63533925

7 years agoFixed a bug where an incoming call wasn't launching
Selim Cinek [Thu, 13 Jul 2017 13:46:10 +0000 (15:46 +0200)]
Fixed a bug where an incoming call wasn't launching

When the lockscreen isn't showing, but aod is, an incomming
call would not launch its fullscreen intent but show up in
AOD1. In addition was the display completely messed up and
overlapping other parts of the AOD screen.

Test: receive call while in AOD but not locked
Change-Id: Icc3e989167e72289ddcd0a62064526db9004cdc2
Fixes: 62402251

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 13 Jul 2017 13:42:58 +0000 (06:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0d916ea4bce1d259de0703e12701b534f31178a3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoMerge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev
Adrian Roos [Thu, 13 Jul 2017 12:10:21 +0000 (12:10 +0000)]
Merge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev
am: 3fbd93056e

Change-Id: I8bc8e01a97711fdd30ff59aeb72d38e8acaa7c75

7 years agoMerge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev
Adrian Roos [Thu, 13 Jul 2017 12:01:52 +0000 (12:01 +0000)]
Merge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev

7 years agoMerge "Re-enable use of isPrivilegedApp()" am: bd51de1b20 am: a5a493cc19
Neil Fuller [Thu, 13 Jul 2017 11:13:09 +0000 (11:13 +0000)]
Merge "Re-enable use of isPrivilegedApp()" am: bd51de1b20 am: a5a493cc19
am: 3a6b550753

Change-Id: I0e2e6fa93a4f15023f17efba275c236880863ccd

7 years agoMerge "Re-enable use of isPrivilegedApp()" am: bd51de1b20
Neil Fuller [Thu, 13 Jul 2017 11:06:06 +0000 (11:06 +0000)]
Merge "Re-enable use of isPrivilegedApp()" am: bd51de1b20
am: a5a493cc19

Change-Id: I633d8e838d559056a331bc81bd5db5f644fa4489

7 years agoMerge "Re-enable use of isPrivilegedApp()"
Neil Fuller [Thu, 13 Jul 2017 10:59:41 +0000 (10:59 +0000)]
Merge "Re-enable use of isPrivilegedApp()"
am: bd51de1b20

Change-Id: I3e41058a76b840dfcd1b5171b8c6688509f1fd7d

7 years agoMerge "Re-enable use of isPrivilegedApp()"
Neil Fuller [Thu, 13 Jul 2017 10:50:23 +0000 (10:50 +0000)]
Merge "Re-enable use of isPrivilegedApp()"

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 13 Jul 2017 10:10:00 +0000 (03:10 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id63562e9b590d6351469c5d884ebb9e5a24ba195
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoMerge "Program offload-exempt local prefixes into the HAL" am: de837a97aa am: ae21b89414
Erik Kline [Thu, 13 Jul 2017 09:12:02 +0000 (09:12 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" am: de837a97aa am: ae21b89414
am: 17a62281e4  -s ours

Change-Id: I3242d187a794d9c3fe51f971e9b15edfe55e9ce6

7 years agoMerge "Program offload-exempt local prefixes into the HAL" am: de837a97aa
Erik Kline [Thu, 13 Jul 2017 09:07:01 +0000 (09:07 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" am: de837a97aa
am: ae21b89414

Change-Id: If96a33f26fed64a84219868d28765b7581ad453d

7 years agoMerge "Program offload-exempt local prefixes into the HAL"
Erik Kline [Thu, 13 Jul 2017 09:00:56 +0000 (09:00 +0000)]
Merge "Program offload-exempt local prefixes into the HAL"
am: de837a97aa

Change-Id: I741b6e31fb3adc922f47df824188786ff35e3aa9

7 years agoMerge "Program offload-exempt local prefixes into the HAL"
Treehugger Robot [Thu, 13 Jul 2017 08:53:05 +0000 (08:53 +0000)]
Merge "Program offload-exempt local prefixes into the HAL"

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 13 Jul 2017 07:50:26 +0000 (00:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ife7e581a0b00d66c174680ed4e40ba8ba7fed86b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoProgram offload-exempt local prefixes into the HAL
Erik Kline [Tue, 4 Jul 2017 09:28:11 +0000 (18:28 +0900)]
Program offload-exempt local prefixes into the HAL

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
    - observed calls to the HAL setLocalPrefixes in tethering log
Bug: 29337859
Bug: 32163131
Merged-In: I3c3bd4ee83ffe86ddbe6a16fbbfa0756bf5064d4
Merged-In: Iaf80e584df458010741401fc1a19e7f6e21923c1
Merged-In: Ifaf23c6179ead9de6ccfcf41e0c203025153167b
(cherry picked from commit 32179ff81511e00aef31e8fda705be3df074ece6)

Change-Id: I65ea833ac6fe7a75ebe546cfa358c4cffdf2de05

7 years agoMerge "Program offload-exempt local prefixes into the HAL" into oc-dr1-dev
Erik Kline [Thu, 13 Jul 2017 07:36:50 +0000 (07:36 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" into oc-dr1-dev
am: aa7b8b5322

Change-Id: Iaf80e584df458010741401fc1a19e7f6e21923c1

7 years agoMerge "Program offload-exempt local prefixes into the HAL" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 07:31:13 +0000 (07:31 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" into oc-dr1-dev

7 years agoProgram offload-exempt local prefixes into the HAL
Erik Kline [Tue, 4 Jul 2017 09:28:11 +0000 (18:28 +0900)]
Program offload-exempt local prefixes into the HAL

Additionally:
    - move mOffloadController into MasterTetherSM

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
    - observed calls to the HAL setLocalPrefixes in tethering log
Bug: 29337859
Bug: 32163131
Change-Id: Ifaf23c6179ead9de6ccfcf41e0c203025153167b

7 years agoMerge "Revert "Fix ContentObserver unregister issue"" am: 31419a4ad4 am: 8625194c19
Fyodor Kupolov [Thu, 13 Jul 2017 04:02:11 +0000 (04:02 +0000)]
Merge "Revert "Fix ContentObserver unregister issue"" am: 31419a4ad4 am: 8625194c19
am: cd816c1853

Change-Id: I278d9449ab47f9bdecac8ad1075daed7d718544a

7 years agoMerge "Revert "Fix ContentObserver unregister issue"" am: 31419a4ad4
Fyodor Kupolov [Thu, 13 Jul 2017 03:56:09 +0000 (03:56 +0000)]
Merge "Revert "Fix ContentObserver unregister issue"" am: 31419a4ad4
am: 8625194c19

Change-Id: I5025d99e35dd267ffc3a0c0393a24ebb87cc0546

7 years agoMerge "Revert "Fix ContentObserver unregister issue""
Fyodor Kupolov [Thu, 13 Jul 2017 03:49:36 +0000 (03:49 +0000)]
Merge "Revert "Fix ContentObserver unregister issue""
am: 31419a4ad4

Change-Id: I455be72533c24ceb5ea352774ded30d0c0a2367f

7 years agoMerge "Position app with short aspect ratio opposite of nav bar" into oc-dr1-dev
Andrii Kulian [Thu, 13 Jul 2017 03:41:34 +0000 (03:41 +0000)]
Merge "Position app with short aspect ratio opposite of nav bar" into oc-dr1-dev
am: a40af83c32

Change-Id: I08967a79847a0d42a0a5c67d2bb178d2717eae33

7 years agoMerge "Revert "Fix ContentObserver unregister issue""
Treehugger Robot [Thu, 13 Jul 2017 03:38:46 +0000 (03:38 +0000)]
Merge "Revert "Fix ContentObserver unregister issue""

7 years agoMerge "Position app with short aspect ratio opposite of nav bar" into oc-dr1-dev
Andrii Kulian [Thu, 13 Jul 2017 03:34:52 +0000 (03:34 +0000)]
Merge "Position app with short aspect ratio opposite of nav bar" into oc-dr1-dev

7 years agoMerge "Do not apply maxAspectRatio to bounds when in VR mode." into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 02:24:59 +0000 (02:24 +0000)]
Merge "Do not apply maxAspectRatio to bounds when in VR mode." into oc-dr1-dev
am: a781d471e2

Change-Id: If9c5c4a01bd11d71ba2e755b8b823a9acd013333

7 years agoMerge "Do not gate updating allDrawn on all child WindowStates." into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 02:18:50 +0000 (02:18 +0000)]
Merge "Do not gate updating allDrawn on all child WindowStates." into oc-dr1-dev
am: 7968af4873

Change-Id: Iad8a30362e2680522dafe602864d893ceb13e811

7 years agoMerge "Do not apply maxAspectRatio to bounds when in VR mode." into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 02:15:49 +0000 (02:15 +0000)]
Merge "Do not apply maxAspectRatio to bounds when in VR mode." into oc-dr1-dev

7 years agoMerge "Do not gate updating allDrawn on all child WindowStates." into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 02:12:29 +0000 (02:12 +0000)]
Merge "Do not gate updating allDrawn on all child WindowStates." into oc-dr1-dev

7 years agoDo not gate updating allDrawn on all child WindowStates.
Bryce Lee [Thu, 6 Jul 2017 21:09:29 +0000 (14:09 -0700)]
Do not gate updating allDrawn on all child WindowStates.

A recent change prevents allDrawn in AppWindowToken from being
updated until all child WindowStates have been considered. However,
children that are not visible do not affect allDrawn and therefore
need to be excluded.

This changelist adds an additional check to make sure the child can
affect the allDrawn state before considering blocking on it. It also
adds additional logs to the WindowState dump to better understand
this scenario.

Change-Id: I76d0f75496ed3da6a16c4a1d7bf2e7dc5b8bbe1e
Bug: 63380251
Test: go/wm-smoke

7 years agoMerge "Use configuration delta to determine if still in orientation change." into...
Bryce Lee [Thu, 13 Jul 2017 01:52:55 +0000 (01:52 +0000)]
Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev
am: 3de5101c12

Change-Id: I16cb39a8734799649b78a811e8b97eb87eb0c55d

7 years agoRevert "Fix ContentObserver unregister issue"
Fyodor Kupolov [Thu, 13 Jul 2017 01:44:36 +0000 (01:44 +0000)]
Revert "Fix ContentObserver unregister issue"

This reverts commit 2df4e144a913b705c50bde929c75744b251967d9.
It was causing failures in packages/apps/DocumentsUI tests

Bug: 63638102
Bug: 63154326
Change-Id: I51fb54f705f58f159f4fcc30bfed41ababcba950

7 years agoMerge "Use configuration delta to determine if still in orientation change." into...
Bryce Lee [Thu, 13 Jul 2017 01:44:17 +0000 (01:44 +0000)]
Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev

7 years agoMerge "CameraServiceProxy: Cleanups and receive more information from CameraService...
Eino-Ville Talvala [Thu, 13 Jul 2017 00:51:41 +0000 (00:51 +0000)]
Merge "CameraServiceProxy: Cleanups and receive more information from CameraService" into oc-dr1-dev
am: 6a29ad5ede

Change-Id: I4bae269fc8b923667738a0dbfd4b14b0c086ed1d

7 years agoMerge "CameraServiceProxy: Cleanups and receive more information from CameraService...
TreeHugger Robot [Thu, 13 Jul 2017 00:44:46 +0000 (00:44 +0000)]
Merge "CameraServiceProxy: Cleanups and receive more information from CameraService" into oc-dr1-dev

7 years agoMerge "Implement getDownloadStatus and add permission" am: 2fa880d016 am: d45a007222
Hall Liu [Wed, 12 Jul 2017 23:44:51 +0000 (23:44 +0000)]
Merge "Implement getDownloadStatus and add permission" am: 2fa880d016 am: d45a007222
am: 9888af1dfc

Change-Id: I98d30f379072302a5e76a8b157d8aecdd1616235

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 23:34:40 +0000 (23:34 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35 am: a6e0a6e31d am: cba64fb461 am: 998ef870c5 am: bb89a1e3fe am: f645a57a5e am: c3fc745a1c am: 26e98edf31 am: f75d22dcc0
am: 47088d2de1

Change-Id: I47a72fe8438065441223a927df286822a95124a7

7 years agoMerge "Implement getDownloadStatus and add permission" am: 2fa880d016
Hall Liu [Wed, 12 Jul 2017 23:33:23 +0000 (23:33 +0000)]
Merge "Implement getDownloadStatus and add permission" am: 2fa880d016
am: d45a007222

Change-Id: I31e9dddaf3086f885f1a75c88583953da95c8191

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 23:30:03 +0000 (23:30 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35 am: a6e0a6e31d am: cba64fb461 am: 998ef870c5 am: bb89a1e3fe am: f645a57a5e am: c3fc745a1c am: 26e98edf31 am: f75d22dcc0
am: 717765f0f3

Change-Id: I07a2bebc2cafb8fb743a1bad29ec961991198d5c

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 23:28:02 +0000 (23:28 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35 am: a6e0a6e31d am: cba64fb461 am: 998ef870c5 am: bb89a1e3fe am: f645a57a5e am: c3fc745a1c am: 26e98edf31
am: f75d22dcc0

Change-Id: I587db7b7c343221948ad7a1abccbbfb41de27659

7 years agoMerge "Implement getDownloadStatus and add permission"
Hall Liu [Wed, 12 Jul 2017 23:27:49 +0000 (23:27 +0000)]
Merge "Implement getDownloadStatus and add permission"
am: 2fa880d016

Change-Id: I1c8b9140d6fdc20347858f1296dbccfc60319959

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 23:22:01 +0000 (23:22 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35 am: a6e0a6e31d am: cba64fb461 am: 998ef870c5 am: bb89a1e3fe am: f645a57a5e am: c3fc745a1c am: 26e98edf31
am: f75d22dcc0

Change-Id: I694a91cbbfbe0590bfe87df52c7a2aad9ceaedfa

7 years agoMerge "Implement getDownloadStatus and add permission"
Hall Liu [Wed, 12 Jul 2017 23:18:37 +0000 (23:18 +0000)]
Merge "Implement getDownloadStatus and add permission"

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 23:15:37 +0000 (23:15 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35 am: a6e0a6e31d am: cba64fb461 am: 998ef870c5 am: bb89a1e3fe am: f645a57a5e am: c3fc745a1c
am: 26e98edf31

Change-Id: I75d7844c2a000fab74cc82881f8ca4cc43f7acf3

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 23:10:07 +0000 (23:10 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35 am: a6e0a6e31d am: cba64fb461 am: 998ef870c5 am: bb89a1e3fe am: f645a57a5e
am: c3fc745a1c

Change-Id: I534f11f2eb0f737a2640acf4482a4af27927f694

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 23:03:33 +0000 (23:03 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35 am: a6e0a6e31d am: cba64fb461 am: 998ef870c5 am: bb89a1e3fe
am: f645a57a5e

Change-Id: Ibff94cad13a97c9b4a696f5e6df0522e8ac89d50

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 22:57:43 +0000 (22:57 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35 am: a6e0a6e31d am: cba64fb461 am: 998ef870c5
am: bb89a1e3fe

Change-Id: I9e53b0461cb3f28ddc023ba551c1cb4eb1007340

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 22:51:18 +0000 (22:51 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35 am: a6e0a6e31d am: cba64fb461
am: 998ef870c5

Change-Id: Icaf066033ce67780052b30be3de891907129404e

7 years agoMerge "Average of top 4 CNO" into oc-dr1-dev
Siddharth Ray [Wed, 12 Jul 2017 22:46:23 +0000 (22:46 +0000)]
Merge "Average of top 4 CNO" into oc-dr1-dev
am: e7f5c6aa38

Change-Id: I0080002fb2110fe08d24551f204ff68fcd1d273d

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 22:41:32 +0000 (22:41 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35 am: a6e0a6e31d
am: cba64fb461

Change-Id: I9c4fc2279ffa79ee85dc8a46be21095918fa52ad

7 years agoMerge "Fixing some issues with the assistant stack" into oc-dr1-dev
Winson Chung [Wed, 12 Jul 2017 22:41:22 +0000 (22:41 +0000)]
Merge "Fixing some issues with the assistant stack" into oc-dr1-dev
am: fbb85140f8

Change-Id: Iaf515fe72bd89ce4cf903ebb6d1c631353482c95

7 years agoMerge "Average of top 4 CNO" into oc-dr1-dev
TreeHugger Robot [Wed, 12 Jul 2017 22:38:43 +0000 (22:38 +0000)]
Merge "Average of top 4 CNO" into oc-dr1-dev

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 22:35:35 +0000 (22:35 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987 am: 4d608d2f35
am: a6e0a6e31d

Change-Id: Ia5af67f07974b520d8c3e7424c07402793a486f2

7 years agoMerge "Fixing some issues with the assistant stack" into oc-dr1-dev
Winson Chung [Wed, 12 Jul 2017 22:32:42 +0000 (22:32 +0000)]
Merge "Fixing some issues with the assistant stack" into oc-dr1-dev

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 22:30:08 +0000 (22:30 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323 am: 111a2c7987
am: 4d608d2f35

Change-Id: Id1626217e80920f162b735336ac708c4dd9467f9

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 22:24:06 +0000 (22:24 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e am: ba46064323
am: 111a2c7987

Change-Id: Idb7d3c789c6241aa8d77eb6077930b47c7ba69e4

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 22:18:59 +0000 (22:18 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e
am: ba46064323

Change-Id: I7119e3f003562f6d826d40ad3577b9db0e44c2c6

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 22:14:01 +0000 (22:14 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522
am: 1add6be25e

Change-Id: I83a6c654862443a69bfeeaf675a8c038b3f7fb53

7 years agoMerge "Prevent non-fullscreen activities from triggering auto-enter PiP" into oc...
Winson Chung [Wed, 12 Jul 2017 22:10:42 +0000 (22:10 +0000)]
Merge "Prevent non-fullscreen activities from triggering auto-enter PiP" into oc-dr1-dev
am: d24ed58bc2

Change-Id: I57175352ca15a23dc7daecc352017dc2bb9ee79e

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84
Phil Weaver [Wed, 12 Jul 2017 22:06:27 +0000 (22:06 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84
am: ba928bd522

Change-Id: I74a7b0488371606dd9bdccab854d23c0e09b1ac9

7 years agoMerge "Prevent non-fullscreen activities from triggering auto-enter PiP" into oc...
Winson Chung [Wed, 12 Jul 2017 22:04:43 +0000 (22:04 +0000)]
Merge "Prevent non-fullscreen activities from triggering auto-enter PiP" into oc-dr1-dev

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours
Phil Weaver [Wed, 12 Jul 2017 22:00:31 +0000 (22:00 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours
am: f433884a84

Change-Id: I737838098a36efafe1509c4814ac1120a3bb8297

7 years agoCameraServiceProxy: Cleanups and receive more information from CameraService
Eino-Ville Talvala [Wed, 28 Jun 2017 19:44:03 +0000 (12:44 -0700)]
CameraServiceProxy: Cleanups and receive more information from CameraService

- Use constants directly from ICameraServiceProxy
- Collect more information in camera device status updates

Test: Verify manually that correct information is received, no camera CTS regressions
Bug: 32449509
Change-Id: I9b5b70a306ef0d15834291e3e752224bbf7b74b6

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57
Phil Weaver [Wed, 12 Jul 2017 21:55:31 +0000 (21:55 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57
am: 5a7eb970e2  -s ours

Change-Id: Ifd4b5ff2487c8b8035ffaf6ed7e55539f26a463e

7 years agoBack-port fixes for b/62196835
Phil Weaver [Wed, 12 Jul 2017 21:43:46 +0000 (21:43 +0000)]
Back-port fixes for b/62196835
am: 5bdffc5d57

Change-Id: Ia5dafc7a8724d296e710f32d936bb493b51951de

7 years agoPosition app with short aspect ratio opposite of nav bar
Andrii Kulian [Fri, 7 Jul 2017 21:38:09 +0000 (14:38 -0700)]
Position app with short aspect ratio opposite of nav bar

When an application doesn't support tall aspect ratio of the
screen where it's displayed, it should be positioned on the
opposite side from navigation bar. It's supposed to create
an effect of extended black nav bar.

Bug: 62893418
Test: go/wm-smoke
Test: ActivityRecordTests#testPositionLimitedAspectRatioNavBarBottom
Test: ActivityRecordTests#testPositionLimitedAspectRatioNavBarLeft
Test: ActivityRecordTests#testPositionLimitedAspectRatioNavBarRight
Change-Id: I2cd3d236ee8d0cc263fee4c0a436d78c755eb9b7

7 years agoFix qs tile drawing in edit QS panel
Evan Laird [Wed, 12 Jul 2017 20:36:06 +0000 (16:36 -0400)]
Fix qs tile drawing in edit QS panel

The problem here was reuse:

1. Tile has a SlashState -> gets SlashDrawable
2. Reused tile has no SlashState -> doesn't know how to gracefully
remove the slash and draw regularly, so it gets a slash anyway.

Unrelated, but also fixed: turn off slash animations in QS edit panel

Fixes: 63160044
Test: runtest -x
frameworks/base/packages/SystemUI/tests/src/com/android/systemui/qs/SlashImageViewTest.java

Change-Id: I6841bfafcef0588d1ca63b3326dfee1a856618f3

7 years agoFix egregious state check for window focusability.
Winson Chung [Wed, 12 Jul 2017 19:58:56 +0000 (19:58 +0000)]
Fix egregious state check for window focusability.
am: 3d0a74a9e4

Change-Id: I68aac94729227b30e2ba05bf2e89afae5a9debbf

7 years agoFix egregious state check for window focusability.
Winson Chung [Wed, 12 Jul 2017 19:37:19 +0000 (12:37 -0700)]
Fix egregious state check for window focusability.

- The original check should have not assumed that these are only app
  windows.

Bug: 63614176
Test: Ensure that you can unlock with password
Change-Id: I71a9959378bbd98a8ed6715d67119d38c3daceb5

7 years agoMerge "Using transformation method in the ImageFloatingTextView" into oc-dr1-dev
Selim Cinek [Wed, 12 Jul 2017 19:31:33 +0000 (19:31 +0000)]
Merge "Using transformation method in the ImageFloatingTextView" into oc-dr1-dev
am: 997e4ac2bb

Change-Id: Ifffc5f1dfe2a5d606e5eae128cbe0a331d4aaf7c

7 years agoPrevent non-fullscreen activities from triggering auto-enter PiP
Winson Chung [Tue, 11 Jul 2017 22:07:45 +0000 (15:07 -0700)]
Prevent non-fullscreen activities from triggering auto-enter PiP

Bug: 63581685
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testAppOpsDenyPipOnPause
Test: Launch screenshot from notification tray above auto-enter PiP
      activity

Change-Id: I0bddfd5c47d6053d079b9bd426003d526e8bb0dd

7 years agoMerge "Using transformation method in the ImageFloatingTextView" into oc-dr1-dev
TreeHugger Robot [Wed, 12 Jul 2017 19:23:16 +0000 (19:23 +0000)]
Merge "Using transformation method in the ImageFloatingTextView" into oc-dr1-dev

7 years agoMerge "wifi: Params for SAR limits" into oc-dr1-dev
Roshan Pius [Wed, 12 Jul 2017 18:48:55 +0000 (18:48 +0000)]
Merge "wifi: Params for SAR limits" into oc-dr1-dev
am: bc15a1e3ee

Change-Id: Iecd39b0d0449a356c5dfef7ec60fbca4906bf2cf

7 years agoMerge "wifi: Params for SAR limits" into oc-dr1-dev
Roshan Pius [Wed, 12 Jul 2017 18:33:20 +0000 (18:33 +0000)]
Merge "wifi: Params for SAR limits" into oc-dr1-dev

7 years agoMerge "[Companion] Prevent NPE in CallbackProxy" into oc-dr1-dev
Eugene Susla [Wed, 12 Jul 2017 18:20:09 +0000 (18:20 +0000)]
Merge "[Companion] Prevent NPE in CallbackProxy" into oc-dr1-dev
am: 9e419d3082

Change-Id: I0aa741d69e2f579a914973aff6a093a19d9097b4

7 years agoMerge "[Companion] Prevent NPE in CallbackProxy" into oc-dr1-dev
TreeHugger Robot [Wed, 12 Jul 2017 18:11:34 +0000 (18:11 +0000)]
Merge "[Companion] Prevent NPE in CallbackProxy" into oc-dr1-dev

7 years agoMerge "Avoid exposing OffloadCallbackEvent values" am: aff0d1afb6 am: 74868feecd
Erik Kline [Wed, 12 Jul 2017 18:08:25 +0000 (18:08 +0000)]
Merge "Avoid exposing OffloadCallbackEvent values" am: aff0d1afb6 am: 74868feecd
am: 1b6044f363  -s ours

Change-Id: I2f2ac148c3a2042d3a96013a14e1efd92886c241

7 years agoMerge "Stop unnecessary tethering reconfigurations" am: 8ad1c81b07 am: 009d42ffe0
Erik Kline [Wed, 12 Jul 2017 18:06:56 +0000 (18:06 +0000)]
Merge "Stop unnecessary tethering reconfigurations" am: 8ad1c81b07 am: 009d42ffe0
am: 626c3e8739  -s ours

Change-Id: If8586140a21eea1fae0b61e073db3a7665d111ac

7 years agoMerge "Avoid exposing OffloadCallbackEvent values" am: aff0d1afb6
Erik Kline [Wed, 12 Jul 2017 17:58:56 +0000 (17:58 +0000)]
Merge "Avoid exposing OffloadCallbackEvent values" am: aff0d1afb6
am: 74868feecd

Change-Id: I5495caada5fc8869c4c770bbddb37d73b2603f62