OSDN Git Service

android-x86/frameworks-base.git
7 years agoMisc fixes in settingslib
Fan Zhang [Sun, 4 Jun 2017 00:46:55 +0000 (17:46 -0700)]
Misc fixes in settingslib

Bug: 62039146
Fix: 62138362
Test: make RunSettingsLibRoboTests

- Do not use enhanced loop in lifecycle events to avoid Concurrent
modification exception.
- Tweak footer preference icon layout
- Add some logging to help debug future suggestion issues

Change-Id: I08eb3aca4b776a7d7e5db75dff8f92904d482aa3

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 3 Jun 2017 21:23:07 +0000 (21:23 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 3 Jun 2017 12:17:02 +0000 (05:17 -0700)]
Import translations. DO NOT MERGE

Change-Id: I171ceb765374ef904105e7a8ed7fbf01337be265
Auto-generated-cl: translation import

7 years agoMerge "Move strings to SettingsLib so TV can use them"
TreeHugger Robot [Sat, 3 Jun 2017 04:29:26 +0000 (04:29 +0000)]
Merge "Move strings to SettingsLib so TV can use them"

7 years agoMerge "Add media.codec to native stack dump list" into oc-dev am: 0082de03e5
Chong Zhang [Sat, 3 Jun 2017 02:33:06 +0000 (02:33 +0000)]
Merge "Add media.codec to native stack dump list" into oc-dev am: 0082de03e5
am: 46053192d9

Change-Id: Ib15d81464dd81ef916c0945e1f6d237bf8c6ecda

7 years agoMerge "Add media.codec to native stack dump list" into oc-dev
Chong Zhang [Sat, 3 Jun 2017 02:25:44 +0000 (02:25 +0000)]
Merge "Add media.codec to native stack dump list" into oc-dev
am: 0082de03e5

Change-Id: I39887ee66b1c09a2ab477978681866f407c72b81

7 years agoMerge "Add media.codec to native stack dump list" into oc-dev
TreeHugger Robot [Sat, 3 Jun 2017 02:20:17 +0000 (02:20 +0000)]
Merge "Add media.codec to native stack dump list" into oc-dev

7 years agoMerge "AAPT2: Allow undefined resources (placeholders)"
TreeHugger Robot [Sat, 3 Jun 2017 01:55:49 +0000 (01:55 +0000)]
Merge "AAPT2: Allow undefined resources (placeholders)"

7 years agoMerge "Handling cases with a null bitmap." into oc-dev am: 1eddb0cb2e
Winson Chung [Sat, 3 Jun 2017 01:52:44 +0000 (01:52 +0000)]
Merge "Handling cases with a null bitmap." into oc-dev am: 1eddb0cb2e
am: d1a3b24b62

Change-Id: I1f5b291a0a0b4912df5996ff409eef8ec458d937

7 years agoMerge "Handling cases with a null bitmap." into oc-dev
Winson Chung [Sat, 3 Jun 2017 01:44:41 +0000 (01:44 +0000)]
Merge "Handling cases with a null bitmap." into oc-dev
am: 1eddb0cb2e

Change-Id: Iecc01386dc5a236a85d34ff0048ec2b6fd50bc6d

7 years agoMerge "Handling cases with a null bitmap." into oc-dev
TreeHugger Robot [Sat, 3 Jun 2017 01:37:49 +0000 (01:37 +0000)]
Merge "Handling cases with a null bitmap." into oc-dev

7 years agoMerge "Workaround glitches from SOFT_INPUT_ADJUST_PAN" into oc-dev am: a2f747c57c
John Reck [Sat, 3 Jun 2017 01:19:57 +0000 (01:19 +0000)]
Merge "Workaround glitches from SOFT_INPUT_ADJUST_PAN" into oc-dev am: a2f747c57c
am: 427eb020a6

Change-Id: I567e04d71350c8176a9b39f776fc3ba356c253fa

7 years agoMerge "Workaround glitches from SOFT_INPUT_ADJUST_PAN" into oc-dev
John Reck [Sat, 3 Jun 2017 01:11:08 +0000 (01:11 +0000)]
Merge "Workaround glitches from SOFT_INPUT_ADJUST_PAN" into oc-dev
am: a2f747c57c

Change-Id: I86355ce39a012f9db3a688198bebeadd7bde15c6

7 years agoMerge "Workaround glitches from SOFT_INPUT_ADJUST_PAN" into oc-dev
TreeHugger Robot [Sat, 3 Jun 2017 01:01:21 +0000 (01:01 +0000)]
Merge "Workaround glitches from SOFT_INPUT_ADJUST_PAN" into oc-dev

