OSDN Git Service
Selim Cinek [Tue, 11 Jun 2019 22:41:28 +0000 (15:41 -0700)]
Fixes an issue where the wrong icons where ambient
This is a regression from P from when we hid the
statusbar icons of non-high-priority notifications
by default
Fixes:
134444704
Test: atest SystemUITests
Merged-In: I2e571353735efb0d763ecc236f60aefe4c2b51d4
Change-Id: I2e571353735efb0d763ecc236f60aefe4c2b51d4
Matt Pietal [Wed, 12 Jun 2019 00:12:33 +0000 (17:12 -0700)]
Merge "GlobalScreenshot - Fix race condition" into qt-dev
am:
0ebf0252e0
Change-Id: Idd450a77f83c91b50e706b17ef3fb123c000a779
Matt Pietal [Wed, 12 Jun 2019 00:04:23 +0000 (00:04 +0000)]
Merge "GlobalScreenshot - Fix race condition" into qt-dev
Selim Cinek [Tue, 11 Jun 2019 23:03:55 +0000 (16:03 -0700)]
Merge "Fixed an issue where the background was visible while pulsing" into qt-dev
am:
bd32a804ef
Change-Id: I55c010a463617f1424bef519dc80fecb2416ab0f
TreeHugger Robot [Tue, 11 Jun 2019 22:55:02 +0000 (22:55 +0000)]
Merge "Fixed an issue where the background was visible while pulsing" into qt-dev
TreeHugger Robot [Tue, 11 Jun 2019 22:06:17 +0000 (22:06 +0000)]
Merge "Interpolate low light white balance" into qt-r1-dev
Suprabh Shukla [Tue, 11 Jun 2019 21:59:12 +0000 (14:59 -0700)]
Merge "Moving some methods to PendingIntentController" into qt-dev
am:
6210ac615e
Change-Id: I56c59af5ce9acd1595568d7476888817878cf12a
TreeHugger Robot [Tue, 11 Jun 2019 21:53:06 +0000 (21:53 +0000)]
Merge "Moving some methods to PendingIntentController" into qt-dev
Adam Powell [Tue, 11 Jun 2019 20:46:21 +0000 (13:46 -0700)]
Merge "Gesture exclusion for seekbar thumbs/edit handles" into qt-dev
am:
2b2d6f58c1
Change-Id: I7485be0f36776fd3cd08aa4b3b20b7bf623c5eb1
TreeHugger Robot [Tue, 11 Jun 2019 20:25:45 +0000 (20:25 +0000)]
Merge "Gesture exclusion for seekbar thumbs/edit handles" into qt-dev
Matt Pietal [Tue, 11 Jun 2019 19:47:10 +0000 (15:47 -0400)]
GlobalScreenshot - Fix race condition
It is possible for the call to system windows to occur slightly after
the ChooserActivity gets launched, therefore preventing it from ever
showing. Wait on the future before attempting to launch the activity.
Bug:
134976976
Test: Screenshot, then share over and over
Change-Id: Iba98a079412f8e35643f3a1db04e749b3c654637
Patrick Baumann [Tue, 11 Jun 2019 19:44:38 +0000 (12:44 -0700)]
Merge "Adds note about _native namespaces" into qt-dev
am:
0c7bac8718
Change-Id: Ie1e73b02ee879eb5406fa3dd027429623002170e
Selim Cinek [Tue, 11 Jun 2019 19:43:03 +0000 (12:43 -0700)]
Fixed an issue where the background was visible while pulsing
We were using our own right instead of the current right to render
the background.
Fixes:
135042415
Test: atest SystemUITests
Change-Id: I853d1ee4d2e9f8472c9786e3ce8f68ab605d1bcd
TreeHugger Robot [Tue, 11 Jun 2019 19:24:29 +0000 (19:24 +0000)]
Merge "Adds note about _native namespaces" into qt-dev
Alexey Kuzmin [Tue, 11 Jun 2019 18:31:22 +0000 (11:31 -0700)]
Merge "Link to death of external vibrations" into qt-dev
am:
192b61833d
Change-Id: I7e2a74de50ba7de660970f7588eca8030f75dfa8
TreeHugger Robot [Tue, 11 Jun 2019 18:05:38 +0000 (18:05 +0000)]
Merge "Link to death of external vibrations" into qt-dev
TreeHugger Robot [Tue, 11 Jun 2019 17:46:50 +0000 (17:46 +0000)]
Merge "Update display color mode before white balance" into qt-r1-dev
Adrian Roos [Tue, 11 Jun 2019 17:45:09 +0000 (10:45 -0700)]
Merge "DecorView: Fix status guard" into qt-dev
am:
f5432f1862
Change-Id: I0f455bb3e860e089dfe31b6d5e8109a74580989d
Adrian Roos [Tue, 11 Jun 2019 17:34:32 +0000 (17:34 +0000)]
Merge "DecorView: Fix status guard" into qt-dev
Patrick Baumann [Tue, 11 Jun 2019 17:17:49 +0000 (10:17 -0700)]
Adds note about _native namespaces
This change is purely documentation and addresses the use of _native for
device config namespaces.
Bug:
129344328
Test: N/A
Change-Id: I4eea3252be39024c02e4e601b6892223b009c82f
Jorim Jaggi [Tue, 11 Jun 2019 17:12:18 +0000 (10:12 -0700)]
Merge "If window isn't requested to be visible, don't consider it" into qt-dev
am:
c10f3c1c1a
Change-Id: I1f0aea3e12718772358e8e7c0d88d4ba5cbbd335
Jorim Jaggi [Tue, 11 Jun 2019 17:00:55 +0000 (17:00 +0000)]
Merge "If window isn't requested to be visible, don't consider it" into qt-dev
Selim Cinek [Tue, 11 Jun 2019 16:39:33 +0000 (16:39 +0000)]
Merge "Fixed a bug where the icons where clipped off with owner info" into qt-r1-dev
Remi NGUYEN VAN [Tue, 11 Jun 2019 16:27:45 +0000 (09:27 -0700)]
Merge "Add comments to frozen AIDL API files" into qt-dev
am:
9388e83d7f
Change-Id: I7561356dd835143d42493c938b967e6f288c8f66
TreeHugger Robot [Tue, 11 Jun 2019 16:18:57 +0000 (16:18 +0000)]
Merge "Add comments to frozen AIDL API files" into qt-dev
Jorim Jaggi [Tue, 11 Jun 2019 15:31:21 +0000 (08:31 -0700)]
Merge "Prevent dismissing starting window when reopening app" into qt-dev
am:
94f7f39a01
Change-Id: I1e7d2bdde8387ffddfbcb920c3260e902600b903
Selim Cinek [Tue, 11 Jun 2019 15:26:50 +0000 (08:26 -0700)]
Merge "Fixed an issue where test had lingering inflations" into qt-dev
am:
7ac45d97cf
Change-Id: Ide7eef9b5e1f47c47737d09b3a978a1770ceb1fd
TreeHugger Robot [Tue, 11 Jun 2019 15:20:51 +0000 (15:20 +0000)]
Merge "Prevent dismissing starting window when reopening app" into qt-dev
TreeHugger Robot [Tue, 11 Jun 2019 15:10:50 +0000 (15:10 +0000)]
Merge "Fixed an issue where test had lingering inflations" into qt-dev
Adrian Roos [Wed, 29 May 2019 14:12:09 +0000 (16:12 +0200)]
DecorView: Fix status guard
Fixes several issues with the status guard:
- poor background color for light status bar background
- guard & action mode need insets for the navigation bar in landscape
- status guard was not properly dismissed after completion of the action mode
- uses the proper non-zero root inset when LAYOUT_HIDE_NAVIGATION is unset & in landscape
Bug:
132924796
Test: make ApiDemos, use SystemUiModes activity to trigger action mode
Change-Id: Ie9ba2b6fb2c87a1825df85f756ffb062a45d4f55
Adrian Roos [Tue, 11 Jun 2019 15:01:12 +0000 (08:01 -0700)]
Merge "ScreenDecor: Fix cutout overlay regression" into qt-dev
am:
7a84eb8de0
Change-Id: I36e5613b5e950fb678c76359dd3c0d8a7df1541b
Adrian Roos [Tue, 11 Jun 2019 14:52:58 +0000 (14:52 +0000)]
Merge "ScreenDecor: Fix cutout overlay regression" into qt-dev
Alexey Kuzmin [Wed, 5 Jun 2019 16:23:43 +0000 (17:23 +0100)]
Link to death of external vibrations
Bug:
133200481
Test: manual
Change-Id: I6a76b926d60a79fd450a2f7eaf9609243ac0aaf7
Jorim Jaggi [Thu, 6 Jun 2019 12:03:41 +0000 (14:03 +0200)]
If window isn't requested to be visible, don't consider it
For the -1 overlay in Launcher, we'd like to keep it invisible
to reduce global system contention, to avoid allocating a surface
when just swiping up. However, this doesn't work yet as we always
consider the window as interesting even though it requested to
be not visible.
To fix that, we only consider a window as interesting if it has
also requested to be visible. Note: This doesn't apply for the main
window.
Test: go/wm-smoke
Test: Swipe up with special home APK
Bug:
123539527
Change-Id: I19f712051b51fed0435d80442ecb7bd9b0a69f80
Selim Cinek [Tue, 11 Jun 2019 06:52:32 +0000 (23:52 -0700)]
Fixed an issue where test had lingering inflations
Because we are overriding the mainLooper and certain tests
had lingering inflations, when those inflation finished,
the main handler had been changed again.
We should really look into if this is 100% necessary in the
future but this should fix the flakey tests.
Fixes:
131413417
Test: atest SystemUITests
Change-Id: I761eace99cbedc2fa57e90016152c6d29b351dc2
PO HUNG CHEN [Tue, 11 Jun 2019 05:57:56 +0000 (22:57 -0700)]
Merge "Stub the oemlock operations when the PersistentDataBlock is not supported" into qt-dev
am:
13ee78763d
Change-Id: I292952a30e404b10b698fb46e873f35f19722944
PO HUNG CHEN [Tue, 11 Jun 2019 05:48:28 +0000 (05:48 +0000)]
Merge "Stub the oemlock operations when the PersistentDataBlock is not supported" into qt-dev
Qasid Ahmad Sadiq [Tue, 11 Jun 2019 05:27:47 +0000 (22:27 -0700)]
Merge "AccessibilityNodeIdManager should hold onto weak references of Views." into qt-dev
am:
c0d808a274
Change-Id: I7b64f0c078bccba4cd65c28ac09267b392dd8e18
TreeHugger Robot [Tue, 11 Jun 2019 05:09:12 +0000 (05:09 +0000)]
Merge "AccessibilityNodeIdManager should hold onto weak references of Views." into qt-dev
TreeHugger Robot [Tue, 11 Jun 2019 04:48:28 +0000 (04:48 +0000)]
Merge "Enable auth on AOD2" into qt-r1-dev
Selim Cinek [Tue, 11 Jun 2019 04:01:18 +0000 (21:01 -0700)]
Fixed a bug where the icons where clipped off with owner info
Because we were only fading out the owner info, but modifying
its height, the icons would be clipped off.
Fixes:
134814774
Test: atest SystemUITests
Change-Id: If708ef17a327d220f6c21a0b9df866a215adbeb8
Adam He [Tue, 11 Jun 2019 02:52:18 +0000 (19:52 -0700)]
Merge "Try augmented autofill if regular autofill is disabled." into qt-dev
am:
e33ff60894
Change-Id: I05e68a72367bb69a9dcdda6125ec31cc02e9c173
Qasid Ahmad Sadiq [Fri, 7 Jun 2019 02:53:23 +0000 (19:53 -0700)]
AccessibilityNodeIdManager should hold onto weak references of Views.
... as opposed to strong references.
In case the calls between register and unregister aren't matched, we don't want to be leaking views.
I haven't seen any real eveidence of there being leaks, just a report. But this is preventative.
Created a "WeakSparseArray", which wraps SparseArray, and passes in a kind of WeakReference that has an id.
The references become unreachable, we use the id to remove the the entry from the SparseArray.
Test: Used the device for a bit with talkback on. CTSAccessibility*
Change-Id: I8d11727428f56fc06007232ae341d1409a11991f
Fix:
134506015
TreeHugger Robot [Tue, 11 Jun 2019 02:35:38 +0000 (02:35 +0000)]
Merge "Try augmented autofill if regular autofill is disabled." into qt-dev
Lucas Dupin [Sat, 8 Jun 2019 00:17:31 +0000 (17:17 -0700)]
Enable auth on AOD2
Test: make
Fixes:
134781140
Change-Id: Ic9acec7121c3919a6f13719b6fd2db52cadf209a
TreeHugger Robot [Tue, 11 Jun 2019 01:18:27 +0000 (01:18 +0000)]
Merge "Filter "Android System" from recent location apps" into qt-r1-dev
Hongyi Zhang [Tue, 11 Jun 2019 01:03:14 +0000 (18:03 -0700)]
Merge "Fix NPE in removeGeofence" into qt-dev
am:
365e2c0dae
Change-Id: Idea7c8911a09578103e033430fbb7186b30ba777
Christopher Tate [Tue, 11 Jun 2019 00:58:53 +0000 (17:58 -0700)]
Merge "Correct sequencing of widget vs boot-complete broadcasts" into qt-dev
am:
335dfdec1e
Change-Id: I66a8173b8298773ee879a33bbbe43cc4f23d5a43
Mehdi Alizadeh [Tue, 11 Jun 2019 00:54:24 +0000 (17:54 -0700)]
Merge "Show notifications when default launcher changes" into qt-dev
am:
2407da88a7
Change-Id: I6757ccecebaf63ad011d3e168121af0f9cfcac89
Hongyi Zhang [Tue, 11 Jun 2019 00:04:24 +0000 (00:04 +0000)]
Merge "Fix NPE in removeGeofence" into qt-dev
Suprabh Shukla [Mon, 10 Jun 2019 23:25:35 +0000 (16:25 -0700)]
Moving some methods to PendingIntentController
Few code paths were still using the AMS lock which would cause races
corrupting PendingIntentRecord data.
Test: Builds. Existing pending intent tests pass:
atest CtsAppTestCases:android.app.cts.PendingIntentTest
Bug:
134707863
Change-Id: If55c0df1a24b50e72eb38f24d69a5a4aa1e8bfb3
TreeHugger Robot [Mon, 10 Jun 2019 23:35:20 +0000 (23:35 +0000)]
Merge "Correct sequencing of widget vs boot-complete broadcasts" into qt-dev
Adam He [Mon, 10 Jun 2019 23:21:31 +0000 (16:21 -0700)]
Try augmented autofill if regular autofill is disabled.
Fixes:
134914712
Test: atest android.autofillservice.cts.augmented
Change-Id: I7440bc4a9bff0b62b2625cd5bf24d3e276e4802c
Mehdi Alizadeh [Mon, 10 Jun 2019 22:39:20 +0000 (22:39 +0000)]
Merge "Show notifications when default launcher changes" into qt-dev
Christian Wailes [Mon, 10 Jun 2019 22:26:57 +0000 (15:26 -0700)]
Merge "Fixes two data races in USAP pool management." into qt-dev
am:
5e468cf4dd
Change-Id: I08c601277f24cf918000eb032e7d95f38e6c0c5c
Christian Wailes [Mon, 10 Jun 2019 22:09:43 +0000 (22:09 +0000)]
Merge "Fixes two data races in USAP pool management." into qt-dev
Lifu Tang [Fri, 7 Jun 2019 00:04:58 +0000 (17:04 -0700)]
Filter "Android System" from recent location apps
Bug:
134674484
Test: build, flash, and test manually
Change-Id: I86879e034b6605a4d3db2024f5e27601a45580fd
Quang Luong [Mon, 10 Jun 2019 21:45:39 +0000 (14:45 -0700)]
Merge "Made AccessPoint's scan result list thread safe" into qt-dev
am:
8e13ea659e
Change-Id: Iecc9af2241e6425193aefb758b4a26234d14224a
Quang Luong [Mon, 10 Jun 2019 21:37:43 +0000 (21:37 +0000)]
Merge "Made AccessPoint's scan result list thread safe" into qt-dev
Tracy Zhou [Mon, 10 Jun 2019 21:32:36 +0000 (14:32 -0700)]
Merge "Make PiP window visible when user launches PiP in landscape mode" into qt-dev
am:
94a1aafcaa
Change-Id: Ic2cbb2415f8e5bf5cde7e7ec265f00d0779d94ff
Tracy Zhou [Mon, 10 Jun 2019 21:22:19 +0000 (21:22 +0000)]
Merge "Make PiP window visible when user launches PiP in landscape mode" into qt-dev
Eugene Susla [Mon, 10 Jun 2019 20:39:25 +0000 (13:39 -0700)]
Merge "Guard against null mFunc in PooledLambdaImpl" into qt-dev
am:
e64acbea8e
Change-Id: I5591cb8fc6eefae6c82e8d1dc705f422484bd3ea
TreeHugger Robot [Mon, 10 Jun 2019 20:28:11 +0000 (20:28 +0000)]
Merge "Guard against null mFunc in PooledLambdaImpl" into qt-dev
Adam Powell [Mon, 10 Jun 2019 15:38:49 +0000 (08:38 -0700)]
Gesture exclusion for seekbar thumbs/edit handles
Track gesture exclusion rects for seekbars and EditText selection and
cursor handles.
Bug:
133845668
Bug:
129338678
Test: cts/manual
Change-Id: I029d8ba465459f8ecaa14ee8ad0f5f4139b24e65
Mehdi Alizadeh [Wed, 29 May 2019 17:40:28 +0000 (10:40 -0700)]
Show notifications when default launcher changes
Shows a notification when we have to switch away from Gesture Nav
because the new launcher doesn't support it.
Also shows another notification when previously we had to switch away
from Gesture Nav, but now the new launcher supports it.
Bug:
129532605
Test: Manual test
Change-Id: Ie954dd5dea1b45795f5c0e22ab7cc1cffde4aabe
Winson [Mon, 10 Jun 2019 20:22:40 +0000 (13:22 -0700)]
Merge "Expose PermissionManager as TestApi and fix SplitPermissionInfo equality" into qt-dev
am:
d703395fcb
Change-Id: Id965c774d70ad823de8f32d0e63b6d0ce0471754
TreeHugger Robot [Mon, 10 Jun 2019 20:12:57 +0000 (20:12 +0000)]
Merge "Expose PermissionManager as TestApi and fix SplitPermissionInfo equality" into qt-dev
Andrew Solovay [Mon, 10 Jun 2019 18:43:31 +0000 (11:43 -0700)]
Merge "docs: Fixing broken HTML" into qt-dev
am:
b230dd4fe6
Change-Id: I1bd88c7508c580b69078f62a352958106cb9ae13
Andrew Solovay [Mon, 10 Jun 2019 18:23:40 +0000 (18:23 +0000)]
Merge "docs: Fixing broken HTML" into qt-dev
Hongyi Zhang [Mon, 10 Jun 2019 05:49:25 +0000 (22:49 -0700)]
Fix NPE in removeGeofence
Check if geofence is null before reading getRadius()
Test: run cts-dev --module CtsLocationTestCases --test android.location.cts.LocationManagerTest
============================================
================= Results ==================
=============== Consumed Time ==============
arm64-v8a CtsLocationTestCases: 1m 21s
Total aggregated tests run time: 1m 21s
============== TOP 1 Slow Modules ==============
arm64-v8a CtsLocationTestCases: 0.29 tests/sec [24 tests / 81579 msec]
============== Modules Preparation Times ==============
arm64-v8a CtsLocationTestCases => prep = 4604 ms || clean = 750 ms
Total preparation time: 4s || Total tear down time: 750 ms
=======================================================
=============== Summary ===============
Total Run time: 1m 28s
1/1 modules completed
Total Tests : 24
PASSED : 24
FAILED : 0
============== End of Results ==============
============================================
Bug:
134894083
Change-Id: I71f643688855394e14974170bd2380f66cd51308
Matt Pietal [Mon, 10 Jun 2019 17:33:44 +0000 (10:33 -0700)]
Merge "Sharesheet - Hide direct share area for low ram devices" into qt-dev
am:
fcc4d76a97
Change-Id: Ia4622b13fcb9befbf34932b86c247dc3057323a5
Winson Chung [Mon, 10 Jun 2019 17:32:08 +0000 (10:32 -0700)]
Merge "Inject dependencies instead of fetching them" into qt-dev
am:
6c88570f25
Change-Id: Ic8549b021d9a5f8fa8096083f870916c3e2c93a3
TreeHugger Robot [Mon, 10 Jun 2019 17:29:52 +0000 (17:29 +0000)]
Merge "Sharesheet - Hide direct share area for low ram devices" into qt-dev
Winson Chung [Mon, 10 Jun 2019 17:14:39 +0000 (17:14 +0000)]
Merge "Inject dependencies instead of fetching them" into qt-dev
Eugene Susla [Mon, 10 Jun 2019 16:46:53 +0000 (09:46 -0700)]
Merge "Add timeout for setPermissionGrantState" into qt-dev
am:
3baa0b34e3
Change-Id: Ib1a295ed4de405ce8fc30d53a4334ef1ed2005e6
TreeHugger Robot [Mon, 10 Jun 2019 16:32:44 +0000 (16:32 +0000)]
Merge "Add timeout for setPermissionGrantState" into qt-dev
Matt Pietal [Mon, 10 Jun 2019 15:00:10 +0000 (08:00 -0700)]
Merge "Sharesheet - Adjust timeouts and logic for direct share" into qt-dev
am:
503b489384
Change-Id: Ibbbb8947eeaae6c2f883f725de8c6dec8b25792c
TreeHugger Robot [Mon, 10 Jun 2019 14:46:28 +0000 (14:46 +0000)]
Merge "Sharesheet - Adjust timeouts and logic for direct share" into qt-dev
Matt Pietal [Mon, 10 Jun 2019 14:20:15 +0000 (10:20 -0400)]
Sharesheet - Hide direct share area for low ram devices
Make sure to force the item count to 0 to make sure the direct share
area stays hidden.
Bug:
134776740
Test: Low ram device, manual
Change-Id: I598752db5747b1c845495af7ae2f591488799352
Matt Pietal [Wed, 5 Jun 2019 11:04:55 +0000 (07:04 -0400)]
Sharesheet - Adjust timeouts and logic for direct share
Improve direct share loading by:
1. Do not issue redundant service calls within the watchdog timeout
period
2. Set a min and max watchdog timeout period, and if all services
return early, then informt the user we are done to so that they don't
have to wait until the max timeout period.
3. Be more specific on package changes. Resolver requires any change
to trigger a refresh, but chooser only needs to know about top level
package changes.
Bug:
134416594
Test: Manual
Change-Id: I075fd5b6f64c25637fd7ba7aa6b163dca81371a8
Santos Cordon [Mon, 10 Jun 2019 00:12:50 +0000 (17:12 -0700)]
Merge "Ignore brightness change thresholds for manual changes." into qt-dev
am:
8a03eb7842
Change-Id: I55e6a0fc2d9b91cca33cb92aefe8f37703687c24
Santos Cordon [Sun, 9 Jun 2019 23:58:14 +0000 (23:58 +0000)]
Merge "Ignore brightness change thresholds for manual changes." into qt-dev
Winson Chung [Fri, 7 Jun 2019 17:48:45 +0000 (10:48 -0700)]
Inject dependencies instead of fetching them
Bug:
134712444
Test: atest SystemUITests
Test: atest NotificationStackScrollLayoutTest (wasn't actually able to
reproduce locally)
Change-Id: Ic1478a3eca164b844ba5721014e5591a6af02ffa
Bill Yi [Sun, 9 Jun 2019 14:43:34 +0000 (07:43 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
9edd318666 -s ours
am skip reason: subject contains skip directive
Change-Id: Iabd6baa0a3651c4d1aeb01de3fde00b68a79ef08
Bill Yi [Sun, 9 Jun 2019 08:57:05 +0000 (01:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ida0624dfdb53a688b75bd7e03a7c02e32047ded3
TreeHugger Robot [Sat, 8 Jun 2019 18:36:31 +0000 (18:36 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
TreeHugger Robot [Sat, 8 Jun 2019 17:58:59 +0000 (17:58 +0000)]
Merge "Only send text update for TextView after VIEW_ADDED is notified" into qt-r1-dev
Bill Yi [Sat, 8 Jun 2019 16:58:03 +0000 (09:58 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
4fd921518e -s ours
am skip reason: subject contains skip directive
Change-Id: Ifb2c86fd56e21fda658b4c7b1e8e7dbabd5367b4
TreeHugger Robot [Sat, 8 Jun 2019 16:39:56 +0000 (16:39 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Tej Singh [Sat, 8 Jun 2019 16:06:32 +0000 (09:06 -0700)]
Merge "Persist metric activation across beta4/5 ota" into qt-dev
am:
12ae95987b
Change-Id: I8d989540dd6807c539026e8c912c581de82b324c
Bill Yi [Sat, 8 Jun 2019 15:41:59 +0000 (08:41 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I7faa79c0c3849fd8e39396f29098d63fa71ab15f
Bill Yi [Sat, 8 Jun 2019 15:30:59 +0000 (08:30 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I415dad40c35ad89a25d4df9190742a3515764a27
TreeHugger Robot [Sat, 8 Jun 2019 14:38:06 +0000 (14:38 +0000)]
Merge "Persist metric activation across beta4/5 ota" into qt-dev
TreeHugger Robot [Sat, 8 Jun 2019 07:19:53 +0000 (07:19 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Bill Yi [Sat, 8 Jun 2019 05:31:41 +0000 (22:31 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
80bbe491e4 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia49ec232e49a7af72886cf180b4a93680148b3f7
TreeHugger Robot [Sat, 8 Jun 2019 05:16:18 +0000 (05:16 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Sat, 8 Jun 2019 03:22:41 +0000 (20:22 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ieb04646fe838dedc9967aacff8f16f6688829c02
Lucas Dupin [Sat, 8 Jun 2019 03:03:02 +0000 (20:03 -0700)]
[automerger skipped] Merge "Remove obsolete state" into qt-dev
am:
47b4c6d5df -s ours
am skip reason: change_id I17fcd9eb5eba7e7bc88de09309f5c310fe13433f with SHA1
de8c25ac2d is in history
Change-Id: Idff1817315dcaa47d3f0f407dabdc0df6bad2d2a
TreeHugger Robot [Sat, 8 Jun 2019 02:56:24 +0000 (02:56 +0000)]
Merge "Remove obsolete state" into qt-dev
Bill Yi [Sat, 8 Jun 2019 02:55:35 +0000 (19:55 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I8ce265c5d257e5cdbc247dc459a2432713f1c7b6
OSDN Git Service
