OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Fix null drawable for Mobile signal data edit QS tile" into oc-dev am: 3877863...
Evan Laird [Wed, 14 Jun 2017 22:36:14 +0000 (22:36 +0000)]
Merge "Fix null drawable for Mobile signal data edit QS tile" into oc-dev am: 38778637ad am: cd590b387c
am: af4d21edf4

Change-Id: Ia37a582912b21376f321ce0b555b841f7eceb0be

7 years agoMerge "Fix null drawable for Mobile signal data edit QS tile" into oc-dev am: 38778637ad
Evan Laird [Wed, 14 Jun 2017 22:28:11 +0000 (22:28 +0000)]
Merge "Fix null drawable for Mobile signal data edit QS tile" into oc-dev am: 38778637ad
am: cd590b387c

Change-Id: I040cb03509b8f4fad73c61e8845b58265c9e4aac

7 years agoMerge "Fix null drawable for Mobile signal data edit QS tile" into oc-dev
Evan Laird [Wed, 14 Jun 2017 22:19:17 +0000 (22:19 +0000)]
Merge "Fix null drawable for Mobile signal data edit QS tile" into oc-dev
am: 38778637ad

Change-Id: I175551c94c1775982a015ebeeb65a05c8a571a72

7 years agoMerge "Fix null drawable for Mobile signal data edit QS tile" into oc-dev
TreeHugger Robot [Wed, 14 Jun 2017 22:10:51 +0000 (22:10 +0000)]
Merge "Fix null drawable for Mobile signal data edit QS tile" into oc-dev

7 years agoMerge "Add logging constant for wifi tether setting page."
TreeHugger Robot [Wed, 14 Jun 2017 21:33:19 +0000 (21:33 +0000)]
Merge "Add logging constant for wifi tether setting page."

7 years agoMerge "Add a workaround for simulate secondary display" into oc-dev am: 31443a17e8...
John Reck [Wed, 14 Jun 2017 20:53:39 +0000 (20:53 +0000)]
Merge "Add a workaround for simulate secondary display" into oc-dev am: 31443a17e8 am: 94ed3c84d6
am: 5d237daf42

Change-Id: I594ac0e26b2b4bb4a09bff555cce1c68eaeb4c8d

7 years agoMerge "Add a workaround for simulate secondary display" into oc-dev am: 31443a17e8...
John Reck [Wed, 14 Jun 2017 20:43:12 +0000 (20:43 +0000)]
Merge "Add a workaround for simulate secondary display" into oc-dev am: 31443a17e8 am: f0d3971021
am: 2d41b97bc3

Change-Id: I4de4d39d14746691ca74e13918f3ae06476b91bc

7 years agoMerge "Merge "Revert accidental API change to RemoteViews." into oc-dev am: 0e6a5f8d7...
Daniel Sandler [Wed, 14 Jun 2017 20:40:41 +0000 (20:40 +0000)]
Merge "Merge "Revert accidental API change to RemoteViews." into oc-dev am: 0e6a5f8d7e am: 321163990e" into oc-dr1-dev-plus-aosp
am: bce79b1bdc

Change-Id: I0c54ee4c5a0ef11c8e7e6ddc07ce15ad0bd4c6c3

7 years agoMerge "Add a workaround for simulate secondary display" into oc-dev am: 31443a17e8
John Reck [Wed, 14 Jun 2017 20:35:36 +0000 (20:35 +0000)]
Merge "Add a workaround for simulate secondary display" into oc-dev am: 31443a17e8
am: 94ed3c84d6

Change-Id: Ifa806aa752d7c40f4fae42d57d944a7fd1353d74

7 years agoMerge "Revert accidental API change to RemoteViews." into oc-dev am: 0e6a5f8d7e am...
Daniel Sandler [Wed, 14 Jun 2017 20:32:09 +0000 (20:32 +0000)]
Merge "Revert accidental API change to RemoteViews." into oc-dev am: 0e6a5f8d7e am: d9a722f54c
am: 306388418e

Change-Id: I0ebb32e4790b45eb54674307cb2adc22237ef149

7 years agoMerge "Add a workaround for simulate secondary display" into oc-dev am: 31443a17e8
John Reck [Wed, 14 Jun 2017 20:31:11 +0000 (20:31 +0000)]
Merge "Add a workaround for simulate secondary display" into oc-dev am: 31443a17e8
am: f0d3971021

Change-Id: I5ee14c0887eaeac267c815851ae6f9e8ee47d80f

