OSDN Git Service

android-x86/frameworks-base.git
7 years agoRevert "AAPT2: Auto-version adaptive-icon XML"
Adam Lesinski [Wed, 12 Jul 2017 14:41:55 +0000 (07:41 -0700)]
Revert "AAPT2: Auto-version adaptive-icon XML"

This reverts commit 5b7337f77cf036dda2c7218ccf22dedc774dcf76.

Bug: 63579299
Test: none
Change-Id: Ib617c4edfc16eeae3507b59b2debeae4f8bbf9a5

7 years agoMerge "AAPT2: Bump version number to v2.18"
Adam Lesinski [Mon, 10 Jul 2017 11:22:06 +0000 (11:22 +0000)]
Merge "AAPT2: Bump version number to v2.18"

7 years agoAAPT2: Bump version number to v2.18
Adam Lesinski [Mon, 10 Jul 2017 11:19:28 +0000 (04:19 -0700)]
AAPT2: Bump version number to v2.18

Test: none
Change-Id: I6e3b4c95a7d7ba416ba368e5b19782dbffa04fd8

7 years agoMerge "Add android.test.mock to the optional runtime libraries"
Paul Duffin [Mon, 10 Jul 2017 10:59:37 +0000 (10:59 +0000)]
Merge "Add android.test.mock to the optional runtime libraries"

7 years agoMerge "PIP: Fix crash when the PIP menu activity is started by intent"
TreeHugger Robot [Mon, 10 Jul 2017 02:17:17 +0000 (02:17 +0000)]
Merge "PIP: Fix crash when the PIP menu activity is started by intent"

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

Change-Id: Ibcc97d1f80b273757613a6ede257da3a34c7904c

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 am: e72ec3cab2
Sundeep Ghuman [Sat, 8 Jul 2017 03:18:43 +0000 (03:18 +0000)]
Merge "Change initial value of mStaleScanResults to true." into oc-dr1-dev am: e72ec3cab2
am: 335a2d7e3c

Change-Id: I4b09fe0fbcecc562ced0ed2a6793b2ae87b0f731

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 agoMerge "Add buffer-size parameter to FastXmlSerializer ctor"
TreeHugger Robot [Sat, 8 Jul 2017 02:10:13 +0000 (02:10 +0000)]
Merge "Add buffer-size parameter to FastXmlSerializer ctor"

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 am: 456cb9603a
Lucas Dupin [Sat, 8 Jul 2017 00:33:40 +0000 (00:33 +0000)]
Merge "Moving color extraction classes" into oc-dr1-dev am: 456cb9603a
am: bdda30f826  -s ours

Change-Id: Ice8eb59b11540040b3732855d8b83ca82bdec0ec

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 agoAdd buffer-size parameter to FastXmlSerializer ctor
Christopher Tate [Fri, 7 Jul 2017 23:46:37 +0000 (16:46 -0700)]
Add buffer-size parameter to FastXmlSerializer ctor

Also increase the default internal buffer size from 8kb to 32kb.  We
have evidence that we're incurring a fair bit of "extra" disk write load
in various common circumstances like SharedPreferences, and this should
help eliminate that.

Bug 63432101
Test: bit CtsContentTestCases:.SharedPreferencesTest

Change-Id: Iba4768262142555a279284b2ae70741424ee2184

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

Change-Id: I0f28c240cc474bf975e9b8b1ece8b5da20b57e11

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:31:37 +0000 (23:31 +0000)]
Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev am: f1328fee0d
am: 0eba3cb020

Change-Id: I435e1a197b44eeff8b7453e2b9f88e9a901c285d

7 years agoMerge "Bit: support running all tests in a java package."
TreeHugger Robot [Fri, 7 Jul 2017 23:28:10 +0000 (23:28 +0000)]
Merge "Bit: support running all tests in a java package."

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

Change-Id: I492ab4b9f28edc65fcd2b60c7d314fe8462437b2

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 "AAPT2: Fix processing of quotes in XML"
TreeHugger Robot [Fri, 7 Jul 2017 23:01:33 +0000 (23:01 +0000)]
Merge "AAPT2: Fix processing of quotes in XML"

7 years agoMerge "AAPT2: Accept Java unicode identifiers"
TreeHugger Robot [Fri, 7 Jul 2017 23:00:05 +0000 (23:00 +0000)]
Merge "AAPT2: Accept Java unicode identifiers"

7 years agoMerge "Revert "Change initial value of mStaleScanResults to false.""
TreeHugger Robot [Fri, 7 Jul 2017 22:33:29 +0000 (22:33 +0000)]
Merge "Revert "Change initial value of mStaleScanResults to false.""

