OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Add screensaver settings to backup list" into oc-dr1-dev
Jason Monk [Mon, 10 Jul 2017 20:29:25 +0000 (20:29 +0000)]
Merge "Add screensaver settings to backup list" into oc-dr1-dev
am: 2c3c58d917

Change-Id: I981327b35f341600f908d479d4a4d36356b18b1d

7 years agoMerge "Add screensaver settings to backup list" into oc-dr1-dev
TreeHugger Robot [Mon, 10 Jul 2017 20:17:56 +0000 (20:17 +0000)]
Merge "Add screensaver settings to backup list" into oc-dr1-dev

7 years agoAdd screensaver settings to backup list
Jason Monk [Mon, 10 Jul 2017 15:14:19 +0000 (11:14 -0400)]
Add screensaver settings to backup list

Test: manual
Change-Id: Icf47312e20b4ec44d02dc31ce575e89083a8be7d
Fixes: 35700553

7 years agoMerge "Fix issue with PiP touch drift." into oc-dr1-dev
Winson Chung [Mon, 10 Jul 2017 17:18:45 +0000 (17:18 +0000)]
Merge "Fix issue with PiP touch drift." into oc-dr1-dev
am: b544b81b53

Change-Id: Idf6f88cb33aa9ba39c67f83419b18c03ef829ed2

7 years agoMerge "Fix issue with PiP touch drift." into oc-dr1-dev
Winson Chung [Mon, 10 Jul 2017 17:12:35 +0000 (17:12 +0000)]
Merge "Fix issue with PiP touch drift." into oc-dr1-dev

7 years agoMerge "Limit the number of notis an app can enqueue" into oc-dr1-dev
Julia Reynolds [Mon, 10 Jul 2017 17:06:23 +0000 (17:06 +0000)]
Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev
am: c65071d625

Change-Id: I85e7117a88be1a629a953f1c721faba508d6d424

7 years agoMerge "Add theme style flag to WallpaperColors" into oc-dr1-dev
Lucas Dupin [Mon, 10 Jul 2017 16:58:46 +0000 (16:58 +0000)]
Merge "Add theme style flag to WallpaperColors" into oc-dr1-dev
am: 8b94ef697e

Change-Id: Ic63c9dc9963846afd2ab854630d56512059609d9

7 years agoMerge "Limit the number of notis an app can enqueue" into oc-dr1-dev
Julia Reynolds [Mon, 10 Jul 2017 16:55:01 +0000 (16:55 +0000)]
Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev

7 years agoMerge "Add theme style flag to WallpaperColors" into oc-dr1-dev
Lucas Dupin [Mon, 10 Jul 2017 16:49:33 +0000 (16:49 +0000)]
Merge "Add theme style flag to WallpaperColors" into oc-dr1-dev

7 years agoMerge "Rate limit notification sounds/vibrations" into oc-dr1-dev
Julia Reynolds [Mon, 10 Jul 2017 16:02:37 +0000 (16:02 +0000)]
Merge "Rate limit notification sounds/vibrations" into oc-dr1-dev
am: 00d83ea50f

Change-Id: I9228a7b79f4c8f438fceb462128d16eddda2b563

7 years agoMerge "Rate limit notification sounds/vibrations" into oc-dr1-dev
TreeHugger Robot [Mon, 10 Jul 2017 15:57:32 +0000 (15:57 +0000)]
Merge "Rate limit notification sounds/vibrations" into oc-dr1-dev

7 years agoMerge "Configure the package name of the updater app" am: ed3e6d47ff am: e293f7ee0d
Neil Fuller [Mon, 10 Jul 2017 14:42:02 +0000 (14:42 +0000)]
Merge "Configure the package name of the updater app" am: ed3e6d47ff am: e293f7ee0d
am: fa04abb74e

Change-Id: I8239ffae3bfd5b8414482c5e486f62af5b1bdf31

7 years agoMerge "Configure the package name of the updater app" am: ed3e6d47ff
Neil Fuller [Mon, 10 Jul 2017 14:33:52 +0000 (14:33 +0000)]
Merge "Configure the package name of the updater app" am: ed3e6d47ff
am: e293f7ee0d

Change-Id: I5cf0cabc7c7abbce7a9c1181f40706966cafebfb