7 years agoMerge "Fix issue with jumping PIP when IME shows." into oc-dev am: 52a4125ffd
Winson Chung [Sat, 3 Jun 2017 00:51:51 +0000 (00:51 +0000)]
Merge "Fix issue with jumping PIP when IME shows." into oc-dev am: 52a4125ffd
am: 159150c64a

Change-Id: Ie5a84b07a94966ba811e7d07a552cd3fa20e8cec

7 years agoMerge "Fix issue with jumping PIP when IME shows." into oc-dev
Winson Chung [Sat, 3 Jun 2017 00:44:58 +0000 (00:44 +0000)]
Merge "Fix issue with jumping PIP when IME shows." into oc-dev
am: 52a4125ffd

Change-Id: Ifc985e6368555fa1332315a1a6a52ced7fb705bd

7 years agoMerge "Fix issue with jumping PIP when IME shows." into oc-dev
TreeHugger Robot [Sat, 3 Jun 2017 00:35:38 +0000 (00:35 +0000)]
Merge "Fix issue with jumping PIP when IME shows." into oc-dev

7 years agoMerge "Add UDP Encap Socket Support to IpSecManager" am: 4f6ec3d11d am: c530c01744...
nharold [Sat, 3 Jun 2017 00:15:53 +0000 (00:15 +0000)]
Merge "Add UDP Encap Socket Support to IpSecManager" am: 4f6ec3d11d am: c530c01744 am: 3c1484c715
am: 7577a2ff56

Change-Id: Iafed2773a6d32542b051d944341533b2190aa284

7 years agoMerge "Add UDP Encap Socket Support to IpSecManager" am: 4f6ec3d11d am: c530c01744
nharold [Sat, 3 Jun 2017 00:04:41 +0000 (00:04 +0000)]
Merge "Add UDP Encap Socket Support to IpSecManager" am: 4f6ec3d11d am: c530c01744
am: 3c1484c715

Change-Id: Idc082c1ab2aac63ad61e5fc74be7fa75cf6e686f

7 years agoMerge "Add UDP Encap Socket Support to IpSecManager" am: 4f6ec3d11d
nharold [Fri, 2 Jun 2017 23:57:05 +0000 (23:57 +0000)]
Merge "Add UDP Encap Socket Support to IpSecManager" am: 4f6ec3d11d
am: c530c01744

Change-Id: I529711b4a658cdf82e223194ebae4ecf1a7f3ce2

7 years agoMerge "Add UDP Encap Socket Support to IpSecManager"
nharold [Fri, 2 Jun 2017 23:49:33 +0000 (23:49 +0000)]
Merge "Add UDP Encap Socket Support to IpSecManager"
am: 4f6ec3d11d

Change-Id: If2b8a92171f9d9f7d1b9aa89cf6fc90efe2f386d

7 years agoAAPT2: Allow undefined resources (placeholders)
Adam Lesinski [Thu, 1 Jun 2017 22:22:57 +0000 (15:22 -0700)]
AAPT2: Allow undefined resources (placeholders)

A resource defined like so:

<item type="drawable" name="foo" />

should be assigned the value @null.

The only exception is for <string> resources, which are given the
empty string value (since <string></string> is ambiguous). The decision
to use "" is based off the fact that old AAPT used to assign "" to all
undefined resources, even non-string ones.

Bug: 38425050
Test: make aapt2_tests
Change-Id: Ib3e0f6f83d16ddd8b279c9fd44a07a37867b85e9

7 years agoMerge "Add UDP Encap Socket Support to IpSecManager"
nharold [Fri, 2 Jun 2017 23:40:16 +0000 (23:40 +0000)]
Merge "Add UDP Encap Socket Support to IpSecManager"

7 years agoMerge "Add device and carrier flags for video calling fallback"
TreeHugger Robot [Fri, 2 Jun 2017 23:35:44 +0000 (23:35 +0000)]
Merge "Add device and carrier flags for video calling fallback"

7 years agoMerge "Use a PopupWindow to show tooltips"
TreeHugger Robot [Fri, 2 Jun 2017 23:31:01 +0000 (23:31 +0000)]
Merge "Use a PopupWindow to show tooltips"

7 years agoAdd media.codec to native stack dump list
Chong Zhang [Fri, 2 Jun 2017 17:52:04 +0000 (10:52 -0700)]
Add media.codec to native stack dump list

This is still needed for non-treble devices.

Test: do 'adb shell bugreport' on angler, and check that
'Cmd line: media.codec' and the stacks should be there.

bug: 62297059

Change-Id: Ic46b044e471a2ec3c432bb2fdc6afd6fb1f8090e