7 years agoMerge "Merge "Revert accidental API change to RemoteViews." into oc-dev am: 0e6a5f8d7...
Android Build Merger (Role) [Wed, 14 Jun 2017 20:28:16 +0000 (20:28 +0000)]
Merge "Merge "Revert accidental API change to RemoteViews." into oc-dev am: 0e6a5f8d7e am: 321163990e" into oc-dr1-dev-plus-aosp

7 years agoMerge "Add a workaround for simulate secondary display" into oc-dev
John Reck [Wed, 14 Jun 2017 20:27:09 +0000 (20:27 +0000)]
Merge "Add a workaround for simulate secondary display" into oc-dev
am: 31443a17e8

Change-Id: Ib248882df61f0d45b7687726c1a57de6c289a9b5

7 years agoMerge "Revert accidental API change to RemoteViews." into oc-dev am: 0e6a5f8d7e
Daniel Sandler [Wed, 14 Jun 2017 20:25:39 +0000 (20:25 +0000)]
Merge "Revert accidental API change to RemoteViews." into oc-dev am: 0e6a5f8d7e
am: 321163990e

Change-Id: Ic96a571c015fd814d38fd3747e3610e6ff375590

7 years agoMerge "Add a workaround for simulate secondary display" into oc-dev
John Reck [Wed, 14 Jun 2017 20:25:03 +0000 (20:25 +0000)]
Merge "Add a workaround for simulate secondary display" into oc-dev
am: 31443a17e8

Change-Id: Ic63e4f48ec55bce9f51089bc41481ab8805ae8c7

7 years agoMerge "Revert accidental API change to RemoteViews." into oc-dev am: 0e6a5f8d7e
Daniel Sandler [Wed, 14 Jun 2017 20:24:58 +0000 (20:24 +0000)]
Merge "Revert accidental API change to RemoteViews." into oc-dev am: 0e6a5f8d7e
am: d9a722f54c

Change-Id: I7d026257ee7e95fac7c03b786c79661ea834e831

7 years agoMerge "Revert accidental API change to RemoteViews." into oc-dev
Daniel Sandler [Wed, 14 Jun 2017 20:18:56 +0000 (20:18 +0000)]
Merge "Revert accidental API change to RemoteViews." into oc-dev
am: 0e6a5f8d7e

Change-Id: I4f59700800b25533e2bdcc7dce5b6c39badcfdec

7 years agoMerge "Revert accidental API change to RemoteViews." into oc-dev
Daniel Sandler [Wed, 14 Jun 2017 20:18:56 +0000 (20:18 +0000)]
Merge "Revert accidental API change to RemoteViews." into oc-dev
am: 0e6a5f8d7e

Change-Id: I7e00e745c8aa2ddb6232747d4371dc3194be28ef

7 years agoMerge "Add a workaround for simulate secondary display" into oc-dev
TreeHugger Robot [Wed, 14 Jun 2017 20:13:59 +0000 (20:13 +0000)]
Merge "Add a workaround for simulate secondary display" into oc-dev

7 years agoMerge "Revert accidental API change to RemoteViews." into oc-dev
Daniel Sandler [Wed, 14 Jun 2017 20:12:32 +0000 (20:12 +0000)]
Merge "Revert accidental API change to RemoteViews." into oc-dev

7 years agoRevert accidental API change to RemoteViews.
Daniel Sandler [Tue, 13 Jun 2017 18:32:46 +0000 (18:32 +0000)]
Revert accidental API change to RemoteViews.

This reverts commit 7f09ce1a238ad5a647da913e275fd637ac75ab49 (but
retains the bug fix)

Change-Id: Ib4700ada5aa0b5dab7e43f895b48eb7058308869
Fixes: 62543637
Bug: 62181033

7 years agoMerge changes from topic 'wallpaper_grey_scrim-oc-dr1-dev' into oc-dr1-dev am: 8521eebfad
Lucas Dupin [Wed, 14 Jun 2017 19:53:20 +0000 (19:53 +0000)]
Merge changes from topic 'wallpaper_grey_scrim-oc-dr1-dev' into oc-dr1-dev am: 8521eebfad
am: 8f77357702

Change-Id: Ide5fa4decb9f22de8c0ba3d546667fb5ef0e208e

7 years agoMerge "Add SoundTriggerManager APIs to use a PendingIntent to get callbacks." into...
Chris Thornton [Wed, 14 Jun 2017 19:48:28 +0000 (19:48 +0000)]
Merge "Add SoundTriggerManager APIs to use a PendingIntent to get callbacks." into oc-dr1-dev am: 6f071c369e
am: 2fe6586160