7 years agoMerge "Add app bounds to Configuration#compareTo." into oc-dr1-dev
Bryce Lee [Mon, 10 Jul 2017 14:30:25 +0000 (14:30 +0000)]
Merge "Add app bounds to Configuration#compareTo." into oc-dr1-dev
am: 649053810f

Change-Id: Ifc8c8e2df9296072f1c5746cff0bc005755b60a8

7 years agoMerge "Configure the package name of the updater app"
Neil Fuller [Mon, 10 Jul 2017 14:26:32 +0000 (14:26 +0000)]
Merge "Configure the package name of the updater app"
am: ed3e6d47ff

Change-Id: I6de319392c50bd8d6de56144d11333d18701fcdb

7 years agoMerge "Add app bounds to Configuration#compareTo." into oc-dr1-dev
Bryce Lee [Mon, 10 Jul 2017 14:21:37 +0000 (14:21 +0000)]
Merge "Add app bounds to Configuration#compareTo." into oc-dr1-dev

7 years agoMerge "Configure the package name of the updater app"
Neil Fuller [Mon, 10 Jul 2017 14:14:46 +0000 (14:14 +0000)]
Merge "Configure the package name of the updater app"

7 years agoMerge "Make failure to set addrgenmode a non-fatal error." am: 9c170157a8 am: 97e7afe8d0
Lorenzo Colitti [Mon, 10 Jul 2017 14:04:48 +0000 (14:04 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." am: 9c170157a8 am: 97e7afe8d0
am: 856a887361

Change-Id: Ide3e67921fb2f1751c74e03d05d7eb7b83d26dca

7 years agoMerge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621" am: c895fcef8f...
Przemyslaw Szczepaniak [Mon, 10 Jul 2017 14:02:33 +0000 (14:02 +0000)]
Merge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621" am: c895fcef8f am: 03e304e4e8
am: 0d53000386

Change-Id: I7e6064ba6d0b74584eec526d61ebb46abc02ad4f

7 years agoMerge "Fix dumpsys output for staged install version" am: 7fc43b1fbd am: d725e7aeab
Neil Fuller [Mon, 10 Jul 2017 13:55:46 +0000 (13:55 +0000)]
Merge "Fix dumpsys output for staged install version" am: 7fc43b1fbd am: d725e7aeab
am: e17e10a123

Change-Id: I49e05c4578478b893bc378e2a7b2f10e90727e89

7 years agoMerge "Make failure to set addrgenmode a non-fatal error." am: 9c170157a8
Lorenzo Colitti [Mon, 10 Jul 2017 13:54:41 +0000 (13:54 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." am: 9c170157a8
am: 97e7afe8d0

Change-Id: Icadae1e993287fd54e3c5f96b6773d713b8a1e6e

7 years agoMerge "CaptivePortalLogin ignores some ssl errors." am: d56856876f -s ours am: ae62b...
Hugo Benichi [Mon, 10 Jul 2017 13:53:58 +0000 (13:53 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." am: d56856876f  -s ours am: ae62bb1d41
am: 6393105afb

Change-Id: I76dac07dd54ee15992d59a1e75eff5f3c2de6c25

7 years agoMerge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621" am: c895fcef8f
Przemyslaw Szczepaniak [Mon, 10 Jul 2017 13:52:37 +0000 (13:52 +0000)]
Merge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621" am: c895fcef8f
am: 03e304e4e8

Change-Id: I3aadaccd191e59046db1ac138da71bbbc0261811

7 years agoMerge "Fix dumpsys output for staged install version" am: 7fc43b1fbd
Neil Fuller [Mon, 10 Jul 2017 13:48:50 +0000 (13:48 +0000)]
Merge "Fix dumpsys output for staged install version" am: 7fc43b1fbd
am: d725e7aeab

Change-Id: Ic5fdbbcfed2d840a74b01443d9ba5806b52f4745

7 years agoMerge "CaptivePortalLogin ignores some ssl errors." am: d56856876f -s ours
Hugo Benichi [Mon, 10 Jul 2017 13:47:15 +0000 (13:47 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." am: d56856876f  -s ours
am: ae62bb1d41

Change-Id: I92eceaf2295c7209166444248f0b1a719bef5f21

7 years agoMerge "Make failure to set addrgenmode a non-fatal error."
Lorenzo Colitti [Mon, 10 Jul 2017 13:43:02 +0000 (13:43 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error."
am: 9c170157a8

Change-Id: Ia4074f720ce0db69c86cd58ddc574d595cfceeee

7 years agoLimit the number of notis an app can enqueue
Julia Reynolds [Wed, 5 Jul 2017 12:47:03 +0000 (08:47 -0400)]
Limit the number of notis an app can enqueue

In addition to the number they can post. Also decrease
the number of posts per second to 5, but allow finished
progress notifications through.

Fixes: 63173849
Fixes: 63167456
Test: runtests systemui-notification & simultaneously
downloading 5 files.
Change-Id: I0c8ea35b3d9d38b000ea5fe383515e1d5a26bac7

7 years agoMerge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621"
Przemyslaw Szczepaniak [Mon, 10 Jul 2017 13:40:49 +0000 (13:40 +0000)]
Merge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621"
am: c895fcef8f

Change-Id: I1aecc608b0eaa807489683526a9267003eb975b1

7 years agoMerge "Fix dumpsys output for staged install version"
Neil Fuller [Mon, 10 Jul 2017 13:39:10 +0000 (13:39 +0000)]
Merge "Fix dumpsys output for staged install version"
am: 7fc43b1fbd

Change-Id: I14f5775c5347072365e0d84ad811078bf57c5855

7 years agoRate limit notification sounds/vibrations
Julia Reynolds [Mon, 19 Jun 2017 12:16:04 +0000 (08:16 -0400)]
Rate limit notification sounds/vibrations

1 alert per second.

Bug: 36662487
Test: runtest systemui-notification
Change-Id: I2046ae17b9e89ac0a83e182b91422fd242bc7557

7 years agoMerge "CaptivePortalLogin ignores some ssl errors."
Hugo Benichi [Mon, 10 Jul 2017 13:37:31 +0000 (13:37 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors."
am: d56856876f  -s ours

Change-Id: I6e4b778a7ea4ca9425834ed37c7f2b59cf458186

7 years agoMerge "Make failure to set addrgenmode a non-fatal error."
Treehugger Robot [Mon, 10 Jul 2017 12:15:47 +0000 (12:15 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error."

7 years agoMerge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621"
Treehugger Robot [Mon, 10 Jul 2017 12:00:31 +0000 (12:00 +0000)]
Merge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621"

7 years agoTrack libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621
Przemyslaw Szczepaniak [Tue, 4 Jul 2017 09:32:11 +0000 (10:32 +0100)]
Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621

Test: Make
Bug: 62779247
Change-Id: I919df93b20e809f42a27225403e1549b763b0a60

7 years agoMerge "Fix dumpsys output for staged install version"
Treehugger Robot [Mon, 10 Jul 2017 11:52:11 +0000 (11:52 +0000)]
Merge "Fix dumpsys output for staged install version"

7 years agoMerge "CaptivePortalLogin ignores some ssl errors."
Hugo Benichi [Mon, 10 Jul 2017 11:42:45 +0000 (11:42 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors."

7 years agoMake failure to set addrgenmode a non-fatal error.
Lorenzo Colitti [Mon, 10 Jul 2017 10:05:13 +0000 (19:05 +0900)]
Make failure to set addrgenmode a non-fatal error.

Bug: 17613910
Test: bullhead builds, boots, connects to wifi
Change-Id: I310dcacc6784c13904fca79b839b5f4d94bfc45e

7 years agoCaptivePortalLogin ignores some ssl errors.
Hugo Benichi [Sat, 17 Jun 2017 04:36:35 +0000 (13:36 +0900)]
CaptivePortalLogin ignores some ssl errors.

This patch changes the ssl error handler of the captive portal login
activity to ignore errors for resources coming from a different hostname
that the top-level page currently loading.

This allows logging into misconfigured portals that incorrectly bans ssl
to some hostnames necessary for loading their portal login pages.

Bug: 62332137
Test: manually tested with captive portal entwork.
Change-Id: I05378ed74e678829e46fbeee18df916ec6ec2856

7 years agoMerge "Add more logging to the Tethering SharedLog" am: 839cc0433f am: 0a76af09b1
Erik Kline [Sat, 8 Jul 2017 07:28:40 +0000 (07:28 +0000)]
Merge "Add more logging to the Tethering SharedLog" am: 839cc0433f am: 0a76af09b1
am: 6999649f0d  -s ours

Change-Id: I690d3d30b2e71275700ee3176a5e103ca18a4cb1

7 years agoMerge "Add more logging to the Tethering SharedLog" am: 839cc0433f
Erik Kline [Sat, 8 Jul 2017 07:21:40 +0000 (07:21 +0000)]
Merge "Add more logging to the Tethering SharedLog" am: 839cc0433f
am: 0a76af09b1

Change-Id: Ie3bd8e8a5d8911303cead707e0485c78ea7d055c

7 years agoMerge "Add more logging to the Tethering SharedLog"
Erik Kline [Sat, 8 Jul 2017 07:14:59 +0000 (07:14 +0000)]
Merge "Add more logging to the Tethering SharedLog"
am: 839cc0433f

Change-Id: Ibc2c9989ee9c5980003a60b43345baafc2cd3c0c

7 years agoMerge "Add more logging to the Tethering SharedLog"
Treehugger Robot [Sat, 8 Jul 2017 07:06:09 +0000 (07:06 +0000)]
Merge "Add more logging to the Tethering SharedLog"

7 years agoMerge "Change initial value of mStaleScanResults to true." into oc-dr1-dev
Sundeep Ghuman [Sat, 8 Jul 2017 03:13:09 +0000 (03:13 +0000)]
Merge "Change initial value of mStaleScanResults to true." into oc-dr1-dev
am: e72ec3cab2

Change-Id: If268b2db323fa52c92fccc1b259599a0be204b87

7 years agoMerge "Change initial value of mStaleScanResults to true." into oc-dr1-dev
TreeHugger Robot [Sat, 8 Jul 2017 03:06:37 +0000 (03:06 +0000)]
Merge "Change initial value of mStaleScanResults to true." into oc-dr1-dev

7 years agoChange initial value of mStaleScanResults to true.
Sundeep Ghuman [Wed, 5 Jul 2017 21:19:30 +0000 (14:19 -0700)]
Change initial value of mStaleScanResults to true.

In ag/2409026 we introduced a stale scan result bit to prevent callbacks
from sticky broadcasts from occuring until we have fetched the latest
set of scan results. However, this initial value was set to false hence
there is a race condition in which the currently connected network can
still be shown without any other networks, as the scan results have not
yet been processed.

By changing the initial value to true, we address this race condition.

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

Change-Id: I5f2108e17d2c549e2176ccf64e640fbd4808b5f1

7 years agoMerge "Moving color extraction classes" into oc-dr1-dev
Lucas Dupin [Sat, 8 Jul 2017 00:26:50 +0000 (00:26 +0000)]
Merge "Moving color extraction classes" into oc-dr1-dev
am: 456cb9603a

Change-Id: I6e1d6a124f9937b06648859333290f643ccc0150

7 years agoMerge "Moving color extraction classes" into oc-dr1-dev
TreeHugger Robot [Sat, 8 Jul 2017 00:21:44 +0000 (00:21 +0000)]
Merge "Moving color extraction classes" into oc-dr1-dev

7 years agoFix issue with PiP touch drift.
Winson Chung [Fri, 7 Jul 2017 21:49:49 +0000 (14:49 -0700)]
Fix issue with PiP touch drift.

- Fix issue with cumulative truncation of positions causing a large x/y
  error causing drift. Instead of using the rounded stack position,
  keep track of the cumulative delta and apply that on each move.

Bug: 62541932
Test: Pip activity, move around with finger and ensure no drift
Change-Id: Ic7737a6b19672ee8a1d98fd57f84a1d89f4a17e9

7 years agoMerge "[AWARE] Fix close guard method name" into oc-dr1-dev
Etan Cohen [Fri, 7 Jul 2017 23:21:05 +0000 (23:21 +0000)]
Merge "[AWARE] Fix close guard method name" into oc-dr1-dev
am: 9aabf29541

Change-Id: Ibdf4c9f91a41ba68c2d5ece4615a12e101638471

7 years agoMerge "Prevent any app except LPA to create logical channel to AID of ISD-R." into...
Derek Tan [Fri, 7 Jul 2017 23:18:54 +0000 (23:18 +0000)]
Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev
am: f1328fee0d

Change-Id: I8646c7983330beaf90f7935d01675f33df2bf7ef

7 years agoMerge "Don't remove starting window for visible app." into oc-dr1-dev
Wale Ogunwale [Fri, 7 Jul 2017 23:17:26 +0000 (23:17 +0000)]
Merge "Don't remove starting window for visible app." into oc-dr1-dev
am: d4b83f96f8

Change-Id: I0be58fbdffafd87919fe259914af3855e3768b0f

7 years agoMerge "[AWARE] Fix close guard method name" into oc-dr1-dev
Etan Cohen [Fri, 7 Jul 2017 23:13:34 +0000 (23:13 +0000)]
Merge "[AWARE] Fix close guard method name" into oc-dr1-dev

7 years agoMerge "Prevent any app except LPA to create logical channel to AID of ISD-R." into...
Derek Tan [Fri, 7 Jul 2017 23:12:44 +0000 (23:12 +0000)]
Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev

7 years agoMerge "Don't remove starting window for visible app." into oc-dr1-dev
Wale Ogunwale [Fri, 7 Jul 2017 23:09:55 +0000 (23:09 +0000)]
Merge "Don't remove starting window for visible app." into oc-dr1-dev

7 years agoMerge "Add logging for unusually long read times" into oc-dr1-dev
Amith Yamasani [Fri, 7 Jul 2017 21:50:29 +0000 (21:50 +0000)]
Merge "Add logging for unusually long read times" into oc-dr1-dev
am: 2a8a58ea98

Change-Id: Ic043ad8fd15aac4583be3944190b52f3e914c6d7

7 years agoMerge "Add logging for unusually long read times" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 21:43:46 +0000 (21:43 +0000)]
Merge "Add logging for unusually long read times" into oc-dr1-dev

7 years agoMerge "Fix wrong array index bound in NotificationUsageStats" am: 87e893a449 am:...
Kouji Shiotani [Fri, 7 Jul 2017 21:39:39 +0000 (21:39 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats" am: 87e893a449 am: 1249e0a1b0
am: 03f4ddb1b2

Change-Id: Iafd1e341d6e1054453bf1db6d880abe227fac631

7 years agoAdd theme style flag to WallpaperColors
Lucas Dupin [Thu, 29 Jun 2017 19:20:29 +0000 (12:20 -0700)]
Add theme style flag to WallpaperColors

Theme colors should always be the same in sysui and launcher.
We're now sharing a hint HINT_SUPPORTS_DARK_THEME, to make sure
we're never out of sync.

Test: runtest -x tests/Internal/src/android/app/WallpaperColorsTest.java
Fixes: 63140091
Change-Id: Ibd196f540d77269df377804b0f4d4d0d20820067

7 years agoMerge "Fix wrong array index bound in NotificationUsageStats" am: 87e893a449
Kouji Shiotani [Fri, 7 Jul 2017 21:34:32 +0000 (21:34 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats" am: 87e893a449
am: 1249e0a1b0

Change-Id: I962bd3c6dee3d635c6f5b56f2141e8f785fa4cfb

7 years agoMerge "Fix wrong array index bound in NotificationUsageStats"
Kouji Shiotani [Fri, 7 Jul 2017 21:28:43 +0000 (21:28 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats"
am: 87e893a449

Change-Id: I3b63fa6c8fa88b182d4a9f2442022dc45a692d46

7 years agoMerge "Fix wrong array index bound in NotificationUsageStats"
Treehugger Robot [Fri, 7 Jul 2017 21:20:40 +0000 (21:20 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats"

7 years agoMerge "Fix RTL drawing for QS tiles in edit mode" into oc-dr1-dev
Evan Laird [Fri, 7 Jul 2017 19:47:57 +0000 (19:47 +0000)]
Merge "Fix RTL drawing for QS tiles in edit mode" into oc-dr1-dev
am: 845a4035ae

Change-Id: I6474c59be48650b2e5f6ea45489c59b8bb36d3cd

7 years agoMerge "Update brightness icon to rounded one" into oc-dr1-dev
Evan Laird [Fri, 7 Jul 2017 19:44:58 +0000 (19:44 +0000)]
Merge "Update brightness icon to rounded one" into oc-dr1-dev
am: 1948abac4a

Change-Id: I9ebd8fd915a1292682785e5742da8b98563b893e

7 years agoMerge "Make BatterySaverTile controlled by pluggIn state" into oc-dr1-dev
jackqdyulei [Fri, 7 Jul 2017 19:40:08 +0000 (19:40 +0000)]
Merge "Make BatterySaverTile controlled by pluggIn state" into oc-dr1-dev
am: 0ff3a3a11c

Change-Id: I271ee0902cef0554e02e5a268488986366e3dbf9

7 years agoMerge "Fix RTL drawing for QS tiles in edit mode" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 19:37:19 +0000 (19:37 +0000)]
Merge "Fix RTL drawing for QS tiles in edit mode" into oc-dr1-dev

7 years agoMerge "Update brightness icon to rounded one" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 19:34:49 +0000 (19:34 +0000)]
Merge "Update brightness icon to rounded one" into oc-dr1-dev

7 years agoMerge "Allow setup apps to colorize notifications." into oc-dr1-dev
Julia Reynolds [Fri, 7 Jul 2017 19:31:57 +0000 (19:31 +0000)]
Merge "Allow setup apps to colorize notifications." into oc-dr1-dev
am: e4101089bb

Change-Id: I14f8f499ac62ed47d40ca9b2a7bff0c79120dcd7

7 years agoMerge "Make BatterySaverTile controlled by pluggIn state" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 19:31:54 +0000 (19:31 +0000)]
Merge "Make BatterySaverTile controlled by pluggIn state" into oc-dr1-dev

7 years agoMerge "Allow setup apps to colorize notifications." into oc-dr1-dev
Julia Reynolds [Fri, 7 Jul 2017 19:24:37 +0000 (19:24 +0000)]
Merge "Allow setup apps to colorize notifications." into oc-dr1-dev

7 years agoMerge "Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev...
Android Build Merger (Role) [Fri, 7 Jul 2017 19:18:31 +0000 (19:18 +0000)]
Merge "Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev am: 1cdf4244f4 am: 465810c895" into oc-dr1-dev-plus-aosp

7 years agoMerge "docs: Described why ProgressDialog is now deprecated." into oc-dev am: 1cdf4244f4
Andrew Solovay [Fri, 7 Jul 2017 19:17:12 +0000 (19:17 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev am: 1cdf4244f4
am: 465810c895

Change-Id: I6a9fa071f8e48c36cb0c9fdece919b6be0e8dc51

7 years agoMerge "docs: Described why ProgressDialog is now deprecated." into oc-dev am: 1cdf4244f4
Andrew Solovay [Fri, 7 Jul 2017 19:15:29 +0000 (19:15 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev am: 1cdf4244f4
am: bc4dc42887

Change-Id: I96a162db5fc80ab578a206ca13bd193a33762a64

7 years agoMerge "AOD: Block when fingerprint is already authenticated but waiting for goingToSl...
Adrian Roos [Fri, 7 Jul 2017 19:12:31 +0000 (19:12 +0000)]
Merge "AOD: Block when fingerprint is already authenticated but waiting for goingToSleep to complete" into oc-dr1-dev
am: eacef7a03a

Change-Id: I8e29473caf7c1cbef065909b0b40212b82648a95

7 years agoMerge "docs: Described why ProgressDialog is now deprecated." into oc-dev
Andrew Solovay [Fri, 7 Jul 2017 19:09:39 +0000 (19:09 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev
am: 1cdf4244f4

Change-Id: I1c25c17f1f73e4006e3b0fa9479d5b0563c6be98

7 years agoMerge "docs: Described why ProgressDialog is now deprecated." into oc-dev
Andrew Solovay [Fri, 7 Jul 2017 19:08:56 +0000 (19:08 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev
am: 1cdf4244f4

Change-Id: I295298edcd7f26df46edb71924fa63038a381619

7 years agoMerge "AOD: Block when fingerprint is already authenticated but waiting for goingToSl...
TreeHugger Robot [Fri, 7 Jul 2017 19:07:32 +0000 (19:07 +0000)]
Merge "AOD: Block when fingerprint is already authenticated but waiting for goingToSleep to complete" into oc-dr1-dev

7 years agoMerge "docs: Described why ProgressDialog is now deprecated." into oc-dev
Andrew Solovay [Fri, 7 Jul 2017 19:02:48 +0000 (19:02 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev

7 years agoMerge "Merge "Fix announcement of global actions menu" into oc-dr1-dev am: 5d378e5f2a...
Android Build Merger (Role) [Fri, 7 Jul 2017 18:05:10 +0000 (18:05 +0000)]
Merge "Merge "Fix announcement of global actions menu" into oc-dr1-dev am: 5d378e5f2a" into oc-dr1-dev-plus-aosp

7 years agoMerge "Fix announcement of global actions menu" into oc-dr1-dev
Jason Monk [Fri, 7 Jul 2017 18:04:11 +0000 (18:04 +0000)]
Merge "Fix announcement of global actions menu" into oc-dr1-dev
am: 5d378e5f2a

Change-Id: I70c42c2febf4cfcd23584bdf151937857d8982ba

7 years agoMerge "Fix announcement of global actions menu" into oc-dr1-dev
Jason Monk [Fri, 7 Jul 2017 18:03:59 +0000 (18:03 +0000)]
Merge "Fix announcement of global actions menu" into oc-dr1-dev
am: 5d378e5f2a

Change-Id: I10d404f2f5ea4388d4c5d31dce129902410279b4

7 years agoMerge "Fix announcement of global actions menu" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 17:55:54 +0000 (17:55 +0000)]
Merge "Fix announcement of global actions menu" into oc-dr1-dev

7 years agoMoving color extraction classes
Lucas Dupin [Thu, 6 Jul 2017 21:35:30 +0000 (14:35 -0700)]
Moving color extraction classes

Fixes: 62220212
Test: make
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java
Test: runtest systemui
Change-Id: I7c4cf5c40a88555e81fbad9bec2b32c55c927468
Merged-In: I7c4cf5c40a88555e81fbad9bec2b32c55c927468

7 years agoUpdate brightness icon to rounded one
Evan Laird [Tue, 27 Jun 2017 17:33:40 +0000 (13:33 -0400)]
Update brightness icon to rounded one

This is part of the icon updates for DR. Should be there.

Test: visual
Bug: 62668861
Change-Id: I11c8ddd99de90c319143292cd32441d14eb7fc1d
(cherry picked from commit 801705bbea9637bf709e4579ef708f90bb92e311)

7 years agoMerge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev
Adrian Roos [Fri, 7 Jul 2017 17:44:47 +0000 (17:44 +0000)]
Merge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev
am: d7aa26f33b

Change-Id: Iadaf84ba4425de21c40dbf4ebe373e6143833c94

7 years agoMerge "AOD: Finish pulse when notification is removed" into oc-dr1-dev
Adrian Roos [Fri, 7 Jul 2017 17:40:58 +0000 (17:40 +0000)]
Merge "AOD: Finish pulse when notification is removed" into oc-dr1-dev
am: 7bed78952e

Change-Id: Id8761920bb2beca8bdf96f69d6915548836594b3

7 years agoMerge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 17:40:13 +0000 (17:40 +0000)]
Merge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev

7 years agoMerge "Merge "WallpaperColors caching and synchronization" into oc-dr1-dev am: bd17b3...
Android Build Merger (Role) [Fri, 7 Jul 2017 17:37:28 +0000 (17:37 +0000)]
Merge "Merge "WallpaperColors caching and synchronization" into oc-dr1-dev am: bd17b31310" into oc-dr1-dev-plus-aosp

7 years agoMerge "WallpaperColors caching and synchronization" into oc-dr1-dev
Lucas Dupin [Fri, 7 Jul 2017 17:35:29 +0000 (17:35 +0000)]
Merge "WallpaperColors caching and synchronization" into oc-dr1-dev
am: bd17b31310

Change-Id: If36e86322bbf8573c87d84a9ec15a350bb3f60db

7 years agoMerge "WallpaperColors caching and synchronization" into oc-dr1-dev
Lucas Dupin [Fri, 7 Jul 2017 17:35:12 +0000 (17:35 +0000)]
Merge "WallpaperColors caching and synchronization" into oc-dr1-dev
am: bd17b31310

Change-Id: Ia143a2ed0048bd9a3c1439b9be9b0aebfeafdf69

7 years agoMerge "AOD: Finish pulse when notification is removed" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 17:28:10 +0000 (17:28 +0000)]
Merge "AOD: Finish pulse when notification is removed" into oc-dr1-dev

7 years agoFix RTL drawing for QS tiles in edit mode
Evan Laird [Fri, 7 Jul 2017 17:24:56 +0000 (13:24 -0400)]
Fix RTL drawing for QS tiles in edit mode

When in RTL mode, sometimes the tile displaying the mobile signal was
not properly set (was drawing as LTR). Setting it explicitly during
QSIconViewImpl#updateTile() fixes the issue.

Test: visual
Bug: 63160044
Change-Id: If00b149ca0372fc3d51fc2ee53a43e3b74e78791

7 years agoMerge "WallpaperColors caching and synchronization" into oc-dr1-dev
Lucas Dupin [Fri, 7 Jul 2017 17:23:22 +0000 (17:23 +0000)]
Merge "WallpaperColors caching and synchronization" into oc-dr1-dev

7 years agoAllow setup apps to colorize notifications.
Julia Reynolds [Fri, 30 Jun 2017 17:34:01 +0000 (13:34 -0400)]
Allow setup apps to colorize notifications.

Fixes: 63147379
Test: runtest systemui-notification, core tests
Change-Id: I2077a9fd563826d978d0dc01be89dd0bbc09eebf

7 years agoMerge "Fix clipping of large global actions items" into oc-dr1-dev
Jason Monk [Fri, 7 Jul 2017 17:10:01 +0000 (17:10 +0000)]
Merge "Fix clipping of large global actions items" into oc-dr1-dev
am: e7e2f36a47

Change-Id: Ib7ecd54f85c22d7f2cf88d254ea5b746641c6e64

7 years agoAOD: Block when fingerprint is already authenticated but waiting for goingToSleep...
Adrian Roos [Fri, 7 Jul 2017 17:02:34 +0000 (19:02 +0200)]
AOD: Block when fingerprint is already authenticated but waiting for goingToSleep to complete

Improves an issue where immediately triggering fingerprint after
the devices goes to sleep results in a lot of flickering.

There's still flicker however if the fingerprint authenticates after we've requested the AOD
display state, but before it has actually been applied.

Bug: 62887179
Test: Go to Home. Lock screen. Immediately unlock via fingerprint. Verify that the AOD screen does not even show.
Change-Id: Ib6425eee803a8c7e02f9621a571e562e825af57f

7 years agoMerge "Fix clipping of large global actions items" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 17:00:12 +0000 (17:00 +0000)]
Merge "Fix clipping of large global actions items" into oc-dr1-dev

7 years agoMerge "AOD: Do not animate notification icons while dozing" into oc-dr1-dev
Adrian Roos [Fri, 7 Jul 2017 16:51:30 +0000 (16:51 +0000)]
Merge "AOD: Do not animate notification icons while dozing" into oc-dr1-dev
am: 1a16b17ed1

Change-Id: Ibcaff980c79f0bdc2a0567d6fcea2b8e29ab50b8

7 years agoMerge "AOD: Do not animate notification icons while dozing" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 16:42:03 +0000 (16:42 +0000)]
Merge "AOD: Do not animate notification icons while dozing" into oc-dr1-dev

7 years agoMerge "Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc...
Android Build Merger (Role) [Fri, 7 Jul 2017 16:18:34 +0000 (16:18 +0000)]
Merge "Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev am: 3bd612f92b" into oc-dr1-dev-plus-aosp

7 years agoMerge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev
Adrian Roos [Fri, 7 Jul 2017 16:17:35 +0000 (16:17 +0000)]
Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev
am: 3bd612f92b

Change-Id: I2ab9a1842c6e9a5acdde4d5c3470bf645aa55e18