7 years agoWorkaround glitches from SOFT_INPUT_ADJUST_PAN
John Reck [Fri, 2 Jun 2017 22:50:09 +0000 (15:50 -0700)]
Workaround glitches from SOFT_INPUT_ADJUST_PAN

Change-Id: I1ee0c7d434eb03667bd5e838ea891db73651a994
Fixes: 62073166
Test: Repro app in bug

7 years agoMerge "add channel and group tags to the notificaiton logs" into oc-dev am: 76e76a5c26
Chris Wren [Fri, 2 Jun 2017 22:51:15 +0000 (22:51 +0000)]
Merge "add channel and group tags to the notificaiton logs" into oc-dev am: 76e76a5c26
am: 6b88afda65

Change-Id: I840c89e34b00cf505e50897bc7ba433f37a67dff

7 years agoMerge "add channel and group tags to the notificaiton logs" into oc-dev
Chris Wren [Fri, 2 Jun 2017 22:44:26 +0000 (22:44 +0000)]
Merge "add channel and group tags to the notificaiton logs" into oc-dev
am: 76e76a5c26

Change-Id: I0386428f5a8f8c8c0ac2cec5dc98ad35f5b3042d

7 years agoMerge "Adds ACCESS_CLASS_BLOCKED Disconnect cause" am: 75b7ef15f6 am: bbe9e26247...
Brad Ebinger [Fri, 2 Jun 2017 22:40:53 +0000 (22:40 +0000)]
Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause" am: 75b7ef15f6 am: bbe9e26247 am: 99533575b2
am: ab9ad6446a

Change-Id: I50ec5d2c4646592d7633e2e453dfa342b4c2cbcf

7 years agoMerge "add channel and group tags to the notificaiton logs" into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 22:34:06 +0000 (22:34 +0000)]
Merge "add channel and group tags to the notificaiton logs" into oc-dev

7 years agoMerge "Adds ACCESS_CLASS_BLOCKED Disconnect cause" am: 75b7ef15f6 am: bbe9e26247
Brad Ebinger [Fri, 2 Jun 2017 22:33:39 +0000 (22:33 +0000)]
Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause" am: 75b7ef15f6 am: bbe9e26247
am: 99533575b2

Change-Id: Ie29e837b6f952249683440f09630a587795238fa

7 years agoMerge "Adds ACCESS_CLASS_BLOCKED Disconnect cause" am: 75b7ef15f6
Brad Ebinger [Fri, 2 Jun 2017 22:26:31 +0000 (22:26 +0000)]
Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause" am: 75b7ef15f6
am: bbe9e26247

Change-Id: I32989c307a3c251e1d9df65cf6c91b4b29a2452e

7 years agoMerge "Adds ACCESS_CLASS_BLOCKED Disconnect cause"
Brad Ebinger [Fri, 2 Jun 2017 22:19:31 +0000 (22:19 +0000)]
Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause"
am: 75b7ef15f6

Change-Id: I7075ab7524d363ade4f42d7d3d33251243707e8a

7 years agoMerge "Notify keyguard of when power button is pressed." into oc-dev am: dd273de09e
Andrew Zeng [Fri, 2 Jun 2017 22:12:14 +0000 (22:12 +0000)]
Merge "Notify keyguard of when power button is pressed." into oc-dev am: dd273de09e
am: 3793a4ee3a

Change-Id: Ifea8a9b93f0d8c1945f3b6c7b15159b08019b9f1

7 years agoMerge "Adds ACCESS_CLASS_BLOCKED Disconnect cause"
Brad Ebinger [Fri, 2 Jun 2017 22:09:47 +0000 (22:09 +0000)]
Merge "Adds ACCESS_CLASS_BLOCKED Disconnect cause"

7 years agoMerge "Implement HW Bitmap for Skia pipeline"
TreeHugger Robot [Fri, 2 Jun 2017 22:06:32 +0000 (22:06 +0000)]
Merge "Implement HW Bitmap for Skia pipeline"

7 years agoMerge "Notify keyguard of when power button is pressed." into oc-dev
Andrew Zeng [Fri, 2 Jun 2017 22:03:30 +0000 (22:03 +0000)]
Merge "Notify keyguard of when power button is pressed." into oc-dev
am: dd273de09e

Change-Id: I2e8061b695e1823ea9ab7b46c8fdb78111601ced

7 years agoMove strings to SettingsLib so TV can use them
Tony Mantler [Fri, 26 May 2017 20:34:46 +0000 (13:34 -0700)]
Move strings to SettingsLib so TV can use them

Bug: 38496265
Test: Compiles
Change-Id: I68b535ba490e979a1869b7ea7e2be7737aaaff95