7 years agoMerge "Use a separate lock object instead of mSpellCheckerMap"
TreeHugger Robot [Fri, 7 Jul 2017 22:21:21 +0000 (22:21 +0000)]
Merge "Use a separate lock object instead of mSpellCheckerMap"

7 years agoMerge "Provide materials for Mobile network settings UI."
Xiangyu/Malcolm Chen [Fri, 7 Jul 2017 22:16:32 +0000 (22:16 +0000)]
Merge "Provide materials for Mobile network settings UI."

7 years agoMerge "Moving color extraction classes"
TreeHugger Robot [Fri, 7 Jul 2017 22:06:54 +0000 (22:06 +0000)]
Merge "Moving color extraction classes"

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

Change-Id: I4d4ba6681ebda8ba7bfe0ca9117243377b53478a

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 "Fix wrong array index bound in NotificationUsageStats" am: 87e893a449 am:...
Kouji Shiotani [Fri, 7 Jul 2017 21:46:11 +0000 (21:46 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats" am: 87e893a449 am: 1249e0a1b0 am: 03f4ddb1b2
am: 41369279a2

Change-Id: I067a46e3c4937c5cc3713d1f4080975ff8aa3698

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 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 "Disable lookaside allocator on low-RAM devices"
Fyodor Kupolov [Fri, 7 Jul 2017 21:20:09 +0000 (21:20 +0000)]
Merge "Disable lookaside allocator on low-RAM devices"

7 years agoRevert "Change initial value of mStaleScanResults to false."
Joe LaPenna [Fri, 7 Jul 2017 18:09:45 +0000 (18:09 +0000)]
Revert "Change initial value of mStaleScanResults to false."

This reverts commit bd5410fa4845b9975e8544071d5e590adf5db0f0.

Reason for revert: Changelist description was incorrect, which can cause issues when debugging and reading commit logs, in the future.

Change-Id: Ic70c5f1822ab6f1b77486097fadcf3bdf3484e32

7 years agoAAPT2: Fix processing of quotes in XML
Adam Lesinski [Fri, 30 Jun 2017 00:53:36 +0000 (17:53 -0700)]
AAPT2: Fix processing of quotes in XML

When processing attributes in XML, quotes can't be used to mark a
section as whitespace preserving, so the assumption should be that the
entire string is whitespace preserving, which makes quote characters
literals.

Bug: 62840718
Bug: 62840406
Test: make aapt2_tests
Change-Id: I4afff02148b5b8e78833abf1f323c2f5325d6155

7 years agoAAPT2: Accept Java unicode identifiers
Adam Lesinski [Wed, 28 Jun 2017 18:44:11 +0000 (11:44 -0700)]
AAPT2: Accept Java unicode identifiers

Test: make aapt2_tests
Change-Id: I75a0e52d43b1785001bfe120eea7484f7bb4682b

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

Change-Id: I301dd1bc64c4105612107ddfd19f88da696b9d21

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

Change-Id: I4cfa001d34d15cca57889a50dcd156ec96690d81

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 "Make BatterySaverTile controlled by pluggIn state" into oc-dr1-dev am: 0ff3a3a11c
jackqdyulei [Fri, 7 Jul 2017 19:47:03 +0000 (19:47 +0000)]
Merge "Make BatterySaverTile controlled by pluggIn state" into oc-dr1-dev am: 0ff3a3a11c
am: 112b16af3e

Change-Id: I3c1ebf5eb3fe551f61d80603a3c6bc1c83a84126

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 "Allow setup apps to colorize notifications." into oc-dr1-dev am: e4101089bb
Julia Reynolds [Fri, 7 Jul 2017 19:42:57 +0000 (19:42 +0000)]
Merge "Allow setup apps to colorize notifications." into oc-dr1-dev am: e4101089bb
am: 6b734d0478  -s ours

Change-Id: I2e16c19fc248457d3d9a54063e6d897db7dc02c3

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 "Trying to fix flaky tests related to testCharSequence*"
Roozbeh Pournader [Fri, 7 Jul 2017 19:30:11 +0000 (19:30 +0000)]
Merge "Trying to fix flaky tests related to testCharSequence*"

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...
Andrew Solovay [Fri, 7 Jul 2017 19:23:11 +0000 (19:23 +0000)]
Merge "Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev am: 1cdf4244f4 am: 465810c895" into oc-dr1-dev-plus-aosp
am: ad8f53420d

Change-Id: I30172dc7c68683d37dbf7eacb6f771d022c307b9

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

Change-Id: Ied39e43b0e3528984c086346f8e60fde99cb8def

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 "AOD: Block when fingerprint is already authenticated but waiting for goingToSl...
Adrian Roos [Fri, 7 Jul 2017 19:17:27 +0000 (19:17 +0000)]
Merge "AOD: Block when fingerprint is already authenticated but waiting for goingToSleep to complete" into oc-dr1-dev am: eacef7a03a
am: f53f45e06f

Change-Id: I58f11a9e583a4af800868b47e90636c342425745

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...
Jason Monk [Fri, 7 Jul 2017 18:35:37 +0000 (18:35 +0000)]
Merge "Merge "Fix announcement of global actions menu" into oc-dr1-dev am: 5d378e5f2a" into oc-dr1-dev-plus-aosp
am: f627f51b4f

Change-Id: Ic0c577547f83080fc2dd9032cb373870d7cf2a0c

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

Change-Id: I4a5a2ad36d792c5edd335e77c61c5fc0d5ec75d5

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

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 agoUse a separate lock object instead of mSpellCheckerMap
Guliz Tuncay [Fri, 7 Jul 2017 17:35:59 +0000 (10:35 -0700)]
Use a separate lock object instead of mSpellCheckerMap

In order to make TSMS multi-user aware, the first step is to get rid of
the use of user-specific mSpellCheckerMap (since there will be one for
each user) in the synchronized blocks, and instead use a separate
object lock.

Bug: 63041121
Test: Manually tested as follows.
      1. Build and flash an OS image.
      2. Complete the setup wizard (if any).
      3. Make sure AOSP Keyboard (com.android.inputmethod.latin)
       is installed.
      4. adb shell settings put secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
      5. Observe that there are no bindings to the selected spell
       checker service (SCS) by running
       adb shell dumpsys textservices
      6. Observe that there is no connection to selected SCS by running
       adb shell dumpsys activity services com.android.inputmethod.latin
       There should be no ConnectionRecord for
       AndroidSpellCheckerService
      7. Run a test program that has TextView and tap on one of the
       TextViews and type some text.
      8. Repeat steps 5 and 6 to observe there are now bindings and
       connection to the selected SCS.
      9. Kill the app manually. Repeat steps 5 and 6 to see bindings
       and connections are removed again.
      10. adb shell settings put secure selected_spell_checker com.google.android.inputmethod.latin/com.android.inputmethod.latin.spellcheck.AndroidSpellCheckerService
      11. Repeat 7, 8, 9.
      12. Switch to a secondary user account. Repeat 3-11.
Change-Id: Ic8772accb4c6225a1e662fd2fa371b2f4c87e445

7 years agoMerge "Merge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev am: d7aa26f33b...
Android Build Merger (Role) [Fri, 7 Jul 2017 17:56:47 +0000 (17:56 +0000)]
Merge "Merge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev am: d7aa26f33b am: bdc9d47c62"

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 agoMerge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev am: d7aa26f33b
Adrian Roos [Fri, 7 Jul 2017 17:55:43 +0000 (17:55 +0000)]
Merge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev am: d7aa26f33b
am: bdc9d47c62

Change-Id: I7ce204de73542f590f9f2cf8441ef8010315cbed

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

Change-Id: Ife7e47b06d08967a210ae6db46bbaa015926302e

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

Change-Id: I83bb778ff97b0ac3e88e35e2112a357cd136d0eb

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

7 years agoMerge "Merge "WallpaperColors caching and synchronization" into oc-dr1-dev am: bd17b3...
Lucas Dupin [Fri, 7 Jul 2017 17:48:44 +0000 (17:48 +0000)]
Merge "Merge "WallpaperColors caching and synchronization" into oc-dr1-dev am: bd17b31310" into oc-dr1-dev-plus-aosp
am: 5d8f843c2c

Change-Id: Ic5bb317fc3cff648dec1174df536033a8ab0f217

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 agoMerge "Merge "WallpaperColors caching and synchronization" into oc-dr1-dev am: bd17b3...
Android Build Merger (Role) [Fri, 7 Jul 2017 17:47:07 +0000 (17:47 +0000)]
Merge "Merge "WallpaperColors caching and synchronization" into oc-dr1-dev am: bd17b31310 am: 3f8a36052b"

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 7 Jul 2017 17:46:42 +0000 (17:46 +0000)]
Merge "Import translations. DO NOT MERGE"

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

Change-Id: Ie66ba8d4fbc26bb256239d5c1b064210c19eb8ab

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 "Compile secondary dex at boot after OTA"
Shubham Ajmera [Fri, 7 Jul 2017 17:28:36 +0000 (17:28 +0000)]
Merge "Compile secondary dex at boot after OTA"

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