Change-Id: I13fcdd58bd9219ce6c65e4bf90d107222047fc42

7 years agoFix null drawable for Mobile signal data edit QS tile
Evan Laird [Wed, 14 Jun 2017 19:40:02 +0000 (15:40 -0400)]
Fix null drawable for Mobile signal data edit QS tile

Currently it's a funky situation with CellTileView. There should
ultimate be a better way to handle displaying the SignalDrawable (per
the TODO comments), but this is a sensible fix to show the mobile data
icon in the edit QS screen for now.

Test: visual
Bug: 62525439
Change-Id: I95f0fb86862aa6a7b60f304053a73127907943ee

7 years agoMerge "DayPickerView - clamp date to min/max" into oc-dev am: 511c95a022 am: c63475e5de
Andrei Stingaceanu [Wed, 14 Jun 2017 19:45:43 +0000 (19:45 +0000)]
Merge "DayPickerView - clamp date to min/max" into oc-dev am: 511c95a022 am: c63475e5de
am: 7513b5000d

Change-Id: I665c1d94b08725cbae2ebd9bd8957c1785c24a0c

7 years agoMerge "DayPickerView - clamp date to min/max" into oc-dev am: 511c95a022 am: 37aa78bfab
Andrei Stingaceanu [Wed, 14 Jun 2017 19:35:55 +0000 (19:35 +0000)]
Merge "DayPickerView - clamp date to min/max" into oc-dev am: 511c95a022 am: 37aa78bfab
am: 852f4b1fa7

Change-Id: I317b1c2891426225863711e4815a470d1902a9a2

7 years agoMerge changes from topic 'wallpaper_grey_scrim-oc-dr1-dev' into oc-dr1-dev
Lucas Dupin [Wed, 14 Jun 2017 19:34:12 +0000 (19:34 +0000)]
Merge changes from topic 'wallpaper_grey_scrim-oc-dr1-dev' into oc-dr1-dev
am: 8521eebfad

Change-Id: If523c47be47a0c1f251124c0607802068fd14900

7 years agoMerge "wifi: add API for retrieving Hotspot 2.0 OSU providers" into oc-dr1-dev am...
Peter Qiu [Wed, 14 Jun 2017 19:28:40 +0000 (19:28 +0000)]
Merge "wifi: add API for retrieving Hotspot 2.0 OSU providers" into oc-dr1-dev am: 088f2754c0
am: 43b1d48a10  -s ours

Change-Id: Ie42b1f88ae5aaef270b6af3b0307fa1ec5345473

7 years agoMerge "Use SystemUI Dialog Theme for QSSecurityFooter dialog" into oc-dr1-dev am...
Philipp Weiß [Wed, 14 Jun 2017 19:24:58 +0000 (19:24 +0000)]
Merge "Use SystemUI Dialog Theme for QSSecurityFooter dialog" into oc-dr1-dev am: 08836ed404
am: 90b4e175e3

Change-Id: If459d7a7f229b81e9f45c4c8e0c460b9077ec677

7 years agoMerge changes from topic 'wallpaper_grey_scrim-oc-dr1-dev' into oc-dr1-dev
TreeHugger Robot [Wed, 14 Jun 2017 19:23:48 +0000 (19:23 +0000)]
Merge changes from topic 'wallpaper_grey_scrim-oc-dr1-dev' into oc-dr1-dev

* changes:
  Fixed flaky test
  Disabled test
  Scrims should be grey when in-app

7 years agoMerge "Select the right pages to scrap" into oc-dev am: 890cb59003 am: 517503d1dd
Philip P. Moltmann [Wed, 14 Jun 2017 19:22:35 +0000 (19:22 +0000)]
Merge "Select the right pages to scrap" into oc-dev am: 890cb59003 am: 517503d1dd
am: 2f291c3b84

Change-Id: I4fdf5d3de67bfbff6f89f523c7cd07aed706d90b

7 years agoMerge "Add SoundTriggerManager APIs to use a PendingIntent to get callbacks." into...
Chris Thornton [Wed, 14 Jun 2017 19:16:36 +0000 (19:16 +0000)]
Merge "Add SoundTriggerManager APIs to use a PendingIntent to get callbacks." into oc-dr1-dev
am: 6f071c369e

Change-Id: I98f9c06856a70a5a4b3634f41860068c331f0c83