7 years agoMerge "Notify keyguard of when power button is pressed." into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 21:54:10 +0000 (21:54 +0000)]
Merge "Notify keyguard of when power button is pressed." into oc-dev

7 years agoMerge "Unminimize to save divider position after rotation"
TreeHugger Robot [Fri, 2 Jun 2017 21:39:46 +0000 (21:39 +0000)]
Merge "Unminimize to save divider position after rotation"

7 years agoHandling cases with a null bitmap.
Winson Chung [Fri, 2 Jun 2017 21:34:52 +0000 (14:34 -0700)]
Handling cases with a null bitmap.

- This can happen either if an app creates an ActivityOptions without a
  thumbnail, or if the call to create a hardware bitmap fails for any
  reason. Just ignore the thumbnail for the transition in this case.

Bug: 62296016
Test: Have not been able to reproduce, but this is just a logical change
Change-Id: I30776b651df1f42118fe1d317fa4817261a6e977

7 years agoMerge "Avoid excessive logging when the necessary proc file is unavailable." into...
Sudheer Shanka [Fri, 2 Jun 2017 21:28:19 +0000 (21:28 +0000)]
Merge "Avoid excessive logging when the necessary proc file is unavailable." into oc-dev am: ab17493ef3
am: 599bc3f19f

Change-Id: I3ad80361f65f6de1f06f9758219d02272b300c68

7 years agoMerge "Avoid excessive logging when the necessary proc file is unavailable." into...
Sudheer Shanka [Fri, 2 Jun 2017 21:18:09 +0000 (21:18 +0000)]
Merge "Avoid excessive logging when the necessary proc file is unavailable." into oc-dev
am: ab17493ef3

Change-Id: I649da92e3f5451886543f7edd8e107166b8c0125

7 years agoMerge "Avoid excessive logging when the necessary proc file is unavailable." into...
Sudheer Shanka [Fri, 2 Jun 2017 21:10:32 +0000 (21:10 +0000)]
Merge "Avoid excessive logging when the necessary proc file is unavailable." into oc-dev

7 years agoAdd device and carrier flags for video calling fallback
Ta-wei Yen [Fri, 2 Jun 2017 18:07:07 +0000 (11:07 -0700)]
Add device and carrier flags for video calling fallback

These flags let the system dialer/contacts/SMS app determine if
integration with video calling apps are allowed if the carrier video
calling is not available.

EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK in PhoneAccount.getExtras()
should be checked first. This flag is disabled by default and OEMs
will need to enable it.

If the device supports the fallback, then
CarrierConfigManager.KEY_ALLOW_VIDEO_CALLING_FALLBACK_BOOL should be
checked so individual carriers can ban the feature. This flag is
allowed by default.

Change-Id: Id46f684254402acb9142f87684ddff2d830f1701
Fixes: 62264468
Test: manual

7 years agoMerge "wifi: add utility function to return saved configurations" into oc-dev am...
Peter Qiu [Fri, 2 Jun 2017 20:45:26 +0000 (20:45 +0000)]
Merge "wifi: add utility function to return saved configurations" into oc-dev am: ca2f8a2b13
am: 64fafcd35d

Change-Id: I1e8e009e6f2230b36a5d831037aa4ef374fb8be5

7 years agoMerge "wifi: add utility function to return saved configurations" into oc-dev
Peter Qiu [Fri, 2 Jun 2017 20:38:47 +0000 (20:38 +0000)]
Merge "wifi: add utility function to return saved configurations" into oc-dev
am: ca2f8a2b13

Change-Id: I7d59b064248b7f218972bf461a31545928a6bf0c

7 years agoMerge "wifi: add utility function to return saved configurations" into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 20:25:12 +0000 (20:25 +0000)]
Merge "wifi: add utility function to return saved configurations" into oc-dev

7 years agoMerge "Merge "Use a PopupWindow to show tooltips" into oc-dev am: 8493543ce3 am:...
Android Build Merger (Role) [Fri, 2 Jun 2017 20:22:55 +0000 (20:22 +0000)]
Merge "Merge "Use a PopupWindow to show tooltips" into oc-dev am: 8493543ce3 am: 629c15297f"

7 years agoMerge "Use a PopupWindow to show tooltips" into oc-dev am: 8493543ce3
Manu Cornet [Fri, 2 Jun 2017 20:22:11 +0000 (20:22 +0000)]
Merge "Use a PopupWindow to show tooltips" into oc-dev am: 8493543ce3
am: 629c15297f

Change-Id: I5041b71149b3eaa58d85230dac26f7d22a547ae8

