OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 11 Oct 2016 07:21:06 +0000 (07:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 47b8a77785  -s ours

Change-Id: If640c3620ec35d1ec4a4896ed182f0565f29c180

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 11 Oct 2016 07:21:04 +0000 (07:21 +0000)]
Import translations. DO NOT MERGE
am: 5803ebaf43  -s ours

Change-Id: Ic06ddea02e1b8a35f6963fc762bbe894196da840

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 11 Oct 2016 07:19:52 +0000 (07:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 12bef8215e  -s ours

Change-Id: I9aeccdd872371b2660595c74bc55ca22ff80c0ba

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 11 Oct 2016 07:19:50 +0000 (07:19 +0000)]
Import translations. DO NOT MERGE
am: c8864998c8  -s ours

Change-Id: I9f115ff851b0eeb1c6935769f6371f56069dd2d3

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Tue, 11 Oct 2016 07:15:57 +0000 (07:15 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Tue, 11 Oct 2016 07:15:28 +0000 (07:15 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 11 Oct 2016 07:14:19 +0000 (07:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 11 Oct 2016 07:13:30 +0000 (07:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings...
Kevin Hufnagle [Tue, 11 Oct 2016 06:21:45 +0000 (06:21 +0000)]
Merge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB." into nyc-dev am: 8e4ea67fa7 am: 2b07befcd6
am: 9ba6a43540

Change-Id: I0edf13ba7e6c66325e6914c911729b7bcbeb2f25

7 years agocherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within...
Kevin Hufnagle [Tue, 11 Oct 2016 06:20:50 +0000 (06:20 +0000)]
cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB. am: 197226e4a5 am: 87ac4d8691
am: b4ce8bd911

Change-Id: I31723ea2af685b9aa400a28e89ef64766112040d

7 years agoMerge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings...
Kevin Hufnagle [Tue, 11 Oct 2016 06:16:04 +0000 (06:16 +0000)]
Merge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB." into nyc-dev am: 8e4ea67fa7
am: 2b07befcd6

Change-Id: I74401c545aae96a156a26ce5f6002db9dc5feab5

7 years agocherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within...
Kevin Hufnagle [Tue, 11 Oct 2016 06:15:21 +0000 (06:15 +0000)]
cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB. am: 197226e4a5
am: 87ac4d8691

Change-Id: I0c195850b0382246c17aca39564bd9ecdd5c9ebd

7 years agoMerge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings...
Kevin Hufnagle [Tue, 11 Oct 2016 06:03:58 +0000 (06:03 +0000)]
Merge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB." into nyc-dev
am: 8e4ea67fa7

Change-Id: I9a31d23808839857eeb3346667a45059c4d49f7d

7 years agocherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within...
Kevin Hufnagle [Tue, 11 Oct 2016 06:03:54 +0000 (06:03 +0000)]
cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB.
am: 197226e4a5

Change-Id: I443179f1118dd6115a8b61827d3c9a4b3250d028

7 years agoMerge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings...
Kevin Hufnagle [Tue, 11 Oct 2016 05:54:10 +0000 (05:54 +0000)]
Merge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB." into nyc-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 11 Oct 2016 04:46:14 +0000 (21:46 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 11 Oct 2016 04:32:53 +0000 (21:32 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected" into nyc-mr1-dev
Jack He [Tue, 11 Oct 2016 03:28:10 +0000 (03:28 +0000)]
Merge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected" into nyc-mr1-dev
am: e4554754dc

Change-Id: I8b94a920ce4fe8b2b1335d3455de0c86c7f82ec8

7 years agoList HF_INDICATORS_VALUE_CHANGED broadcast as protected
Jack He [Tue, 11 Oct 2016 03:28:06 +0000 (03:28 +0000)]
List HF_INDICATORS_VALUE_CHANGED broadcast as protected
am: 0bba1c620b

Change-Id: I313d3f300ba0f0273f7f391a0c0dd0abcb4d120d

7 years agoMerge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected" into nyc-mr1-dev
TreeHugger Robot [Tue, 11 Oct 2016 03:17:52 +0000 (03:17 +0000)]
Merge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected" into nyc-mr1-dev

7 years agoIgnore wallpaper relaunch timeout during shutdown
Christopher Tate [Tue, 11 Oct 2016 03:06:05 +0000 (03:06 +0000)]
Ignore wallpaper relaunch timeout during shutdown
am: 762dfd1566

Change-Id: I824dd66b4a9d30c010112038156146750275cb89

7 years agoList HF_INDICATORS_VALUE_CHANGED broadcast as protected
Jack He [Mon, 10 Oct 2016 19:37:40 +0000 (12:37 -0700)]
List HF_INDICATORS_VALUE_CHANGED broadcast as protected

android.bluetooth.headset.action.HF_INDICATORS_VALUE_CHANGED
notification should be protected.

Bug: 32059227
Test: manual
Change-Id: I06d4a7e3aa3a5586eb09d2538b4b526a5d073f9a
(cherry picked from commit b798f79ba26e057531fb51e65824e0deee445f26)

7 years agoIgnore wallpaper relaunch timeout during shutdown
Christopher Tate [Tue, 11 Oct 2016 00:44:48 +0000 (17:44 -0700)]
Ignore wallpaper relaunch timeout during shutdown

Because of course during system shutdown, the wallpaper service
won't actually get relaunched.  Sometimes shutdown can take long
enough that this timeout kicks, so we need to avoid clearing the
live wallpaper state spuriously.

For simplicity we just check at "would have timed out now" time
rather than try to distinguish between the shutdown case and a
genuine crash that raced with the shutdown broadcast.

Bug 32020355

Change-Id: I9335b2c0214b4c750ef950fed157d186aa670176

7 years agoMerge "Turn off additional logging in text rendering" into nyc-mr1-dev
sergeyv [Tue, 11 Oct 2016 00:43:37 +0000 (00:43 +0000)]
Merge "Turn off additional logging in text rendering" into nyc-mr1-dev
am: 9fe5b1129e

Change-Id: I013fc2d7781c4f17beb9ac99c654bb65880adb6f

7 years agoTurn off additional logging in text rendering
sergeyv [Tue, 11 Oct 2016 00:43:32 +0000 (00:43 +0000)]
Turn off additional logging in text rendering
am: 5bb5626599

Change-Id: Ic7f6c59ca2c3a92f81bf55a8916e20d99fcc01a7

7 years agoMerge "Turn off additional logging in text rendering" into nyc-mr1-dev
TreeHugger Robot [Tue, 11 Oct 2016 00:30:32 +0000 (00:30 +0000)]
Merge "Turn off additional logging in text rendering" into nyc-mr1-dev

7 years agoMerge "Set MIME type when building BROWSE intents." into nyc-mr1-dev
Jeff Sharkey [Mon, 10 Oct 2016 23:29:31 +0000 (23:29 +0000)]
Merge "Set MIME type when building BROWSE intents." into nyc-mr1-dev
am: 4a021fa541

Change-Id: Ifb15090b906e32305ba1f88aa73067fb791bf520

7 years agoSet MIME type when building BROWSE intents.
Jeff Sharkey [Mon, 10 Oct 2016 23:29:28 +0000 (23:29 +0000)]
Set MIME type when building BROWSE intents.
am: 42a4aaab44

Change-Id: I9efdf0e7223b162988f9484b06c7e3665202738f

7 years agoMerge "Set MIME type when building BROWSE intents." into nyc-mr1-dev
TreeHugger Robot [Mon, 10 Oct 2016 23:21:32 +0000 (23:21 +0000)]
Merge "Set MIME type when building BROWSE intents." into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 10 Oct 2016 23:13:52 +0000 (16:13 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 10 Oct 2016 23:05:37 +0000 (16:05 -0700)]
Import translations. DO NOT MERGE

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

7 years agoDocs: Remove a reference to a deprecated sample am: 3e01ab2b0e am: c48ad2580a
Bert McMeen [Mon, 10 Oct 2016 22:19:18 +0000 (22:19 +0000)]
Docs: Remove a reference to a deprecated sample am: 3e01ab2b0e am: c48ad2580a
am: e62f577153

Change-Id: Ia43dd95a9ed8b3debcdbea35f9718493378f8929

7 years agoMerge "Remove incorrect non-roaming list for Telus." into nyc-mr1-dev
Junda Liu [Mon, 10 Oct 2016 22:15:24 +0000 (22:15 +0000)]
Merge "Remove incorrect non-roaming list for Telus." into nyc-mr1-dev
am: 432157f8bc

Change-Id: Idb9fa2b3376eacabf58350105405219aa75a70b0

7 years agoRemove incorrect non-roaming list for Telus.
Junda Liu [Mon, 10 Oct 2016 22:15:16 +0000 (22:15 +0000)]
Remove incorrect non-roaming list for Telus.
am: 458537483d

Change-Id: I3b6af034ceff722311e9952be4f57e6030d1eb38

7 years agoDocs: Remove a reference to a deprecated sample am: 3e01ab2b0e
Bert McMeen [Mon, 10 Oct 2016 22:10:20 +0000 (22:10 +0000)]
Docs: Remove a reference to a deprecated sample am: 3e01ab2b0e
am: c48ad2580a

Change-Id: Ic7f79fddf6696346b171e2bb2601e813dc82aa06

7 years agoDocs: Remove a reference to a deprecated sample
Bert McMeen [Mon, 10 Oct 2016 22:05:20 +0000 (22:05 +0000)]
Docs: Remove a reference to a deprecated sample
am: 3e01ab2b0e

Change-Id: Idd2ac6b2c6aa056c88033aa10cd7732d2b343b75

7 years agoMerge "Remove incorrect non-roaming list for Telus." into nyc-mr1-dev
Junda Liu [Mon, 10 Oct 2016 21:58:26 +0000 (21:58 +0000)]
Merge "Remove incorrect non-roaming list for Telus." into nyc-mr1-dev

7 years agoSet MIME type when building BROWSE intents.
Jeff Sharkey [Mon, 10 Oct 2016 21:26:14 +0000 (15:26 -0600)]
Set MIME type when building BROWSE intents.

If we created a BROWSE PendingIntent early during boot (while the
device was still locked), we would resolve the MIME type as "null"
meaning the intent would fail to launch.

Since we always know what the MIME type will be, set it explicitly.

Test: boot device while USB device attached
Bug: 30742481
Change-Id: I23c523cbe2660ca63a3b7df1f41300ab803b314c

7 years agoDocs: Remove a reference to a deprecated sample
Bert McMeen [Mon, 10 Oct 2016 21:21:00 +0000 (14:21 -0700)]
Docs: Remove a reference to a deprecated sample

Bug: 31709180
Change-Id: Ieec19820b1154628236495541a28b50089c4e0cd

7 years agoTurn off additional logging in text rendering
sergeyv [Mon, 10 Oct 2016 19:25:06 +0000 (12:25 -0700)]
Turn off additional logging in text rendering

Change-Id: If5f11489c05e320e4436fb57680857b29228a755
b:30427106

7 years agoMerge "Fixed the memory leak when receiving Nav messages" into nyc-mr1-dev
Lifu Tang [Mon, 10 Oct 2016 19:12:43 +0000 (19:12 +0000)]
Merge "Fixed the memory leak when receiving Nav messages" into nyc-mr1-dev
am: 9e4733ed33

Change-Id: I8f03a3d36e8836ffc14e9986114b1e3ccb40cc2d

7 years agoFixed the memory leak when receiving Nav messages
Lifu Tang [Mon, 10 Oct 2016 19:12:38 +0000 (19:12 +0000)]
Fixed the memory leak when receiving Nav messages
am: fe427f24e5

Change-Id: Iaae06561c8247b2292a10ec24bf3d1a264850ad9

7 years agoMerge "Fixed the memory leak when receiving Nav messages" into nyc-mr1-dev
Lifu Tang [Mon, 10 Oct 2016 19:00:07 +0000 (19:00 +0000)]
Merge "Fixed the memory leak when receiving Nav messages" into nyc-mr1-dev

7 years agoMerge "Fix dismissing window showing" into nyc-mr1-dev
Jorim Jaggi [Mon, 10 Oct 2016 11:55:18 +0000 (11:55 +0000)]
Merge "Fix dismissing window showing" into nyc-mr1-dev
am: b29dadb939

Change-Id: If668d9f895845362e171d74dd2c3884c35bf92af

7 years agoFix dismissing window showing
Jorim Jaggi [Mon, 10 Oct 2016 11:55:13 +0000 (11:55 +0000)]
Fix dismissing window showing
am: f20b1428f8

Change-Id: I58829c0bc567fc3c48e03276075d9256649d84e3

7 years agoMerge "Fix dismissing window showing" into nyc-mr1-dev
Jorim Jaggi [Mon, 10 Oct 2016 11:46:58 +0000 (11:46 +0000)]
Merge "Fix dismissing window showing" into nyc-mr1-dev

7 years agoFixed the memory leak when receiving Nav messages
Lifu Tang [Sat, 8 Oct 2016 09:57:53 +0000 (02:57 -0700)]
Fixed the memory leak when receiving Nav messages

Bug: 32038182

Change-Id: Ie659dc945d6efc7feaf9285d3e7375c90cba7234

7 years agoSupport calling start() in onAnimationFinished(...) in AVD
Doris Liu [Sat, 8 Oct 2016 23:52:20 +0000 (23:52 +0000)]
Support calling start() in onAnimationFinished(...) in AVD
am: 679fe6ab6f

Change-Id: I2999f6fc543f56d73cd03fe74b466c033d6c7d1a

7 years agoSupport calling start() in onAnimationFinished(...) in AVD
Doris Liu [Fri, 7 Oct 2016 18:09:21 +0000 (11:09 -0700)]
Support calling start() in onAnimationFinished(...) in AVD

This CL fixed an issue where calling start() from onAnimationFinished()
caused AnimationListenerBridge::onAnimationFinished(...) to be unsafely
re-entered and the new start listener was (incorrectly) reset to null.

BUG: 31971397
Test: test apk in the bug linked above
Change-Id: Ica809ef2dab884950b93b54f2d0cb4b81e9830f1

7 years agodocs: add collections for Distribute Stories, Games and Apps am: d366709268 am: a424e...
Joe Fernandez [Fri, 7 Oct 2016 22:52:04 +0000 (22:52 +0000)]
docs: add collections for Distribute Stories, Games and Apps am: d366709268 am: a424ec21cb
am: ad81502f20

Change-Id: I3a356a7414dbf70d58fced4b300f10eff5ce5298

7 years agodocs: add collections for Distribute Stories, Games and Apps am: d366709268
Joe Fernandez [Fri, 7 Oct 2016 22:48:01 +0000 (22:48 +0000)]
docs: add collections for Distribute Stories, Games and Apps am: d366709268
am: a424ec21cb

Change-Id: Iaebda3b697804c384c9df039ab104d49f0b5ddec

7 years agodocs: add collections for Distribute Stories, Games and Apps
Joe Fernandez [Fri, 7 Oct 2016 22:40:02 +0000 (22:40 +0000)]
docs: add collections for Distribute Stories, Games and Apps
am: d366709268

Change-Id: I13ac71c0e908a0a7ffd76babe7fcb4e39ff1352e

7 years agoMerge "Removing over-active NTP & XTRA assistance downloads" into nyc-mr1-dev
Wyatt Riley [Fri, 7 Oct 2016 21:13:57 +0000 (21:13 +0000)]
Merge "Removing over-active NTP & XTRA assistance downloads" into nyc-mr1-dev
am: d270004959

Change-Id: I2a63754f83346825bce28f5849fcf53794e64929

7 years agoRemoving over-active NTP & XTRA assistance downloads
Wyatt Riley [Fri, 7 Oct 2016 21:13:54 +0000 (21:13 +0000)]
Removing over-active NTP & XTRA assistance downloads
am: 0d6e54e246

Change-Id: I6d6a151fb7bb13ddabed10aa33f20aec8cefe8a8

7 years agodocs: add collections for Distribute Stories, Games and Apps
Joe Fernandez [Fri, 7 Oct 2016 21:11:49 +0000 (14:11 -0700)]
docs: add collections for Distribute Stories, Games and Apps

b/31741249

Change-Id: I873ce82f18c5edbdeb85fb2fdb25ba322760a2dc

7 years agoMerge "Removing over-active NTP & XTRA assistance downloads" into nyc-mr1-dev
Wyatt Riley [Fri, 7 Oct 2016 21:05:55 +0000 (21:05 +0000)]
Merge "Removing over-active NTP & XTRA assistance downloads" into nyc-mr1-dev

7 years agoMerge "Correctly pass number of input allocations for BLAS" into nyc-mr1-dev
Miao Wang [Fri, 7 Oct 2016 20:53:25 +0000 (20:53 +0000)]
Merge "Correctly pass number of input allocations for BLAS" into nyc-mr1-dev
am: 35d2d12159

Change-Id: Ia493798c58e9c0411f5d1cf4f217685b388ba2a9

7 years agoCorrectly pass number of input allocations for BLAS
Miao Wang [Fri, 7 Oct 2016 20:53:20 +0000 (20:53 +0000)]
Correctly pass number of input allocations for BLAS
am: 166b402861

Change-Id: I3afae51d6a21b6261fc31696ec0a0072f004275c

7 years agoMerge "Correctly pass number of input allocations for BLAS" into nyc-mr1-dev
TreeHugger Robot [Fri, 7 Oct 2016 20:46:17 +0000 (20:46 +0000)]
Merge "Correctly pass number of input allocations for BLAS" into nyc-mr1-dev

7 years agoMerge "Updates documentation for MessagingStyle constructor" into nyc-mr1-dev
Alex Hills [Fri, 7 Oct 2016 20:44:02 +0000 (20:44 +0000)]
Merge "Updates documentation for MessagingStyle constructor" into nyc-mr1-dev
am: 67c70a263c

Change-Id: I2768146b5921acac69cb42e64d06b11ea5db4eb4

7 years agoUpdates documentation for MessagingStyle constructor
Alex Hills [Fri, 7 Oct 2016 20:43:57 +0000 (20:43 +0000)]
Updates documentation for MessagingStyle constructor
am: fd590441c1

Change-Id: I341c9a18c5a64e8cb63ad277611b9e55f61047c1

7 years agoMerge "Scale bitmap shaders for target density" into nyc-mr1-dev
Alan Viverette [Fri, 7 Oct 2016 20:42:52 +0000 (20:42 +0000)]
Merge "Scale bitmap shaders for target density" into nyc-mr1-dev
am: 0f6cec369f

Change-Id: I96ae107012b6f71c23fa7f26d07ac83c3049dcfd

7 years agoScale bitmap shaders for target density
Alan Viverette [Fri, 7 Oct 2016 20:39:48 +0000 (20:39 +0000)]
Scale bitmap shaders for target density
am: 0d2a46b733

Change-Id: I8e3274a9c6047d943336827e7e0c8563e40c2ca5

7 years agoMerge "Updates documentation for MessagingStyle constructor" into nyc-mr1-dev
TreeHugger Robot [Fri, 7 Oct 2016 20:34:48 +0000 (20:34 +0000)]
Merge "Updates documentation for MessagingStyle constructor" into nyc-mr1-dev

7 years agoMerge "Scale bitmap shaders for target density" into nyc-mr1-dev
TreeHugger Robot [Fri, 7 Oct 2016 20:30:59 +0000 (20:30 +0000)]
Merge "Scale bitmap shaders for target density" into nyc-mr1-dev

7 years agoScale bitmap shaders for target density
Alan Viverette [Fri, 7 Oct 2016 20:23:32 +0000 (16:23 -0400)]
Scale bitmap shaders for target density

Also fixes progress bar sample tile to reflect density and ensures
that ProgressBar.tileify() clones inner drawables into the correct
density.

Bug: 31841123
Test: BitmapDrawableTest#testPreloadDensity()
Test: ThemeHostTest
Test: Visual inspection of ApiDemos
Change-Id: I9dcb9817d8d91d61ff0215987247e9e7fb089c46

7 years agoMerge "When adding dialog window but not creating update the configuration." into...
Rob Carr [Fri, 7 Oct 2016 19:21:54 +0000 (19:21 +0000)]
Merge "When adding dialog window but not creating update the configuration." into nyc-mr1-dev
am: 93becf5148

Change-Id: I8c796189cb90219ba21195e6d1a1e227a3d88051

7 years agoWhen adding dialog window but not creating update the configuration.
Robert Carr [Fri, 7 Oct 2016 19:21:51 +0000 (19:21 +0000)]
When adding dialog window but not creating update the configuration.
am: d7dbec7e4c

Change-Id: I137783f64cec9f9134e1c66b123993d65397deb5

7 years agoCorrectly pass number of input allocations for BLAS
Miao Wang [Thu, 6 Oct 2016 17:45:42 +0000 (10:45 -0700)]
Correctly pass number of input allocations for BLAS

Bug: 31992305

Test: Build and CTS RsBlas test pass on Angler.
Change-Id: If49c0be003d9c2a2175924dc3303703b9ab49357
(cherry picked from commit b742fcc808165fbeeb1a48761e7d629f60207de2)

7 years agoMerge "When adding dialog window but not creating update the configuration." into...
Rob Carr [Fri, 7 Oct 2016 19:16:00 +0000 (19:16 +0000)]
Merge "When adding dialog window but not creating update the configuration." into nyc-mr1-dev

7 years agoMerge "Allow sysui navigation to work when application occludes keyguard" into nyc...
Jim Miller [Fri, 7 Oct 2016 18:52:49 +0000 (18:52 +0000)]
Merge "Allow sysui navigation to work when application occludes keyguard" into nyc-mr1-dev
am: aea8efbc11

Change-Id: I0a8e6a0ad2f7d0b28dc668bab9bed6928b871620

7 years agoAllow sysui navigation to work when application occludes keyguard
Jim Miller [Fri, 7 Oct 2016 18:52:45 +0000 (18:52 +0000)]
Allow sysui navigation to work when application occludes keyguard
am: 69c1241d3b

Change-Id: I533b955e86cab04d9b57c08d1f162671f374f5c2

7 years agoMerge "Allow sysui navigation to work when application occludes keyguard" into nyc...
Jim Miller [Fri, 7 Oct 2016 18:43:58 +0000 (18:43 +0000)]
Merge "Allow sysui navigation to work when application occludes keyguard" into nyc-mr1-dev

7 years agoMerge "Fix race condition in checkPattern and verifyPattern." into cw-f-dev
Nancy Zheng [Fri, 7 Oct 2016 17:47:44 +0000 (17:47 +0000)]
Merge "Fix race condition in checkPattern and verifyPattern." into cw-f-dev

7 years agoFix race condition in checkPattern and verifyPattern.
Nancy Zheng [Fri, 7 Oct 2016 17:41:00 +0000 (10:41 -0700)]
Fix race condition in checkPattern and verifyPattern.

Bug: 31939282
Change-Id: I3250ab900f190ca9c820ac355ce94a699315b137

7 years agoMerge "Revert "Revert "Change bang to x for indication of no internet""" into nyc...
Jason Monk [Fri, 7 Oct 2016 17:17:16 +0000 (17:17 +0000)]
Merge "Revert "Revert "Change bang to x for indication of no internet""" into nyc-mr1-dev
am: b04790c8d4

Change-Id: I9f1cef400799409fab93f2e29aac96bd2cd6e079

7 years agoRevert "Revert "Change bang to x for indication of no internet""
Jason Monk [Fri, 7 Oct 2016 17:17:13 +0000 (17:17 +0000)]
Revert "Revert "Change bang to x for indication of no internet""
am: d51608c60b

Change-Id: I263a0d51474bbf7ef170d851b724f98deb828163

7 years agoMerge "Revert "Revert "Change bang to x for indication of no internet""" into nyc...
TreeHugger Robot [Fri, 7 Oct 2016 17:11:58 +0000 (17:11 +0000)]
Merge "Revert "Revert "Change bang to x for indication of no internet""" into nyc-mr1-dev

7 years agoUpdates documentation for MessagingStyle constructor
Alex Hills [Fri, 7 Oct 2016 13:52:44 +0000 (09:52 -0400)]
Updates documentation for MessagingStyle constructor

MessagingStyle expects the field userReplyName to be non-null, but the
documentation doesn't describe it as such. This updates the documentation
to say the field is required, and adds a NonNull annotation.

This has no behavior changes.

BUG:31747744
Change-Id: If832d059c276e856fba366dabfa8a5821bb63054

7 years agoFix dismissing window showing
Jorim Jaggi [Mon, 3 Oct 2016 14:33:56 +0000 (16:33 +0200)]
Fix dismissing window showing

Only show dismissing window if we are about to unlock, and not just
in all cases. For that, set a flag to true during the process, and
reset the flag after the Keyguard has unlocked.

Test: Have a FLAG_SHOW_WHEN_LOCKED activity that starts a
FLAG_DISMISS_KEYGUARD_ACTIVITY. Check whether window is hidden
when toggling the power button. Make sure that the device is
in a trusted state during the whole test.

Change-Id: I9346dd869d1cf50a42c64a5f7c69f8e24f1e1f9b
Fixes: 31810884

7 years agoMerge "Force APKs to be streamed" into nyc-dev am: dd100f4298 am: bafabbe4b9
Todd Kennedy [Fri, 7 Oct 2016 14:45:31 +0000 (14:45 +0000)]
Merge "Force APKs to be streamed" into nyc-dev am: dd100f4298 am: bafabbe4b9
am: 83410b7f31

Change-Id: I3b4a7351dc9e1052a590f610dd6b769ba297667a

7 years agoForce APKs to be streamed am: d220683d33 am: e119cccce0
Todd Kennedy [Fri, 7 Oct 2016 14:44:35 +0000 (14:44 +0000)]
Force APKs to be streamed am: d220683d33 am: e119cccce0
am: b69ce459aa

Change-Id: Ifa3f48c38b394ca0db339e9b6e1141750f65f412

7 years agoMerge "Force APKs to be streamed" into nyc-dev am: dd100f4298
Todd Kennedy [Fri, 7 Oct 2016 14:37:17 +0000 (14:37 +0000)]
Merge "Force APKs to be streamed" into nyc-dev am: dd100f4298
am: bafabbe4b9

Change-Id: I0ff901eb1b123a21a425072439c8be9dcd66ae6a

7 years agoForce APKs to be streamed am: d220683d33
Todd Kennedy [Fri, 7 Oct 2016 14:36:31 +0000 (14:36 +0000)]
Force APKs to be streamed am: d220683d33
am: e119cccce0

Change-Id: I196c12c3b6ebf33f6ff72abde72f67dd864c1eaf

7 years agoMerge "Force APKs to be streamed" into nyc-dev
Todd Kennedy [Fri, 7 Oct 2016 14:29:06 +0000 (14:29 +0000)]
Merge "Force APKs to be streamed" into nyc-dev
am: dd100f4298

Change-Id: Ic1904dab79ee0cccdc1aace7eca89d9a6cb48f4f

7 years agoForce APKs to be streamed
Todd Kennedy [Fri, 7 Oct 2016 14:29:03 +0000 (14:29 +0000)]
Force APKs to be streamed
am: d220683d33

Change-Id: I617a4854f406dbdacf3b150df0bd72793112d95c

7 years agoMerge "Force APKs to be streamed" into nyc-dev
TreeHugger Robot [Fri, 7 Oct 2016 14:21:26 +0000 (14:21 +0000)]
Merge "Force APKs to be streamed" into nyc-dev

7 years agoRevert "Revert "Change bang to x for indication of no internet""
Jason Monk [Fri, 7 Oct 2016 13:15:24 +0000 (13:15 +0000)]
Revert "Revert "Change bang to x for indication of no internet""

This reverts commit ed29365c9e169dbf05857bf9ca5125175a6dbe44.

Fixes: 31978991
Change-Id: I7554efc6877b100e4238178fd2029909518be3bb

7 years agoAdding minimal customizable background colour support.
Jakub Adamek [Fri, 7 Oct 2016 10:53:39 +0000 (11:53 +0100)]
Adding minimal customizable background colour support.

This adds back minimal support from
https://googleplex-android-review.googlesource.com/#/c/1442940/1
because the bigger thing had to be reverted.

Bug: 31459804
Change-Id: I545d1f7639c9dada417e95b5da6290414d3de05d

7 years agoRevert "Adding customizable background colour support."
Jakub Adamek [Fri, 7 Oct 2016 10:27:57 +0000 (11:27 +0100)]
Revert "Adding customizable background colour support."

This reverts commit eedebc4850749ba8a7a70e17a41399997806856a.

This needs to be submitted only with the next change which re-adds
minimal support.

Change-Id: I1f269a7c3bbd11fc60f61d6f23e78a1933f182c7

7 years agoRevert "Improving customization in DeviceDefault themes."
Jakub Adamek [Fri, 7 Oct 2016 09:53:34 +0000 (10:53 +0100)]
Revert "Improving customization in DeviceDefault themes."

This reverts commit 426e7a0f8357b7401a4d3fc00ff89c5dd0de51c4.

7 years agoMerge "Reject DHCP packets with no magic cookie" into nyc-mr1-dev
Hugo Benichi [Fri, 7 Oct 2016 02:29:54 +0000 (02:29 +0000)]
Merge "Reject DHCP packets with no magic cookie" into nyc-mr1-dev
am: ea2f7a4f05

Change-Id: I754c82f77800f09bbe700a3478cd1cac0e090a3d

7 years agoReject DHCP packets with no magic cookie
Hugo Benichi [Fri, 7 Oct 2016 02:29:49 +0000 (02:29 +0000)]
Reject DHCP packets with no magic cookie
am: 006e061301

Change-Id: I54a32519d13e8d5463ca86630540722d73ff75cb

7 years agoMerge "Reject DHCP packets with no magic cookie" into nyc-mr1-dev
Hugo Benichi [Fri, 7 Oct 2016 02:22:32 +0000 (02:22 +0000)]
Merge "Reject DHCP packets with no magic cookie" into nyc-mr1-dev

7 years agoAllow sysui navigation to work when application occludes keyguard
Jim Miller [Fri, 7 Oct 2016 02:11:03 +0000 (19:11 -0700)]
Allow sysui navigation to work when application occludes keyguard

Fixes bug 30650150

Change-Id: Ie4a858dcfd259c733cd32c3c2b1dec2ff437f1ab

7 years agocherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file
Kevin Hufnagle [Wed, 25 May 2016 20:01:30 +0000 (13:01 -0700)]
cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file
settings within IAB.

The section titled "Adding a batch of items to a product list," found
within the "Administering In-app Billing" page on the DAC site, now
contains up-to-date descriptions of the different settings within the
CSV files used with product lists within the Google Play Developer
Console.

Bug: 28767053
Change-Id: I578aaacdaa866d9fbac8a087f22eb1c3617437ba

7 years agoMerge "Add logging to CallerInfoAsyncQuery" into nyc-mr1-dev
Hall Liu [Thu, 6 Oct 2016 21:48:08 +0000 (21:48 +0000)]
Merge "Add logging to CallerInfoAsyncQuery" into nyc-mr1-dev
am: 0fe683da4d

Change-Id: I79b9ce817c6a95fc17795db59af83000dd1cd6dc

7 years agoAdd logging to CallerInfoAsyncQuery
Hall Liu [Thu, 6 Oct 2016 21:48:03 +0000 (21:48 +0000)]
Add logging to CallerInfoAsyncQuery
am: 4c01910cb0

Change-Id: I20ab245d47085d546baf1ddfd940635b4aa4c7d5

7 years agoMerge "Add logging to CallerInfoAsyncQuery" into nyc-mr1-dev
Hall Liu [Thu, 6 Oct 2016 21:39:03 +0000 (21:39 +0000)]
Merge "Add logging to CallerInfoAsyncQuery" into nyc-mr1-dev

7 years agoMerge "Recents TV: Do not allow negative delay" into nyc-mr1-dev
Sid Soundararajan [Thu, 6 Oct 2016 21:14:17 +0000 (21:14 +0000)]
Merge "Recents TV: Do not allow negative delay" into nyc-mr1-dev
am: 3e0427e4f8

Change-Id: I88d9838788d75b36d0fa74a8d0561c5bc77066f0