7 years agoMerge "Add SoundTriggerManager APIs to use a PendingIntent to get callbacks." into...
TreeHugger Robot [Wed, 14 Jun 2017 19:10:37 +0000 (19:10 +0000)]
Merge "Add SoundTriggerManager APIs to use a PendingIntent to get callbacks." into oc-dr1-dev

7 years agoMerge "Select the right pages to scrap" into oc-dev am: 890cb59003 am: 955aead48d
Philip P. Moltmann [Wed, 14 Jun 2017 19:07:01 +0000 (19:07 +0000)]
Merge "Select the right pages to scrap" into oc-dev am: 890cb59003 am: 955aead48d
am: e993a709ce

Change-Id: I655c9b8ad44aed44cc0de245150625aaeed5df6d

7 years agoMerge "Merge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd...
Jason Monk [Wed, 14 Jun 2017 19:00:21 +0000 (19:00 +0000)]
Merge "Merge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4 am: adfc1ad840" into oc-dr1-dev-plus-aosp
am: 7a2bd51250

Change-Id: I472c0d677f21291a3940628f3712fb3fbba009fd

7 years agoMerge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4 am...
Jason Monk [Wed, 14 Jun 2017 18:56:47 +0000 (18:56 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4 am: 2cb53750ec
am: b9bd54fbc3

Change-Id: I40cdba29fd007bdc0899ce545db9021607ce2599

7 years agoMerge "Revert Early version of new volume" into oc-dr1-dev am: f3ad1dbcfd
Jason Monk [Wed, 14 Jun 2017 18:53:01 +0000 (18:53 +0000)]
Merge "Revert Early version of new volume" into oc-dr1-dev am: f3ad1dbcfd
am: 9dd35ba87b  -s ours

Change-Id: Ic71b0ee399625ddbab7288cf6515e5b7696b7d64

7 years agoMerge "DayPickerView - clamp date to min/max" into oc-dev am: 511c95a022
Andrei Stingaceanu [Wed, 14 Jun 2017 18:04:14 +0000 (18:04 +0000)]
Merge "DayPickerView - clamp date to min/max" into oc-dev am: 511c95a022
am: c63475e5de

Change-Id: I6698e18eaaed18626e83f19a516d3dc249e6558d

7 years agoMerge "DayPickerView - clamp date to min/max" into oc-dev am: 511c95a022
Andrei Stingaceanu [Wed, 14 Jun 2017 17:56:32 +0000 (17:56 +0000)]
Merge "DayPickerView - clamp date to min/max" into oc-dev am: 511c95a022
am: 37aa78bfab

Change-Id: Icd47bbcaca1f046249c24a657cd49dc2e61405a7

7 years agoAdd a workaround for simulate secondary display
John Reck [Wed, 14 Jun 2017 17:47:50 +0000 (10:47 -0700)]
Add a workaround for simulate secondary display

To workaround a deadlock caused by bufferqueue locks
we force RenderThread over to use async mode which
we enable via eglSwapInterval(0)

Bug: 38372997
Test: steps in the bug
Change-Id: Ia305f73abbdd64ab0c25d1f7d32792cc6295a0ce

7 years agoMerge "DayPickerView - clamp date to min/max" into oc-dev
Andrei Stingaceanu [Wed, 14 Jun 2017 17:47:03 +0000 (17:47 +0000)]
Merge "DayPickerView - clamp date to min/max" into oc-dev
am: 511c95a022

Change-Id: I1ede393b4a5ac44b9961a37e265b7663c88aaa5e

7 years agoMerge "DayPickerView - clamp date to min/max" into oc-dev
Andrei Stingaceanu [Wed, 14 Jun 2017 17:46:59 +0000 (17:46 +0000)]
Merge "DayPickerView - clamp date to min/max" into oc-dev
am: 511c95a022

Change-Id: I57eafe97328ee10bd0ccee296586307baa02cc6d

7 years agoMerge "DayPickerView - clamp date to min/max" into oc-dev
TreeHugger Robot [Wed, 14 Jun 2017 17:38:42 +0000 (17:38 +0000)]
Merge "DayPickerView - clamp date to min/max" into oc-dev

7 years agoMerge "Some cleanups in VolumeDialogImpl class 1. Get rid of unused imports 2. Make...
Rajeev Kumar [Wed, 14 Jun 2017 17:18:05 +0000 (17:18 +0000)]
Merge "Some cleanups in VolumeDialogImpl class 1. Get rid of unused imports 2. Make the an instance variable final 3. Fix typo in method name"

7 years agoAdd logging constant for wifi tether setting page.
Fan Zhang [Tue, 13 Jun 2017 20:45:21 +0000 (13:45 -0700)]
Add logging constant for wifi tether setting page.

Bug: 37253404
Test: builds
Change-Id: If237e7d7fc02506aa80acfab7929086ac7172a53

7 years agoFixed flaky test
Lucas Dupin [Tue, 13 Jun 2017 17:47:15 +0000 (10:47 -0700)]
Fixed flaky test

Change-Id: I88a39a8eb4fd6da6dc5b156aa475330299ffb9b9
Fixes: 62568528
Test: runtest systemui

7 years agoDisabled test
Lucas Dupin [Tue, 13 Jun 2017 17:37:52 +0000 (10:37 -0700)]
Disabled test

Bug: 62568528
Change-Id: I1e3908e4d18c216132b0c4d7ae9b6e223e321799

7 years agoScrims should be grey when in-app
Lucas Dupin [Wed, 24 May 2017 21:14:44 +0000 (14:14 -0700)]
Scrims should be grey when in-app

Bug: 38164389
Test: runtest -x colorextraction/tests/src/com/google/android/colorextraction/ColorExtractorTest.java
Test: runtest -x tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java
Change-Id: Ifcc04a8562e46b4f65bce0470ccd6c02dffcf377
(cherry picked from commit e1571705e6ea8367e7ee93d61104ce27035492dc)

7 years agoMerge "Fix broadcast radio instrumentation tests."
Tomasz Wasilczyk [Wed, 14 Jun 2017 16:32:02 +0000 (16:32 +0000)]
Merge "Fix broadcast radio instrumentation tests."

7 years agoMerge "wifi: add API for retrieving Hotspot 2.0 OSU providers" into oc-dr1-dev
Peter Qiu [Wed, 14 Jun 2017 16:19:59 +0000 (16:19 +0000)]
Merge "wifi: add API for retrieving Hotspot 2.0 OSU providers" into oc-dr1-dev
am: 088f2754c0

Change-Id: I864d0236bd3b17b3e38818e4ec43e42dd85dfd03

7 years agoMerge "wifi: add API for retrieving Hotspot 2.0 OSU providers" into oc-dr1-dev
TreeHugger Robot [Wed, 14 Jun 2017 16:14:32 +0000 (16:14 +0000)]
Merge "wifi: add API for retrieving Hotspot 2.0 OSU providers" into oc-dr1-dev

7 years agoMerge "Use SystemUI Dialog Theme for QSSecurityFooter dialog" into oc-dr1-dev
Philipp Weiß [Wed, 14 Jun 2017 15:23:17 +0000 (15:23 +0000)]
Merge "Use SystemUI Dialog Theme for QSSecurityFooter dialog" into oc-dr1-dev
am: 08836ed404

Change-Id: Ia1c7d6110c8195b9480f8fdac9c5125e9a2395a5

7 years agoMerge "Use SystemUI Dialog Theme for QSSecurityFooter dialog" into oc-dr1-dev
Philipp Weiß [Wed, 14 Jun 2017 15:16:48 +0000 (15:16 +0000)]
Merge "Use SystemUI Dialog Theme for QSSecurityFooter dialog" into oc-dr1-dev

7 years agoMerge "Select the right pages to scrap" into oc-dev am: 890cb59003
Philip P. Moltmann [Wed, 14 Jun 2017 15:11:45 +0000 (15:11 +0000)]
Merge "Select the right pages to scrap" into oc-dev am: 890cb59003
am: 517503d1dd

Change-Id: I2703a8ca505ba9be595c83d1b7c74ef3b824762c

7 years agoMerge "Select the right pages to scrap" into oc-dev am: 890cb59003
Philip P. Moltmann [Wed, 14 Jun 2017 15:03:42 +0000 (15:03 +0000)]
Merge "Select the right pages to scrap" into oc-dev am: 890cb59003
am: 955aead48d

Change-Id: Ie7ea8573c00506a035a1eb61bdff7f66780e27ce

7 years agoMerge "Select the right pages to scrap" into oc-dev
Philip P. Moltmann [Wed, 14 Jun 2017 14:52:18 +0000 (14:52 +0000)]
Merge "Select the right pages to scrap" into oc-dev
am: 890cb59003

Change-Id: Id04b03520dfe63f5b11ee5b17841165a477a8f79

7 years agoMerge "Select the right pages to scrap" into oc-dev
Philip P. Moltmann [Wed, 14 Jun 2017 14:52:13 +0000 (14:52 +0000)]
Merge "Select the right pages to scrap" into oc-dev
am: 890cb59003

Change-Id: I5393dde07ea3feff2053d85769eccd5195139229

7 years agoMerge "Fixed flaky test"
Lucas Dupin [Wed, 14 Jun 2017 14:50:02 +0000 (14:50 +0000)]
Merge "Fixed flaky test"

7 years agoMerge "Select the right pages to scrap" into oc-dev
Philip P. Moltmann [Wed, 14 Jun 2017 14:44:30 +0000 (14:44 +0000)]
Merge "Select the right pages to scrap" into oc-dev

7 years agoMerge "Merge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd...
Android Build Merger (Role) [Wed, 14 Jun 2017 13:58:54 +0000 (13:58 +0000)]
Merge "Merge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4 am: adfc1ad840" into oc-dr1-dev-plus-aosp

7 years agoMerge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4
Jason Monk [Wed, 14 Jun 2017 13:56:46 +0000 (13:56 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4
am: adfc1ad840

Change-Id: I57cd3a2694ce39f9e66d836d683b7d72b37ac766

7 years agoMerge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4
Jason Monk [Wed, 14 Jun 2017 13:55:04 +0000 (13:55 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev am: 2a0b423cd4
am: 2cb53750ec

Change-Id: I02b42acfc44c732f9c7d67a1bf65e2714b3d714a

7 years agoMerge "Revert Early version of new volume" into oc-dr1-dev
Jason Monk [Wed, 14 Jun 2017 13:47:43 +0000 (13:47 +0000)]
Merge "Revert Early version of new volume" into oc-dr1-dev
am: f3ad1dbcfd

Change-Id: Id1d9e70e14eecaa4f6c016aa1985e3a3f3170bc7

7 years agoMerge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev am: 356d1ac545
Grace Chen [Wed, 14 Jun 2017 13:47:42 +0000 (13:47 +0000)]
Merge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev am: 356d1ac545
am: d09386a664

Change-Id: I9ae15ef2270314c9fbfcac110c97857b229e4804

7 years agoMerge "Fix footer not being hidden in detail panels" into oc-dev
Jason Monk [Wed, 14 Jun 2017 13:46:17 +0000 (13:46 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev
am: 2a0b423cd4

Change-Id: Ic8ce2331b9191422f921834f484492bc7bff4c95

7 years agoMerge "Fix footer not being hidden in detail panels" into oc-dev
Jason Monk [Wed, 14 Jun 2017 13:46:11 +0000 (13:46 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev
am: 2a0b423cd4

Change-Id: I97266821c07fd307dbe04e5d715792e57bfa9c0d

7 years agoMerge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev
Grace Chen [Wed, 14 Jun 2017 13:40:46 +0000 (13:40 +0000)]
Merge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev
am: 356d1ac545

Change-Id: I692e3d0d7eac1f94e39e85e4b244fd9974fc1108

7 years agoMerge "Fix footer not being hidden in detail panels" into oc-dev
Jason Monk [Wed, 14 Jun 2017 13:37:28 +0000 (13:37 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev

7 years agoMerge "Revert Early version of new volume" into oc-dr1-dev
Jason Monk [Wed, 14 Jun 2017 13:36:38 +0000 (13:36 +0000)]
Merge "Revert Early version of new volume" into oc-dr1-dev

7 years agoMerge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev
Grace Chen [Wed, 14 Jun 2017 13:35:34 +0000 (13:35 +0000)]
Merge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev

7 years agoMerge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" am...
Erik Kline [Wed, 14 Jun 2017 10:38:57 +0000 (10:38 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" am: 6f029bbc82 am: 35728f01cb am: d2bf55e300
am: 607df03ae0

Change-Id: Ib6e6356e6caa469523fc098e850108de97b494e2

7 years agoMerge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" am...
Erik Kline [Wed, 14 Jun 2017 10:32:29 +0000 (10:32 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" am: 6f029bbc82 am: 35728f01cb
am: d2bf55e300

Change-Id: Iec52309a56dd38ac9854ce40a792b3b622f0b015

7 years agoMerge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" am...
Erik Kline [Wed, 14 Jun 2017 10:25:33 +0000 (10:25 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" am: 6f029bbc82
am: 35728f01cb

Change-Id: I5eb3c02331aabc033ecfebee2900477c61e1b6f6

7 years agoMerge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine"
Erik Kline [Wed, 14 Jun 2017 10:19:35 +0000 (10:19 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine"
am: 6f029bbc82

Change-Id: I098bd78d29cf4119208d24977dab8494d3bf5fdb

7 years agoMerge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine"
Treehugger Robot [Wed, 14 Jun 2017 10:11:58 +0000 (10:11 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine"

7 years agoUse SystemUI Dialog Theme for QSSecurityFooter dialog
phweiss [Tue, 13 Jun 2017 13:23:13 +0000 (15:23 +0200)]
Use SystemUI Dialog Theme for QSSecurityFooter dialog

Without the ContextThemeWrapper, the dialog's text color
gets changed whenever the QS theme changes.

Bug: 62534577
Test: manual, CTS Verifier > Managed Provisioning > Device Owner Tests
      > Network Logging UI

Change-Id: I408902688b97bb3c6dff06215b12956ae49a4806
(cherry picked from commit da9bee2623c358913cafc06b6d617d10e234777c)

7 years agoMerge "Use SystemUI Dialog Theme for QSSecurityFooter dialog"
Philipp Weiß [Wed, 14 Jun 2017 10:00:54 +0000 (10:00 +0000)]
Merge "Use SystemUI Dialog Theme for QSSecurityFooter dialog"

7 years agoMerge "Merge "SensorManager: attach background thread to JavaVM" into oc-dev am:...
Peng Xu [Wed, 14 Jun 2017 06:44:34 +0000 (06:44 +0000)]
Merge "Merge "SensorManager: attach background thread to JavaVM" into oc-dev am: d27d5d9ea8 am: 41cb9f1bb1" into oc-dr1-dev-plus-aosp
am: 0aeac3814a

Change-Id: Ica523e0d2b851e87d4520d32e70672416836afc9

7 years agoMerge "SensorManager: attach background thread to JavaVM" into oc-dev am: d27d5d9ea8...
Peng Xu [Wed, 14 Jun 2017 06:36:20 +0000 (06:36 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev am: d27d5d9ea8 am: 308aa4c846
am: 5c2479c7ab

Change-Id: If26280f5a68bc859a0f06ae18d3eb0bb8b2ea57c

7 years agoMerge "Merge "SensorManager: attach background thread to JavaVM" into oc-dev am:...
Android Build Merger (Role) [Wed, 14 Jun 2017 06:33:43 +0000 (06:33 +0000)]
Merge "Merge "SensorManager: attach background thread to JavaVM" into oc-dev am: d27d5d9ea8 am: 41cb9f1bb1" into oc-dr1-dev-plus-aosp

7 years agoMerge "SensorManager: attach background thread to JavaVM" into oc-dev am: d27d5d9ea8
Peng Xu [Wed, 14 Jun 2017 06:31:51 +0000 (06:31 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev am: d27d5d9ea8
am: 41cb9f1bb1

Change-Id: I26fbfe8ae684fe27c43fcad12ff127506614e0b9

7 years agoMerge "SensorManager: attach background thread to JavaVM" into oc-dev am: d27d5d9ea8
Peng Xu [Wed, 14 Jun 2017 06:27:45 +0000 (06:27 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev am: d27d5d9ea8
am: 308aa4c846

Change-Id: I90935ea2db530143daf3da44637b7cb97f9be2bd

7 years agoMerge "SensorManager: attach background thread to JavaVM" into oc-dev
Peng Xu [Wed, 14 Jun 2017 06:20:15 +0000 (06:20 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev
am: d27d5d9ea8

Change-Id: Ib34a45b6fe35f27f4b3093888cbecd70b8b71300

7 years agoMerge "SensorManager: attach background thread to JavaVM" into oc-dev
Peng Xu [Wed, 14 Jun 2017 06:20:15 +0000 (06:20 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev
am: d27d5d9ea8

Change-Id: Iecea6df9119b4a9bbd5843e78787d581ced518c7

7 years agoMerge "SensorManager: attach background thread to JavaVM" into oc-dev
Peng Xu [Wed, 14 Jun 2017 06:12:37 +0000 (06:12 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev

7 years agoApp launch test apk change am: 0a2c9396a2 am: 8c64bf0edf
gopinath [Wed, 14 Jun 2017 05:01:04 +0000 (05:01 +0000)]
App launch test apk change am: 0a2c9396a2 am: 8c64bf0edf
am: a88f25b646

Change-Id: Ic6d3f9e6d920a0666104b82b79370f6ba715f1a3

7 years agoApp launch test apk change am: 0a2c9396a2 am: 4c81f3d412
gopinath [Wed, 14 Jun 2017 04:52:38 +0000 (04:52 +0000)]
App launch test apk change am: 0a2c9396a2 am: 4c81f3d412
am: 75b74a9056

Change-Id: Ifd74250be7b1372fe1449ac1fa55442293bfb829

7 years agoApp launch test apk change am: 0a2c9396a2
gopinath [Wed, 14 Jun 2017 04:49:30 +0000 (04:49 +0000)]
App launch test apk change am: 0a2c9396a2
am: 8c64bf0edf

Change-Id: Ia90bdb8649c55d271a68d6c831dbd59cd8a4a21f

7 years agoApp launch test apk change am: 0a2c9396a2
gopinath [Wed, 14 Jun 2017 04:45:04 +0000 (04:45 +0000)]
App launch test apk change am: 0a2c9396a2
am: 4c81f3d412

Change-Id: I6eab0fc584667f63dfa14de51f0c66b5494fb0f6

7 years agoApp launch test apk change
gopinath [Wed, 14 Jun 2017 04:39:30 +0000 (04:39 +0000)]
App launch test apk change
am: 0a2c9396a2

Change-Id: I2468cfc8f0db8c993ed0203d12bffb5abcd76305

7 years agoApp launch test apk change
gopinath [Wed, 14 Jun 2017 04:37:29 +0000 (04:37 +0000)]
App launch test apk change
am: 0a2c9396a2

Change-Id: Icad70c318aecfa28b985b7a7c737e332c9024ab8

7 years agoMerge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928 am: 707dc81da1...
Ying Xu [Wed, 14 Jun 2017 02:49:05 +0000 (02:49 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928 am: 707dc81da1 am: aaca44229b
am: 830b8ecab2

Change-Id: If2953e4ee5220809fdab50ddd4fc17c6ed80c3b4

7 years agoSome cleanups in VolumeDialogImpl class
Rajeev Kumar [Wed, 14 Jun 2017 02:41:35 +0000 (19:41 -0700)]
Some cleanups in VolumeDialogImpl class
1. Get rid of unused imports
2. Make the an instance variable final
3. Fix typo in method name

Change-Id: Ife7d84e8d60262153ac8bdb602565c526297b134

7 years agoMerge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928 am: 707dc81da1
Ying Xu [Wed, 14 Jun 2017 02:41:26 +0000 (02:41 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928 am: 707dc81da1
am: aaca44229b

Change-Id: I9656821a325d000dde93e05987c29c76609578bc

7 years agoMerge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928
Ying Xu [Wed, 14 Jun 2017 02:33:41 +0000 (02:33 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928
am: 707dc81da1

Change-Id: I37113bddb18b73dbf10b0dc9067dec9311338e86

7 years agoMerge "Adds error codes and maximum RAN/Bands/Channels"
Ying Xu [Wed, 14 Jun 2017 02:25:53 +0000 (02:25 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels"
am: 70373f7928

Change-Id: I1c169772fb1335df4128b186e826f1bed1ca501d

7 years agoMerge "Adds error codes and maximum RAN/Bands/Channels"
Ying Xu [Wed, 14 Jun 2017 02:16:51 +0000 (02:16 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels"

7 years agoMerge "Disable StatusBar logs" into oc-dr1-dev am: 2306a78963
Lucas Dupin [Wed, 14 Jun 2017 02:15:18 +0000 (02:15 +0000)]
Merge "Disable StatusBar logs" into oc-dr1-dev am: 2306a78963
am: 3d41a8df31

Change-Id: Ia710e1720c6c08d90dbf7581f9916eb1767fbfd9

7 years agoMerge "Disable StatusBar logs" into oc-dr1-dev
Lucas Dupin [Wed, 14 Jun 2017 02:07:59 +0000 (02:07 +0000)]
Merge "Disable StatusBar logs" into oc-dr1-dev
am: 2306a78963

Change-Id: Id542cb75499e2e1616e35ba067a431e3402a1f44

7 years agoMerge "Add assist gesture silence and wake settings" into oc-dr1-dev am: 6eacc1a4ba
Kevin Chyn [Wed, 14 Jun 2017 02:00:29 +0000 (02:00 +0000)]
Merge "Add assist gesture silence and wake settings" into oc-dr1-dev am: 6eacc1a4ba
am: 3164bf6743

Change-Id: I30ba4eac86bc92ac8013840f80a3645efba64d3e