7 years agoMerge "Make sendVolumeUpdate method and VolumeAlias visible to ArcAudioService"
Yue Li [Fri, 2 Jun 2017 20:21:45 +0000 (20:21 +0000)]
Merge "Make sendVolumeUpdate method and VolumeAlias visible to ArcAudioService"

7 years agoAdds ACCESS_CLASS_BLOCKED Disconnect cause
Brad Ebinger [Fri, 2 Jun 2017 17:56:40 +0000 (10:56 -0700)]
Adds ACCESS_CLASS_BLOCKED Disconnect cause

Adds the ACCESS_CLASS_BLOCKED Disconnect cause in order
to allow the dialer to take action when this happens
during a VT call.

Bug: 33821263
Test: Build
Change-Id: I9afdd90f0a8a562b626b730dbb1b03cf37776ebd

7 years agoadd channel and group tags to the notificaiton logs
Chris Wren [Thu, 1 Jun 2017 17:34:46 +0000 (13:34 -0400)]
add channel and group tags to the notificaiton logs

Change-Id: Icf029e42fca46262c9d9f8ff63f26de098f888bf
Fixes: 37714086
Test: runtest systemui-notification

7 years agoMerge "Use a PopupWindow to show tooltips" into oc-dev
Manu Cornet [Fri, 2 Jun 2017 20:15:45 +0000 (20:15 +0000)]
Merge "Use a PopupWindow to show tooltips" into oc-dev
am: 8493543ce3

Change-Id: I4b026c2f273ee34860f8100b017c56fe627a2d1f

7 years agoMerge "Enable wide color gamut rendering"
TreeHugger Robot [Fri, 2 Jun 2017 20:07:49 +0000 (20:07 +0000)]
Merge "Enable wide color gamut rendering"

7 years agoUse a PopupWindow to show tooltips
Manu Cornet [Thu, 1 Jun 2017 21:44:13 +0000 (14:44 -0700)]
Use a PopupWindow to show tooltips

This allows tooltips to work even in a context where they don't belong
in any activity (and therefore no window token to use). It also
simplifies a tiny bit the logic of how to get the view to show up.

Test: Checked tooltip behavior in and outside an app
Bug: 62065980
Change-Id: I6c02009c4fdd6d4bc4fa2cf8019955360506f0ee
(cherry picked from commit 77e539775b52da55a8b23f1a9765d471ee782013)

7 years agoMerge "Use a PopupWindow to show tooltips" into oc-dev
Manu Cornet [Fri, 2 Jun 2017 20:02:44 +0000 (20:02 +0000)]
Merge "Use a PopupWindow to show tooltips" into oc-dev

7 years agoImplement HW Bitmap for Skia pipeline
Stan Iliev [Wed, 24 May 2017 17:28:36 +0000 (13:28 -0400)]
Implement HW Bitmap for Skia pipeline

Implement HW Bitmap for Skia pipeline. Use new Skia
SkImage::MakeFromAHardwareBuffer API, which will enable to
record HW Bitmap into a picture. Move logic that uploads
SkBitmap into a GraphicBuffer into pipeline specific classes.

Test: All CTS and other tests pass for HWUI pipleine. For Skia
pipeline graphics CTS tests pass, 2 UIRendering CTS tests which
excise HW bitmaps with color spaces fail, bitmapShaderEglImage
macrobench fails (to be fixed by a CL in Skia), HWUI unit tests
pass, no EGL leaks found.

Change-Id: Id5926d7cccd81af8b55400f44fb524a427543d05

7 years agoNotify keyguard of when power button is pressed.
Andrew Zeng [Fri, 17 Mar 2017 00:25:07 +0000 (17:25 -0700)]
Notify keyguard of when power button is pressed.

This is done on wear power button doesn't turn off the screen,
when the device wakes from keyguard UI isn't visible yet, so
it needs to react to power press in some way.

Bug: 35147955
Change-Id: I22619ea446770d09b53370e9244215646b60a9db

7 years agoMerge "Protect instant apps from full apps am: 09c0ef3cf9"
Android Build Merger (Role) [Fri, 2 Jun 2017 19:50:57 +0000 (19:50 +0000)]
Merge "Protect instant apps from full apps am: 09c0ef3cf9"

7 years agoProtect instant apps from full apps
Todd Kennedy [Fri, 2 Jun 2017 19:50:14 +0000 (19:50 +0000)]
Protect instant apps from full apps
am: 09c0ef3cf9

Change-Id: Ia5dad2652d5f2f24f8a3e412ab8757f743cdd361

