OSDN Git Service
Jorim Jaggi [Tue, 25 Jun 2019 18:38:53 +0000 (11:38 -0700)]
Merge "Revert "Reland "Prevent dismissing starting window when reopening app""" into qt-dev am:
e0d3ce875f
am:
df5ed2e842
Change-Id: I1c01a4ba104723fdaa9d25d2b13a6788ace2e13f
Bill Yi [Tue, 25 Jun 2019 18:26:54 +0000 (11:26 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
b2f7868547 -s ours
am skip reason: subject contains skip directive
Change-Id: If8ba8fa618c03c0d51def82b4408035c7c9efbd1
Jorim Jaggi [Tue, 25 Jun 2019 18:26:52 +0000 (11:26 -0700)]
Merge "Revert "Reland "Prevent dismissing starting window when reopening app""" into qt-dev
am:
e0d3ce875f
Change-Id: Ic4fb7ec7be661be767bcff3820a14c4315cac007
TreeHugger Robot [Tue, 25 Jun 2019 18:05:54 +0000 (18:05 +0000)]
Merge "Revert "Reland "Prevent dismissing starting window when reopening app""" into qt-dev
TreeHugger Robot [Tue, 25 Jun 2019 17:58:27 +0000 (17:58 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Yin-Chia Yeh [Tue, 25 Jun 2019 16:59:31 +0000 (09:59 -0700)]
Merge "Camera: block session init callback until ctor returns" into qt-dev am:
0e1eecd080
am:
0aa57fe073
Change-Id: Ifdd251114452aa3f89c09769e9ace80b409ed1d4
David Nelloms [Tue, 25 Jun 2019 16:54:23 +0000 (09:54 -0700)]
Merge "Revert "Clear transitions for app windows display change."" into qt-dev am:
ea470ecb6f
am:
61ae29864a
Change-Id: I72199fe56c58295c462bf8c4ca02aaeaae8cd86b
Yin-Chia Yeh [Tue, 25 Jun 2019 16:45:42 +0000 (09:45 -0700)]
Merge "Camera: block session init callback until ctor returns" into qt-dev
am:
0e1eecd080
Change-Id: I999510b0513b0b32a86af8e5460aa5688476e9f5
David Nelloms [Tue, 25 Jun 2019 16:40:36 +0000 (09:40 -0700)]
Merge "Revert "Clear transitions for app windows display change."" into qt-dev
am:
ea470ecb6f
Change-Id: I4561f1ff9b593e61d1c517af01cb28d26cd9f935
Yin-Chia Yeh [Tue, 25 Jun 2019 16:26:54 +0000 (16:26 +0000)]
Merge "Camera: block session init callback until ctor returns" into qt-dev
David Nelloms [Tue, 25 Jun 2019 16:12:54 +0000 (16:12 +0000)]
Merge "Revert "Clear transitions for app windows display change."" into qt-dev
David Nelloms [Tue, 25 Jun 2019 16:03:57 +0000 (16:03 +0000)]
Revert "Clear transitions for app windows display change."
This reverts commit
110ed21087eb9993835d887d33f4e1fb05fa86b8.
Reason for revert: CTS failure b/
135655256
Bug:
135655256
Bug:
128449959
Change-Id: I9b36d34193e1c9e228be609a7b10457392fd6aa3
Jorim Jaggi [Tue, 25 Jun 2019 15:26:49 +0000 (17:26 +0200)]
Revert "Reland "Prevent dismissing starting window when reopening app""
This reverts commit
be71ed8a8e2ea302abbd4a5a0e8b5adc53449e67.
Causes various issues. Out of time for Q to investigate and fix.
Fixes:
135706138
Fixes:
135661232
Fixes:
135976008
Fixes:
135921478
Fixes:
135780312
Bug:
134561008
Change-Id: Ifb7b1fe2b189649d320516e70368625c903debea
Bill Yi [Tue, 25 Jun 2019 15:36:12 +0000 (08:36 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
c760a652ab -s ours
am:
95460d28f8 -s ours
am skip reason: subject contains skip directive
Change-Id: I7352b253a4d8870f4a9078e4be0454d81dbcd58c
Bill Yi [Tue, 25 Jun 2019 15:17:55 +0000 (08:17 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
c760a652ab -s ours
am skip reason: subject contains skip directive
Change-Id: Ib7944143b1c161d5cf504c90871fc21934b23245
TreeHugger Robot [Tue, 25 Jun 2019 14:46:02 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Tue, 25 Jun 2019 14:34:14 +0000 (07:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ib84e11cdc1f5e6e7aa7be8ea5d02853d1204de13
Amin Shaikh [Tue, 25 Jun 2019 14:06:06 +0000 (07:06 -0700)]
Merge "Catch ISE in ThemeOverlayManager." into qt-r1-dev
am:
d7479146eb
Change-Id: Ia17998020735705af9bf97e3ed92269a4b09aae8
TreeHugger Robot [Tue, 25 Jun 2019 13:09:30 +0000 (13:09 +0000)]
Merge "Catch ISE in ThemeOverlayManager." into qt-r1-dev
Remi NGUYEN VAN [Tue, 25 Jun 2019 12:44:53 +0000 (05:44 -0700)]
Fix leak of DhcpServer on tethering stop error am:
c0fd05cf73
am:
24d4bdc569
Change-Id: I17e909a7ee78fde408364e81b69b2bce942ab8f9
Remi NGUYEN VAN [Tue, 25 Jun 2019 12:32:52 +0000 (05:32 -0700)]
Fix leak of DhcpServer on tethering stop error
am:
c0fd05cf73
Change-Id: Ic17d4a8b19f68e54525e156f50b238fe2e789e65
Issei Suzuki [Tue, 25 Jun 2019 11:36:30 +0000 (04:36 -0700)]
Merge "Added subtle animation for unlocking screen." into qt-r1-dev
am:
0ca1dbcb25
Change-Id: Ib967b78959752da02dbd3035c225b167bb7e2440
Issei Suzuki [Tue, 25 Jun 2019 11:22:26 +0000 (11:22 +0000)]
Merge "Added subtle animation for unlocking screen." into qt-r1-dev
Rafal Slawik [Tue, 25 Jun 2019 10:08:44 +0000 (03:08 -0700)]
Merge "Read process allocation sizes on system ion heap" into qt-dev am:
d701e951e0
am:
0fc7939c77
Change-Id: I83664caf48e4ff20f753ae6916eb17fdb7ce1555
Rafal Slawik [Tue, 25 Jun 2019 09:44:20 +0000 (02:44 -0700)]
Merge "Read process allocation sizes on system ion heap" into qt-dev
am:
d701e951e0
Change-Id: I8f7f39ec67b1a10b3ca87c5ba71c7c85534fa0bb
Remi NGUYEN VAN [Tue, 25 Jun 2019 08:33:52 +0000 (01:33 -0700)]
Fix leak of DhcpServer on tethering stop error
Tactical, minimal fix to make sure the DhcpServer is stopped when
disabling tethering. The current code may throw if the interface is gone
when calling mNMService.setInterfaceConfig() on teardown. Make sure DHCP
is stopped regardless of what happens.
A longer term fix will be to figure out the right flow to teardown the
interface and avoid errors on setInterfaceConfig().
Bug:
124520692
Test: Manual: no more socket leaked when stopping USB tethering
Merged-In: Ie73481e8d91ce43e4939f8c31a9ce431e382c6d9
(cherry picked from commit
fe1ad3d0b86e1315906e18e33b65df2481eea63d)
Change-Id: Ia80761cb42dc62b14128fc60009be82ae9a008da
Rafal Slawik [Tue, 25 Jun 2019 08:53:54 +0000 (08:53 +0000)]
Merge "Read process allocation sizes on system ion heap" into qt-dev
Winson Chung [Tue, 25 Jun 2019 08:39:52 +0000 (01:39 -0700)]
Merge "Reduce long press timeout on edge back gesture" into qt-dev am:
4b4a138f16
am:
1caf9294d8
Change-Id: Iea072cb09353ca099bfe170afe38ca6f753d1d11
Winson Chung [Tue, 25 Jun 2019 08:27:10 +0000 (01:27 -0700)]
Merge "Reduce long press timeout on edge back gesture" into qt-dev
am:
4b4a138f16
Change-Id: I85a8c69432dc1be728e5bc0f8ca2dde586cd66aa
Bill Yi [Tue, 25 Jun 2019 08:07:53 +0000 (01:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Idffc307384b04773b54272c4849442c21273482d
TreeHugger Robot [Tue, 25 Jun 2019 07:46:27 +0000 (07:46 +0000)]
Merge "Reduce long press timeout on edge back gesture" into qt-dev
TreeHugger Robot [Tue, 25 Jun 2019 05:12:56 +0000 (05:12 +0000)]
Merge changes from topic "rely-on-bubble-not-entry" into qt-r1-bubbles-dev
* changes:
Base stuff on Bubble rather than NotifEntry; move stuff into Bubble
Getters for private methods on Bubble & move dismissed from NotifEntry to Bubble
Winson Chung [Tue, 25 Jun 2019 04:47:14 +0000 (21:47 -0700)]
Merge "Skip redrawing the bars if the surface aspect ratio matches" into qt-dev am:
3cf66a40e3
am:
33fc85960f
Change-Id: I1a1e55ea39025c089f15384a5ca245b30733940f
Winson Chung [Tue, 25 Jun 2019 04:35:44 +0000 (21:35 -0700)]
Merge "Skip redrawing the bars if the surface aspect ratio matches" into qt-dev
am:
3cf66a40e3
Change-Id: Ibe970319eba4e32f492389293ee8aac4c5f5f623
Winson Chung [Tue, 25 Jun 2019 04:10:14 +0000 (04:10 +0000)]
Merge "Skip redrawing the bars if the surface aspect ratio matches" into qt-dev
Anil Admal [Tue, 25 Jun 2019 03:05:42 +0000 (20:05 -0700)]
Merge "Request high accuracy fix for DBH requests from GNSS HAL" into qt-dev am:
e8d09721a1
am:
e76575314c
Change-Id: I57da1ef5123f935ff60b6ef416ea27beb1ca0b3b
Bill Yi [Tue, 25 Jun 2019 02:57:24 +0000 (19:57 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
d90e5e3d38 -s ours
am skip reason: subject contains skip directive
Change-Id: I3693af30e841df8fc735f375084c630acfabd3e0
Anil Admal [Tue, 25 Jun 2019 02:52:27 +0000 (19:52 -0700)]
Merge "Request high accuracy fix for DBH requests from GNSS HAL" into qt-dev
am:
e8d09721a1
Change-Id: I4f19cc4d7e89973a96702ef197a78f868c0fa780
Bill Yi [Tue, 25 Jun 2019 02:52:22 +0000 (19:52 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
a1f6fbd41c -s ours
am skip reason: subject contains skip directive
Change-Id: I2e116d764e97bae685eef2515cebb6157addab43
Anil Admal [Tue, 25 Jun 2019 02:34:37 +0000 (02:34 +0000)]
Merge "Request high accuracy fix for DBH requests from GNSS HAL" into qt-dev
TreeHugger Robot [Tue, 25 Jun 2019 02:33:17 +0000 (02:33 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
TreeHugger Robot [Tue, 25 Jun 2019 02:26:27 +0000 (02:26 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Mady Mellor [Fri, 14 Jun 2019 18:39:56 +0000 (11:39 -0700)]
Base stuff on Bubble rather than NotifEntry; move stuff into Bubble
* BubbleView & BubbleExpandedView now go off of a Bubble rather than a NotificationEntry
* moved getUpdateMessage off of NotifEntry and into Bubble (also moves tests to new BubbleTest)
* moved height & settings intent lookups out of BubbleExpandedView and into Bubble
Bug:
135214687
Test: atest BubbleControllerTest BubbleDataTest BubbleTest
Change-Id: I1c5970c3cd00fb4f0136850daea3c9699a939f94
Mady Mellor [Thu, 13 Jun 2019 22:58:30 +0000 (15:58 -0700)]
Getters for private methods on Bubble & move dismissed from NotifEntry to Bubble
Test: atest BubbleControllerTest (existing pass) BubbleDataTest
Bug:
135214687
Change-Id: I648548cb55b46e64ca237bc1ed32026058179563
Mady Mellor [Tue, 25 Jun 2019 01:58:42 +0000 (01:58 +0000)]
Merge "Remove the isForeground check for auto expand / suppress since NoMan handles it now" into qt-r1-bubbles-dev
Sooraj Sasindran [Tue, 25 Jun 2019 01:35:21 +0000 (18:35 -0700)]
Merge "Check for null executor" into qt-r1-dev
am:
2f952a8462
Change-Id: Ic32a6beda39f93452999a22f62badc6673161674
TreeHugger Robot [Tue, 25 Jun 2019 01:23:24 +0000 (01:23 +0000)]
Merge "Check for null executor" into qt-r1-dev
Mehdi Alizadeh [Tue, 25 Jun 2019 01:01:43 +0000 (18:01 -0700)]
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev am:
cdd5808bd0
am:
0ae4ceb70f
Change-Id: I986faa20cc31913f451366347bb19d9ff22e46d0
Mehdi Alizadeh [Tue, 25 Jun 2019 00:39:20 +0000 (17:39 -0700)]
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
am:
cdd5808bd0
Change-Id: Iac70534bd1115c4a96ffd71000e9a929bfc061f5
Mehdi Alizadeh [Tue, 25 Jun 2019 00:09:07 +0000 (00:09 +0000)]
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
Anil Admal [Thu, 20 Jun 2019 19:00:16 +0000 (12:00 -0700)]
Request high accuracy fix for DBH requests from GNSS HAL
The GnssLocationProvider requests a LOW_POWER fix from fused
location provider for DBH requests and uses a short request
duration of 10 secs. Change it to request a high accuracy fix
and use a larger request duration for emergency requests.
Fixes:
135458882
Test: Simulated E911 DBH request from HAL and verified that
a location is injected to HAL when location settings
are OFF/ON. Tested with and without GPS signal.
Change-Id: Ia40bff4cbf8574b30dfe65704d33c716a317c66d
Siarhei Vishniakou [Mon, 24 Jun 2019 23:31:51 +0000 (16:31 -0700)]
Merge "Keylayout for xbox pdp controller" into qt-dev am:
927d44d9eb
am:
9dec042f6a
Change-Id: I9e2a107253586c453d374a9f7764644f53845a3f
Jack Yu [Mon, 24 Jun 2019 23:30:40 +0000 (16:30 -0700)]
Merge "Reverted to the old logic for APN selection" into qt-dev am:
5d02fcb146
am:
51867b4380
Change-Id: I4665bb09718794b2a982f2c2c976a901e3204951
Siarhei Vishniakou [Mon, 24 Jun 2019 23:21:25 +0000 (16:21 -0700)]
Merge "Keylayout for xbox pdp controller" into qt-dev
am:
927d44d9eb
Change-Id: I53c9fd7d9e4b3770ff358bfb2f7806f78b969b58
TreeHugger Robot [Mon, 24 Jun 2019 23:20:05 +0000 (23:20 +0000)]
Merge "Bye unused vars" into qt-r1-bubbles-dev
Jack Yu [Mon, 24 Jun 2019 23:18:48 +0000 (16:18 -0700)]
Merge "Reverted to the old logic for APN selection" into qt-dev
am:
5d02fcb146
Change-Id: Iec56dfbbaeced79fb02973360ddf5df89b69609f
Winson Chung [Sun, 23 Jun 2019 20:35:41 +0000 (13:35 -0700)]
Skip redrawing the bars if the surface aspect ratio matches
- In this case, just scale the child window up to match the frame
Bug:
135755182
Test: atest TaskSnapshotSurfaceTest
Change-Id: I0d34d2f82aaf65459c60748b735cd01847ade411
TreeHugger Robot [Mon, 24 Jun 2019 22:41:55 +0000 (22:41 +0000)]
Merge "Keylayout for xbox pdp controller" into qt-dev
TreeHugger Robot [Mon, 24 Jun 2019 22:34:53 +0000 (22:34 +0000)]
Merge "Reverted to the old logic for APN selection" into qt-dev
Rafal Slawik [Mon, 24 Jun 2019 22:32:26 +0000 (15:32 -0700)]
Merge "Add atom for per-process system ion heap size" into qt-dev am:
956197e8e0
am:
99c185a729
Change-Id: Ie730f7133a1a5121da00c64bc612392df6c4a5b3
Rafal Slawik [Mon, 24 Jun 2019 22:28:29 +0000 (15:28 -0700)]
Merge "Add atom for per-process system ion heap size" into qt-dev
am:
956197e8e0
Change-Id: I236d656d3bcfef05590f8c1262f1fbd5905ddb6b
Sooraj Sasindran [Mon, 24 Jun 2019 22:17:21 +0000 (15:17 -0700)]
Check for null executor
Check for null executor when invalid parameters are passed
Test: build
Bug:
135927110
Change-Id: I12014f4da00d3783506642162ad7668fc7c05d9d
Rafal Slawik [Wed, 19 Jun 2019 16:59:50 +0000 (17:59 +0100)]
Read process allocation sizes on system ion heap
We are planning to use this to attribute low-memory kills to processes.
Assume that each represents an allocation. Compute values for all fields
in the ProcessSystemIonHeapSize atom.
This code is intented to run only on userdebug or eng builds and it has
to be enabled via a statsd metric from the server only for devices with
required SELinux policies.
It extends SystemIonHeapSize atom to provide per-process ion allocations
attribution.
Bug:
130526489
Test: atest MemoryStatUtilTest
Test: statsd_testdrive returns non-zero values
Change-Id: I1c1f31e2739dc493e8f4b3f47d73f5bbaadc8bdf
(cherry picked from commit
5fe706c7db35e3709375acf16212b74b4e11fe22)
Rafal Slawik [Mon, 24 Jun 2019 22:15:57 +0000 (22:15 +0000)]
Merge "Add atom for per-process system ion heap size" into qt-dev
Daniel Rosenberg [Mon, 24 Jun 2019 22:04:50 +0000 (15:04 -0700)]
Merge "Make RescueParty call vold directly" into qt-dev am:
2618371aa5
am:
db5894d5a9
Change-Id: If55def8e3ed417f92da5cf167c9a2e5fa1b24eb3
Lucas Dupin [Mon, 24 Jun 2019 22:04:05 +0000 (15:04 -0700)]
Merge "Dismiss lock screen when TrustAgent and bypass" into qt-r1-dev
am:
f4a7a80514
Change-Id: I644e3c5bbfbf191c602ae12681b637aaa406bb40
Beverly [Mon, 24 Jun 2019 22:02:53 +0000 (15:02 -0700)]
Merge "Log Preference changes when value is a String" into qt-r1-dev
am:
c7f3fec1c2
Change-Id: I92d6913eb8b8dbcc345fc7e438be58eec2c43c02
Daniel Rosenberg [Mon, 24 Jun 2019 22:00:57 +0000 (15:00 -0700)]
Merge "Make RescueParty call vold directly" into qt-dev
am:
2618371aa5
Change-Id: Id4b104e811a30722ea3c70add3750a9319245ff5
TreeHugger Robot [Mon, 24 Jun 2019 21:47:29 +0000 (21:47 +0000)]
Merge "Dismiss lock screen when TrustAgent and bypass" into qt-r1-dev
TreeHugger Robot [Mon, 24 Jun 2019 21:46:37 +0000 (21:46 +0000)]
Merge "Log Preference changes when value is a String" into qt-r1-dev
Siarhei Vishniakou [Mon, 24 Jun 2019 21:23:53 +0000 (14:23 -0700)]
Keylayout for xbox pdp controller
Add layout for Xbox pdp controller
Test: tested with a custom app
Bug:
132451971
Change-Id: I35e0998e2643eae031141186637e5eb349334bcd
TreeHugger Robot [Mon, 24 Jun 2019 21:39:40 +0000 (21:39 +0000)]
Merge "Make RescueParty call vold directly" into qt-dev
Selim Cinek [Mon, 24 Jun 2019 21:33:44 +0000 (14:33 -0700)]
Merge "Made sure to unlock the pending unlock if the user is being switched" into qt-r1-dev
am:
3eec3dcd05
Change-Id: I3db748004d1468c90743d11df7267e2de84f97c9
Robert Snoeberger [Mon, 24 Jun 2019 21:32:39 +0000 (14:32 -0700)]
Merge "Don't listen for face when in `lockout` or `lockdown`" into qt-r1-dev
am:
16f1032abd
Change-Id: I676b4c2165baeae037836a87619c3791ec093c44
Selim Cinek [Mon, 24 Jun 2019 21:21:54 +0000 (21:21 +0000)]
Merge "Made sure to unlock the pending unlock if the user is being switched" into qt-r1-dev
Bill Yi [Mon, 24 Jun 2019 21:03:33 +0000 (14:03 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Iee2561ce810f93e9e50420cb1a385eb6afdfc143
Lucas Dupin [Mon, 24 Jun 2019 20:38:00 +0000 (13:38 -0700)]
Dismiss lock screen when TrustAgent and bypass
Before we were not triggering the face auth pipeline. Now we do it
in order to have a signal that the user is actually present and we
won't unlock in a pocket (possibly causing pocket dialing.)
Test: manual
Fixes:
135217150
Change-Id: I83c90bde5d386216bc8d7002e62802e69a939a00
Beverly [Mon, 24 Jun 2019 20:00:15 +0000 (16:00 -0400)]
Log Preference changes when value is a String
As long as the String can be converted to an integer
Test: atest SharedPreferenceLoggerTest
Fixes:
135937584
Change-Id: If58077c9c7b10373c4c2459d275add25a5bcdc05
TreeHugger Robot [Mon, 24 Jun 2019 20:31:48 +0000 (20:31 +0000)]
Merge "Don't listen for face when in `lockout` or `lockdown`" into qt-r1-dev
Mehdi Alizadeh [Fri, 21 Jun 2019 01:08:56 +0000 (18:08 -0700)]
Adds metrics categories for gesture navigation dialogs
Bug:
135211145
Test: Builds
Change-Id: I0bc0749bbbb9b78d3d125e1a0f1e9bc35b645db2
Matt Casey [Mon, 24 Jun 2019 20:26:43 +0000 (13:26 -0700)]
Merge "Log an error if overview proxy service isn't available." into qt-r1-dev
am:
cac1daa26e
Change-Id: I78660389ed6db3062cab32180d199b3fddaa657e
Daniel Rosenberg [Thu, 20 Jun 2019 22:15:58 +0000 (15:15 -0700)]
Make RescueParty call vold directly
This changes RescueParty to call vold over binder directly for
Checkpointing related calls. It turns out that if the system is in a bad
enough state, the other method would not work, as some of the services
required would not be running.
Bug:
135558798
Test: setprop persist.sys.enable_rescue 1
setprop debug.crash_system 1 or setprop debug.crash_sysui 1
vdc checkpoint startCheckpoint 3
stop
start
Device should go through the rescueparty flow, and reboot.
Repeat without checkpoint. Device should prompt reboot.
Change-Id: I8b11d68075cc291e9557d524bc87b54d17b370e4
Mikhail Naganov [Mon, 24 Jun 2019 20:19:51 +0000 (13:19 -0700)]
Merge "Revert "libmedia_jni pulls in libsfplugin_ccodec"" into qt-dev am:
c56f3bbfba
am:
230af05ef0
Change-Id: I195b393e72ed3f970f2660fc107b091f0d8732d2
TreeHugger Robot [Mon, 24 Jun 2019 20:17:28 +0000 (20:17 +0000)]
Merge "Log an error if overview proxy service isn't available." into qt-r1-dev
Siarhei Vishniakou [Mon, 24 Jun 2019 20:14:46 +0000 (13:14 -0700)]
Merge "Keylayout for xbox controllers" into qt-dev am:
287b20ae0e
am:
0ebe5b44e1
Change-Id: I1d697808fc7ba7b17e1b53c4893fba25ff49e110
Ned Burns [Mon, 24 Jun 2019 20:13:57 +0000 (13:13 -0700)]
Merge "Fix excessive entrance animation duration + delay" into qt-dev am:
6072e42a45
am:
02c1d7bd1b
Change-Id: Icd6a56916969d2dcdfb0278bef92e6c48ca7c690
Ned Burns [Mon, 24 Jun 2019 20:13:15 +0000 (13:13 -0700)]
Merge "Remove WTF logging for non-expandable swiped children" into qt-dev am:
fc202d1eb1
am:
16d219b7a7
Change-Id: I5e5be1dd981085c9804a239a8b6e681e3f3897d6
Fabian Kozynski [Mon, 24 Jun 2019 20:11:38 +0000 (13:11 -0700)]
Merge "Fix case of Dark theme" into qt-dev am:
093af798e4
am:
6288f173ed
Change-Id: Ife5b704c756b5142a5d19910527531ae09326594
Mikhail Naganov [Mon, 24 Jun 2019 20:11:28 +0000 (13:11 -0700)]
Merge "Revert "libmedia_jni pulls in libsfplugin_ccodec"" into qt-dev
am:
c56f3bbfba
Change-Id: Ic3bc040b89c16abe53df4af8cf1f8c26dfcabfb5
Siarhei Vishniakou [Mon, 24 Jun 2019 20:10:45 +0000 (13:10 -0700)]
Merge "Keylayout for xbox controllers" into qt-dev
am:
287b20ae0e
Change-Id: I22cd269ff2c75f400f238b82bee32aeb5407bf14
Ned Burns [Mon, 24 Jun 2019 20:09:42 +0000 (13:09 -0700)]
Merge "Fix excessive entrance animation duration + delay" into qt-dev
am:
6072e42a45
Change-Id: I862c6ec5f101fec0d4827a0cfaab75f181db2a57
Lucas Dupin [Mon, 24 Jun 2019 20:09:11 +0000 (13:09 -0700)]
[automerger skipped] Merge "Unregister listeners and reset wake lock" into qt-dev am:
8dc0ab0aeb -s ours
am:
0e45a2db5f -s ours
am skip reason: change_id I9bc993f372a8c05258f1778eb3d415af04544714 with SHA1
2d34523527 is in history
Change-Id: Iab3c32d188265c1afdbcc0341ea10be6e693e89a
Ned Burns [Mon, 24 Jun 2019 20:08:27 +0000 (13:08 -0700)]
Merge "Remove WTF logging for non-expandable swiped children" into qt-dev
am:
fc202d1eb1
Change-Id: I30f06bca6cbafe2dc37b94a5fc9bcf150ec20224
Ivan Podogov [Mon, 24 Jun 2019 20:08:21 +0000 (13:08 -0700)]
Merge "Don't dismiss keyguard when enabling it" into qt-dev am:
785a88846a
am:
52a586e034
Change-Id: I0a8e0a7c257d5d8877afa65e7fb8f24e6918af74
Selim Cinek [Mon, 24 Jun 2019 20:07:36 +0000 (13:07 -0700)]
Merge "Not bypassing while the camera is being launched" into qt-r1-dev
am:
a19fbdf51b
Change-Id: If4c5afb2f27c886ef0ef0e9531cffd74c5013913
Fabian Kozynski [Mon, 24 Jun 2019 20:03:31 +0000 (13:03 -0700)]
Merge "Fix case of Dark theme" into qt-dev
am:
093af798e4
Change-Id: I8abccc7a1eae8a25bf23a058d98b812ea8ce40bd
Lucas Dupin [Mon, 24 Jun 2019 20:02:43 +0000 (13:02 -0700)]
[automerger skipped] Merge "Unregister listeners and reset wake lock" into qt-dev
am:
8dc0ab0aeb -s ours
am skip reason: change_id I9bc993f372a8c05258f1778eb3d415af04544714 with SHA1
2d34523527 is in history
Change-Id: Iad6510b72dbdc1f325d0a17baf846c6d89179a9b
Ivan Podogov [Mon, 24 Jun 2019 20:01:30 +0000 (13:01 -0700)]
Merge "Don't dismiss keyguard when enabling it" into qt-dev
am:
785a88846a
Change-Id: Ife6f87734f0e8c215a7b439d5dfa0fbc5247d0ce
TreeHugger Robot [Mon, 24 Jun 2019 19:55:17 +0000 (19:55 +0000)]
Merge "Not bypassing while the camera is being launched" into qt-r1-dev
Adam He [Mon, 24 Jun 2019 19:54:28 +0000 (12:54 -0700)]
Merge "Fixed event flushing to handle when mDirectServiceInterface is not ready yet." into qt-r1-dev
am:
e6930c4aa1
Change-Id: Ib1b5226d6e62e0ad55c47d8973777876265cf269