7 years agoMerge "Merge "QS vis tweaks" into oc-dev am: 2b2221e94b am: abd4f9844f"
Android Build Merger (Role) [Fri, 2 Jun 2017 19:49:52 +0000 (19:49 +0000)]
Merge "Merge "QS vis tweaks" into oc-dev am: 2b2221e94b am: abd4f9844f"

7 years agoMerge "QS vis tweaks" into oc-dev am: 2b2221e94b
Jason Monk [Fri, 2 Jun 2017 19:49:02 +0000 (19:49 +0000)]
Merge "QS vis tweaks" into oc-dev am: 2b2221e94b
am: abd4f9844f

Change-Id: I064bbbb8c0058adb03f74acf2331342b3d6f97c7

7 years agoMerge "QS vis tweaks" into oc-dev am: 2b2221e94b
Jason Monk [Fri, 2 Jun 2017 19:44:43 +0000 (19:44 +0000)]
Merge "QS vis tweaks" into oc-dev am: 2b2221e94b
am: abd4f9844f

Change-Id: I7d84ce77d7e5f3626904b0b665fab1001b4b5d62

7 years agoMerge "Use rounded icons in QS"
TreeHugger Robot [Fri, 2 Jun 2017 19:42:20 +0000 (19:42 +0000)]
Merge "Use rounded icons in QS"

7 years agoProtect instant apps from full apps
Todd Kennedy [Thu, 1 Jun 2017 20:18:09 +0000 (13:18 -0700)]
Protect instant apps from full apps

Bug: 35871369
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Test: Manual; install instant app and ensure it runs
Change-Id: I1835fe58256377f901db38fcc3e4c98886d799ac
(cherry picked from commit befd4bc33cb7af7b5e36100c3b5421f8d8515f81)

7 years agoMerge "QS vis tweaks" into oc-dev
Jason Monk [Fri, 2 Jun 2017 19:33:24 +0000 (19:33 +0000)]
Merge "QS vis tweaks" into oc-dev
am: 2b2221e94b

Change-Id: I5c153c1f6085de0ba5aa00273bde754d0ee149b3

7 years agoMerge "Protect instant apps from full apps"
Todd Kennedy [Fri, 2 Jun 2017 19:32:08 +0000 (19:32 +0000)]
Merge "Protect instant apps from full apps"

7 years agoMerge "QS vis tweaks" into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 19:28:32 +0000 (19:28 +0000)]
Merge "QS vis tweaks" into oc-dev

7 years agoMerge "Update WIFI_CONNECTION_STRENGTH according to Wi-Fi signal split level"
TreeHugger Robot [Fri, 2 Jun 2017 18:58:06 +0000 (18:58 +0000)]
Merge "Update WIFI_CONNECTION_STRENGTH according to Wi-Fi signal split level"

7 years agoAvoid excessive logging when the necessary proc file is unavailable.
Sudheer Shanka [Fri, 2 Jun 2017 00:39:40 +0000 (17:39 -0700)]
Avoid excessive logging when the necessary proc file is unavailable.

Bug: 34133340
Test: manual
Change-Id: Ic00e58a5b7bb7f92a0467df1cab8df5cab7dffda

7 years agoMerge "wifi: hotspot2: implement Parcelable class for OSU provider"
TreeHugger Robot [Fri, 2 Jun 2017 18:37:58 +0000 (18:37 +0000)]
Merge "wifi: hotspot2: implement Parcelable class for OSU provider"

7 years agoMerge "Track added/removed window when focus is null" into oc-dev am: e8f39b53d4
Wale Ogunwale [Fri, 2 Jun 2017 18:24:33 +0000 (18:24 +0000)]
Merge "Track added/removed window when focus is null" into oc-dev am: e8f39b53d4
am: cb58f5603a

Change-Id: I2bc86c8733f50371cac03302e4eec4368f337747

7 years agoMerge "Improve consistency in focusAfterDescendants behavior" into oc-dev am: 12ee4bd7a8
Evan Rosky [Fri, 2 Jun 2017 18:16:51 +0000 (18:16 +0000)]
Merge "Improve consistency in focusAfterDescendants behavior" into oc-dev am: 12ee4bd7a8
am: c0ff11a4c5

Change-Id: I5ededc798b40b3c4c5279bb253a885199c31a440

7 years agoMerge "Track added/removed window when focus is null" into oc-dev
Wale Ogunwale [Fri, 2 Jun 2017 18:15:06 +0000 (18:15 +0000)]
Merge "Track added/removed window when focus is null" into oc-dev
am: e8f39b53d4

Change-Id: If6e54f88f66eed33e7d833663dcb7b032eb0080d

7 years agoMerge "Improve consistency in focusAfterDescendants behavior" into oc-dev
Evan Rosky [Fri, 2 Jun 2017 18:04:10 +0000 (18:04 +0000)]
Merge "Improve consistency in focusAfterDescendants behavior" into oc-dev
am: 12ee4bd7a8

Change-Id: I46212487711efebe8efa95bfa28f24e8ee24a2cf

7 years agoEnable wide color gamut rendering
Romain Guy [Mon, 17 Apr 2017 16:39:51 +0000 (09:39 -0700)]
Enable wide color gamut rendering

When wide color gamut rendering is requested, hwui will now
use an rgba16f scRGB-nl surface for rendering. This change
also fixes the way screenshots are handled in the platform
to behave properly with wide gamut rendering.

This change does not affect hardware layers. They also
need to use rgba16f scRGB-nl; this will be addressed in
another CL.

Bug: 29940137
Test: CtsUiRenderingTestCases, CtsGraphicsTestCases

Change-Id: I68fd96c451652136c566ec48fb0e97c2a7a257c5

7 years agoMerge "Testra RSSI compliance" am: 7466567d89 am: 1bb09a713d am: 27bf5d8afd
Sooraj Sasindran [Fri, 2 Jun 2017 17:59:08 +0000 (17:59 +0000)]
Merge "Testra RSSI compliance" am: 7466567d89 am: 1bb09a713d am: 27bf5d8afd
am: 8fdc533007

Change-Id: I7ebce40dd4b6cf4f25d99fe1bc9803b5bce3c5d0

7 years agoMerge "Track added/removed window when focus is null" into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 17:58:04 +0000 (17:58 +0000)]
Merge "Track added/removed window when focus is null" into oc-dev

7 years agoMerge "Improve consistency in focusAfterDescendants behavior" into oc-dev
Evan Rosky [Fri, 2 Jun 2017 17:56:22 +0000 (17:56 +0000)]
Merge "Improve consistency in focusAfterDescendants behavior" into oc-dev

7 years agoMerge "Testra RSSI compliance" am: 542ebcd3fb am: 69a3e67e3c am: 7406715630
Sooraj Sasindran [Fri, 2 Jun 2017 17:53:03 +0000 (17:53 +0000)]
Merge "Testra RSSI compliance" am: 542ebcd3fb am: 69a3e67e3c am: 7406715630
am: d63cc7e976

Change-Id: I36e3ad6872d8107783262e42bf1975bce6654c20

7 years agoMerge "Testra RSSI compliance" am: 7466567d89 am: 1bb09a713d
Sooraj Sasindran [Fri, 2 Jun 2017 17:47:13 +0000 (17:47 +0000)]
Merge "Testra RSSI compliance" am: 7466567d89 am: 1bb09a713d
am: 27bf5d8afd

Change-Id: I57d969baaa3c9b46753f0f54d8d3f5a7cd836c58

7 years agoUse rounded icons in QS
Evan Laird [Mon, 15 May 2017 16:51:34 +0000 (12:51 -0400)]
Use rounded icons in QS

Updates for QS icon resources:
        - Airplane mode
        - Alarm
        - Bluetooth
        - Flashlight
        - Cast
        - Data saver
        - Do not disturb
        - Edit (pencil icon)
        - Nightlight
        - Invert colors
        - Location
        - Settings cog
        - Wifi
        - Hotspot

* also renamed resources to have canonical names (e.g.,
ic_qs_bluetooth.xml instead of ic_qs_bluetooth_enable/disable), because
we are drawing slashes at runtime.

Some resources need animations:
        - Rotation
        - expand/collapse caret
        - Hotspot transient

Test: visual
Change-Id: I342de13757aa378400ceb585d27776e72dc4fa4a

7 years agoMerge "Annotate test method visibility in WindowManager" into oc-dev am: 0b83588177
Alan Viverette [Fri, 2 Jun 2017 17:43:40 +0000 (17:43 +0000)]
Merge "Annotate test method visibility in WindowManager" into oc-dev am: 0b83588177
am: 35eb249ebb

Change-Id: I3d20aa3c99046b6185695f8e85f7a61474620d4d

7 years agoMerge "Testra RSSI compliance" am: 542ebcd3fb am: 69a3e67e3c
Sooraj Sasindran [Fri, 2 Jun 2017 17:41:35 +0000 (17:41 +0000)]
Merge "Testra RSSI compliance" am: 542ebcd3fb am: 69a3e67e3c
am: 7406715630

Change-Id: Ic50f47187977fbc9163bc3de0a312040c9e6e273

7 years agoMerge "Testra RSSI compliance" am: 7466567d89
Sooraj Sasindran [Fri, 2 Jun 2017 17:38:02 +0000 (17:38 +0000)]
Merge "Testra RSSI compliance" am: 7466567d89
am: 1bb09a713d

Change-Id: I351f4bc774e57565691485f3bc16897807b02024

7 years agoMerge "Annotate test method visibility in WindowManager" into oc-dev
Alan Viverette [Fri, 2 Jun 2017 17:34:38 +0000 (17:34 +0000)]
Merge "Annotate test method visibility in WindowManager" into oc-dev
am: 0b83588177

Change-Id: I0393d702b3fd308dd16becefceea15f932fea599

7 years agoMerge "Testra RSSI compliance"
Sooraj Sasindran [Fri, 2 Jun 2017 17:31:39 +0000 (17:31 +0000)]
Merge "Testra RSSI compliance"
am: 7466567d89

Change-Id: I8e348f6433bef87c28ac80e6778ecfd3dede6dc5

7 years agoMerge "Testra RSSI compliance" am: 542ebcd3fb
Sooraj Sasindran [Fri, 2 Jun 2017 17:31:34 +0000 (17:31 +0000)]
Merge "Testra RSSI compliance" am: 542ebcd3fb
am: 69a3e67e3c

Change-Id: I53331fb51559ede536988061e43dece2b1d54456

7 years agoMerge "Annotate test method visibility in WindowManager" into oc-dev
TreeHugger Robot [Fri, 2 Jun 2017 17:26:47 +0000 (17:26 +0000)]
Merge "Annotate test method visibility in WindowManager" into oc-dev

7 years agoMerge "Testra RSSI compliance"
Sooraj Sasindran [Fri, 2 Jun 2017 17:25:46 +0000 (17:25 +0000)]
Merge "Testra RSSI compliance"
am: 542ebcd3fb

Change-Id: I5c31472190dc06d1ae5c2c077248b8c8f65f54e8

7 years agoQS vis tweaks
Jason Monk [Fri, 2 Jun 2017 17:17:27 +0000 (13:17 -0400)]
QS vis tweaks

 - QS Header status centering 24dp -> 32dp
 - Several fonts condensed -> medium

Test: visual
Change-Id: Ic8bc08d6a4d78ee708c4a890140b87716a883373
Fixes: 38199857

7 years agoMerge "Testra RSSI compliance"
Treehugger Robot [Fri, 2 Jun 2017 17:20:30 +0000 (17:20 +0000)]
Merge "Testra RSSI compliance"

7 years agoMerge "Testra RSSI compliance"
Treehugger Robot [Fri, 2 Jun 2017 17:16:41 +0000 (17:16 +0000)]
Merge "Testra RSSI compliance"

7 years agowifi: add utility function to return saved configurations
Peter Qiu [Wed, 31 May 2017 17:18:17 +0000 (10:18 -0700)]
wifi: add utility function to return saved configurations

The saved configurations included saved Wi-Fi networks and
Passpoint profiles.

Bug: 62048284
Test: manual test
Change-Id: I55be798d5f36fa678bf69d9f910ca10ed952518a

7 years agoUpdate WIFI_CONNECTION_STRENGTH according to Wi-Fi signal split level
Tomoharu Hatano [Wed, 26 Nov 2014 10:53:00 +0000 (19:53 +0900)]
Update WIFI_CONNECTION_STRENGTH according to Wi-Fi signal split level

Update WIFI_CONNECTION_STRENGTH in AccessPointPreference to have
correct ContentDescription according to split level of Wi-Fi signal
strength.

Bug: 62182689
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: Ic06601ccda3d81c30c694c3e4070e26c98bb110b
Signed-off-by: Masafumi Hasegawa <masafumi.x.hasegawa@sonymobile.com>
7 years agoMerge "Prevent showing voice session when it is already queued to be hidden." into...
Winson Chung [Fri, 2 Jun 2017 16:25:07 +0000 (16:25 +0000)]
Merge "Prevent showing voice session when it is already queued to be hidden." into oc-dev am: c672cb5ed9
am: 6d9ea8ec97

Change-Id: I9c0768835c6932c3ec4c55a26fdd63b0d5e6bac5

7 years agoMerge "MediaCodec: add CSD description for FLAC"
Wei Jia [Fri, 2 Jun 2017 16:16:36 +0000 (16:16 +0000)]
Merge "MediaCodec: add CSD description for FLAC"

7 years agoMerge "Prevent showing voice session when it is already queued to be hidden." into...
Winson Chung [Fri, 2 Jun 2017 16:13:20 +0000 (16:13 +0000)]
Merge "Prevent showing voice session when it is already queued to be hidden." into oc-dev
am: c672cb5ed9

Change-Id: I983396208aa1364884f6b90939c04ef58c2f432c