OSDN Git Service
Lucas Dupin [Thu, 14 Jun 2018 04:29:09 +0000 (21:29 -0700)]
Merge "Smoother wake-up animation" into pi-dev
am:
f910fdb1da
Change-Id: I47833b22c573b67978cb327e8a5b73756618ac0c
TreeHugger Robot [Thu, 14 Jun 2018 04:18:20 +0000 (04:18 +0000)]
Merge "Smoother wake-up animation" into pi-dev
Lucas Dupin [Tue, 12 Jun 2018 22:05:28 +0000 (15:05 -0700)]
Smoother wake-up animation
Removed overlapping interpolators and made the "screen off" animation
slower when more than 1 notifications are visible.
Fixes:
110081253
Bug:
109809484
Test: visual
Change-Id: I355ac94d4e6a880f37ce1d68c15c693b6f09f7f8
Lucas Dupin [Thu, 14 Jun 2018 01:30:24 +0000 (18:30 -0700)]
Merge "Config to enable/disable AOD via overlay" into pi-dev
am:
b784e6f7bc
Change-Id: I7e6d629b9ca6e87a48c332dab470771c4564985d
Lucas Dupin [Thu, 14 Jun 2018 01:16:44 +0000 (01:16 +0000)]
Merge "Config to enable/disable AOD via overlay" into pi-dev
Pengquan Meng [Wed, 13 Jun 2018 23:18:27 +0000 (16:18 -0700)]
[automerger skipped] Merge changes from topic "clean" am:
9f2362bb82
am:
fdad4c89fb -s ours
Change-Id: If0c0f3bfdc0793d07ded76a4d01fec0d439b939e
Benjamin Miller [Wed, 13 Jun 2018 23:12:39 +0000 (16:12 -0700)]
[automerger skipped] Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS. am:
ce3d429832 -s ours
am:
8efa35360f -s ours
Change-Id: Iee13564cbfd41b291ec4eb1020ba76d141ce244b
Lucas Dupin [Wed, 13 Jun 2018 23:07:52 +0000 (16:07 -0700)]
Merge "Avoid showing bouncer when in a launch transition" into pi-dev
am:
a102591e13
Change-Id: I0f3e3be4e7bbd931f8b2ae122276c707f20c153b
Lucas Dupin [Wed, 13 Jun 2018 19:54:29 +0000 (12:54 -0700)]
Config to enable/disable AOD via overlay
Bug:
109894567
Test: mp droid; fastboot -w
Change-Id: I3fda0bf486ae0c4b795ce34ba6823d8dc36a3796
Pengquan Meng [Wed, 13 Jun 2018 22:33:08 +0000 (15:33 -0700)]
Merge changes from topic "clean"
am:
9f2362bb82
Change-Id: I9a0554d7cacd8c02d78ad08b7d05b074720dfe2a
Benjamin Miller [Wed, 13 Jun 2018 22:26:20 +0000 (15:26 -0700)]
[automerger skipped] Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS.
am:
ce3d429832 -s ours
Change-Id: If38c9f39b28e39f26481671bfc7f293e321a26d9
Lucas Dupin [Wed, 13 Jun 2018 22:15:29 +0000 (22:15 +0000)]
Merge "Avoid showing bouncer when in a launch transition" into pi-dev
Robin Lee [Wed, 13 Jun 2018 21:40:21 +0000 (14:40 -0700)]
Merge "Do not treat EXTRA_SMALL_ICON <int> as Parcelable" into pi-dev
am:
82614bed0b
Change-Id: Iae08aea13f79273e6f47d3c32832cd4eddd51010
Robin Lee [Wed, 13 Jun 2018 20:56:11 +0000 (20:56 +0000)]
Merge "Do not treat EXTRA_SMALL_ICON <int> as Parcelable" into pi-dev
Pengquan Meng [Wed, 13 Jun 2018 20:47:13 +0000 (20:47 +0000)]
Merge changes from topic "clean"
* changes:
Remove internal ApnSetting.
Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS.
Laura Davis [Wed, 13 Jun 2018 18:30:50 +0000 (11:30 -0700)]
Merge "docs: repaired link to internal section" into pi-dev
am:
bcae0ff7a2
Change-Id: Iaf2ea420c984004c82cfd71aa3fc4dde566f42f9
Laura Davis [Wed, 13 Jun 2018 18:11:23 +0000 (18:11 +0000)]
Merge "docs: repaired link to internal section" into pi-dev
Evan Laird [Wed, 13 Jun 2018 16:09:03 +0000 (09:09 -0700)]
Merge "Use disableForUser in StatusBarManager" am:
5392d799ab
am:
3f3aa3518f
Change-Id: Ieb7bf7cc8d9fc54b56ec5f8d5caa723357c8ec6e
Evan Laird [Wed, 13 Jun 2018 15:56:41 +0000 (08:56 -0700)]
Merge "Use disableForUser in StatusBarManager"
am:
5392d799ab
Change-Id: I346f8a17d43e65c6e9ed362942345146ad6cac1d
Neil Fuller [Tue, 12 Jun 2018 19:10:22 +0000 (20:10 +0100)]
Fix a syntax error in SystemServiceRegistry
The syntax error was introduced by a bad conflict resolution
in http://ag/
4324946.
Bug:
110097023
Test: Inspection only
Merged-In: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
Change-Id: I546f2d010faa6f75033cf7e3e51ef7ed640854ed
(cherry picked from commit
10e276a24da1b5ac0b27f3172d16c59ef0eeab97)
Treehugger Robot [Wed, 13 Jun 2018 14:19:32 +0000 (14:19 +0000)]
Merge "Use disableForUser in StatusBarManager"
Jorim Jaggi [Wed, 13 Jun 2018 12:49:13 +0000 (05:49 -0700)]
Merge "Enable expanding of status bar just below the notch" into pi-dev
am:
c6c9a78b4e
Change-Id: I7043d9fe30869217750f6968d29a10108a8c497c
Jorim Jaggi [Wed, 13 Jun 2018 12:36:23 +0000 (12:36 +0000)]
Merge "Enable expanding of status bar just below the notch" into pi-dev
yuemingw [Wed, 13 Jun 2018 11:32:13 +0000 (12:32 +0100)]
Remove internal ApnSetting.
Bug:
77511388
Test: atest FrameworksTelephonyTests
Change-Id: I0da354c7d55ac49f90ca1376e8f2034e65e4e274
Merged-In: I9757ef4aae269d828c98a7363c98629c9be74846
Benjamin Miller [Thu, 7 Jun 2018 19:10:08 +0000 (19:10 +0000)]
Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS.
Doc-only change.
Also improved the class descriptions and fixed some typos.
Bug:
80238372
Test: make ds-docs with visual inspection of generated HTML
Change-Id: I460d70d692cc1a04cf0efd6b9d0b1e13a9403968
Merged-In: Id4a00c1a44dc3cbbaefc94c0438eb1a077f06e5e
Robin Lee [Mon, 11 Jun 2018 09:18:55 +0000 (11:18 +0200)]
Do not treat EXTRA_SMALL_ICON <int> as Parcelable
It isn't one, and I should have read the documentation on it properly
before treating it the same as EXTRA_LARGE_ICON (which is indeed a
Parcelable).
This fixes a chronic outpouring of technically-probably-harmless warning
stack traces of the following nature which can be verified by running
the framework tests and grepping logcat for this scary-looking string:
java.lang.ClassCastException: java.lang.Integer cannot be cast to
android.os.Parcelable
at android.os.Bundle.getParcelable(Bundle.java:***)
at android.app.Notification.fixDuplicateExtra
at android.app.Notification.fixDuplicateExtras
at android.app.Notification.readFromParcelImpl
Duplicate Integer objects are harmless compared to the Bitmap so there
is zero sense in recombining the objects after an RPC. We just drop the
line which tries to do that.
Test: make FrameworksCoreTests -j30 && \
Test: adb install -r ${ANDROID_PRODUCT_OUT}/data/app/*/FrameworksCoreTests.apk && \
Test: adb shell am instrument \
Test: -e class android.app.NotificationTest \
Test: -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I2c88ab4e9d5322c05e2e7f68df85ed5b2f296f84
Fix:
79404137
(cherry picked from commit
62eea67846e3817e090031257bae7c42a8407548)
Robert Greenwalt [Tue, 12 Jun 2018 23:07:28 +0000 (16:07 -0700)]
Merge "Use Uppercase instead of Lowercase for PLMN Decode" into pi-dev
am:
2125e5c59e
Change-Id: I850e3f98c9ce4b9221665552b50055bc31f72a04
Adrian Roos [Tue, 12 Jun 2018 23:00:30 +0000 (16:00 -0700)]
Merge "ScreenDecorations: fix cutout not showing in seascape" into pi-dev
am:
f60f4a4761
Change-Id: Ic2cc9abb3e46c610de1d6bab1dc2b99fbdb13f20
Andreas Gampe [Tue, 12 Jun 2018 22:42:11 +0000 (15:42 -0700)]
[automerger skipped] Merge "Frameworks: Remove complex boolean" am:
16eef1aad8 -s ours
am:
c997d66018 -s ours
Change-Id: Ic3087510597891dfa5c4fe09573f2de3c8391947
Robert Greenwalt [Tue, 12 Jun 2018 22:26:39 +0000 (22:26 +0000)]
Merge "Use Uppercase instead of Lowercase for PLMN Decode" into pi-dev
Mark Salyzyn [Tue, 12 Jun 2018 22:18:47 +0000 (15:18 -0700)]
Merge "persist.sys.boot.reason is cleared once read by bootstat" am:
8ec0c6ba48
am:
660c145dd1
Change-Id: I587cbdb12fc6be595c312277dcbaa2d63f883f12
TreeHugger Robot [Tue, 12 Jun 2018 22:17:21 +0000 (22:17 +0000)]
Merge "ScreenDecorations: fix cutout not showing in seascape" into pi-dev
Suprabh Shukla [Tue, 12 Jun 2018 22:01:45 +0000 (15:01 -0700)]
Merge "Allow unsuspending critical packages" into pi-dev
am:
5c4b2f6e08
Change-Id: I4507024f882040232905b7e9337964480393a35e
Lucas Dupin [Fri, 8 Jun 2018 21:11:41 +0000 (14:11 -0700)]
Avoid showing bouncer when in a launch transition
The panel will collapse but the bouncer should not become visible,
otherwise the IME might be requested.
Test: go/sysui-bouncer-tests
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
Change-Id: I0405cf1b956aa239b0684ac357a38cf4b2357cb2
Fixes:
109879604
Andreas Gampe [Tue, 12 Jun 2018 21:58:00 +0000 (14:58 -0700)]
[automerger skipped] Merge "Frameworks: Remove complex boolean"
am:
16eef1aad8 -s ours
Change-Id: I407b42d45738599955bca210b5f9896753e51224
Mike Digman [Tue, 12 Jun 2018 21:54:57 +0000 (14:54 -0700)]
Merge "Make rotate nav+qs icon consistent, understandable" into pi-dev
am:
f8dc8e378a
Change-Id: If0731ddfa7fb95e4b810ca80115b4d1c8714a875
Pengquan Meng [Tue, 12 Jun 2018 21:38:22 +0000 (21:38 +0000)]
Merge "Remove internal ApnSetting." into pi-dev-plus-aosp
Mark Salyzyn [Tue, 12 Jun 2018 21:14:03 +0000 (14:14 -0700)]
Merge "persist.sys.boot.reason is cleared once read by bootstat"
am:
8ec0c6ba48
Change-Id: Ib52e362e07a81086e142ff1f120a266862f0a073
TreeHugger Robot [Tue, 12 Jun 2018 21:06:07 +0000 (21:06 +0000)]
Merge "Allow unsuspending critical packages" into pi-dev
Mike Digman [Tue, 12 Jun 2018 20:27:00 +0000 (20:27 +0000)]
Merge "Make rotate nav+qs icon consistent, understandable" into pi-dev
Neil Fuller [Tue, 12 Jun 2018 20:11:34 +0000 (13:11 -0700)]
[automerger skipped] Fix a syntax error in SystemServiceRegistry
am:
10e276a24d -s ours
Change-Id: I79cb70aef217c3ec4bd42f0023e009506836a191
Treehugger Robot [Tue, 12 Jun 2018 19:24:19 +0000 (19:24 +0000)]
Merge "Frameworks: Remove complex boolean"
Neil Fuller [Tue, 12 Jun 2018 19:10:22 +0000 (20:10 +0100)]
Fix a syntax error in SystemServiceRegistry
The syntax error was introduced by a bad conflict resolution
in http://ag/
4324946.
Bug:
110097023
Test: Inspection only
Merged-In: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
Change-Id: I546f2d010faa6f75033cf7e3e51ef7ed640854ed
Treehugger Robot [Tue, 12 Jun 2018 19:19:57 +0000 (19:19 +0000)]
Merge "persist.sys.boot.reason is cleared once read by bootstat"
Evan Laird [Tue, 29 May 2018 21:28:58 +0000 (17:28 -0400)]
Use disableForUser in StatusBarManager
If a secondary user is added to the device and in the middle of SUW, the
SUW process can be killed via ADB. This will cause the process to get
restarted and call StatusBarManager#disable()/disable2(), which uses the
StatusBarManagerService methods that use the current uid.
The fix is to use Binder.getCallingUserHandle() in StatusBarManager so that the
SUW from another user can't affect the current user unless it is
current.
Test: start SUW from new user, cancel set up and go back to primary
user. Kill the SUW process. Nav bars remain un-hidden
Change-Id: Ie6f648827d8d384ae87f74e2d746b7566a7b9011
Fixes:
78360699
Neil Fuller [Tue, 12 Jun 2018 18:26:56 +0000 (11:26 -0700)]
Merge "Simple pass-through TimeDetectorService" am:
cb749e2e50
am:
415585f2a5
Change-Id: Id0259be3d9ad4e869c5e96cb166b8654d52c1ad7
Selim Cinek [Tue, 12 Jun 2018 18:19:08 +0000 (11:19 -0700)]
Merge "Keeping the lockdown state in sync with the notification list" into pi-dev
am:
1d207b3af5
Change-Id: I0ee8ca85bb234e86bbaba0ec7e983861b03546eb
Neil Fuller [Tue, 12 Jun 2018 18:17:51 +0000 (11:17 -0700)]
Merge "Simple pass-through TimeDetectorService"
am:
cb749e2e50
Change-Id: Ic2e3d3c3f9181ef4054f599baf4ac086ec21d8bd
Selim Cinek [Tue, 12 Jun 2018 18:04:01 +0000 (18:04 +0000)]
Merge "Keeping the lockdown state in sync with the notification list" into pi-dev
Andreas Gampe [Tue, 12 Jun 2018 17:37:04 +0000 (10:37 -0700)]
Frameworks: Remove complex boolean
To allow an Errorprone warning to become an error.
Bug:
72451126
Test: m
Change-Id: I8733f0ee74de615e4ffc979fb9de38730c2506c6
Merged-In: Ia6856157e8813856268fba003e1e591d690cb26e
Treehugger Robot [Tue, 12 Jun 2018 17:01:25 +0000 (17:01 +0000)]
Merge "Simple pass-through TimeDetectorService"
Neil Fuller [Fri, 8 Jun 2018 17:44:49 +0000 (18:44 +0100)]
Simple pass-through TimeDetectorService
This is sufficient to wire up time detection from telephony
to the new service without breaking time detection.
This cherry-pick contains a small change: to use
SystemClock.elapsedRealtime() instead of the newer
SystemClock.elapsedRealtimeClock() with Clock.millis().
Bug:
78217059
Test: atest FrameworksServicesTests:com.android.server.timedetector
Test: atest FrameworksCoreTests:android.util.TimestampedValueTest
Merged-In: Id7175878dc22e5272c31f3e478af4b0e4183b62b
Change-Id: Id7175878dc22e5272c31f3e478af4b0e4183b62b
(cherry picked from commit
24836bfb1564b1f98c322108a924965a8dbbee4f)
Chalard Jean [Tue, 12 Jun 2018 14:04:45 +0000 (07:04 -0700)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ... am:
6c0106b57f
am:
85bae863f5
Change-Id: Ica8e290909a34976e00bebbb622dd49d8f0d6b8d
Chalard Jean [Tue, 12 Jun 2018 13:57:33 +0000 (06:57 -0700)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
am:
6c0106b57f
Change-Id: I86bc83e2bd859b48017f12832e9ff0080ec162b8
yuemingw [Mon, 9 Apr 2018 15:41:54 +0000 (16:41 +0100)]
Remove internal ApnSetting.
Bug:
77511388
Test: atest FrameworksTelephonyTests
Change-Id: I9757ef4aae269d828c98a7363c98629c9be74846
Neil Fuller [Tue, 12 Jun 2018 13:36:14 +0000 (06:36 -0700)]
resolve merge conflicts of
5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb to stage-aosp-master
am:
79d42a61e4
Change-Id: I8dcebef6e996dfaec01934552aa0f3d6f8c9053a
Neil Fuller [Tue, 12 Jun 2018 13:14:13 +0000 (14:14 +0100)]
resolve merge conflicts of
5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic5527b29cbe8c84d2053be849cf09df5341e4790
Chalard Jean [Tue, 12 Jun 2018 12:23:59 +0000 (12:23 +0000)]
Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ...
* changes:
[PT06] Move setGlobalProxy into ProxyTracker
[PT05] Move sendProxyBroadcast into ProxyTracker.
[PT04] Move PacManager into ProxyTracker.
[PT03] Move some more code into ProxyTracker.
[PT02] Move static methods to ProxyTracker
[PT01] Introduce ProxyTracker
Remove a useless parameter.
Small cleanup of Network.
Cleanup of LinkProperties.
Chalard Jean [Thu, 7 Jun 2018 09:37:59 +0000 (18:37 +0900)]
[PT06] Move setGlobalProxy into ProxyTracker
Test: runtest
Change-Id: I6abd2221882db368a411b7174c66d8bd3b6b5110
Chalard Jean [Thu, 7 Jun 2018 10:30:29 +0000 (19:30 +0900)]
[PT05] Move sendProxyBroadcast into ProxyTracker.
Test: runtest
Change-Id: I2c149d29d4b75d3978021b940b6bc58f677b8d17
Chalard Jean [Thu, 7 Jun 2018 10:20:08 +0000 (19:20 +0900)]
[PT04] Move PacManager into ProxyTracker.
Test: runtest
Change-Id: I45d22857459fe1746d484ac04f8d5cd81fc61835
Chalard Jean [Thu, 7 Jun 2018 09:02:37 +0000 (18:02 +0900)]
[PT03] Move some more code into ProxyTracker.
Add finals and annotations. Remove comments that have lost their
context (they were in the context of disabling a permission check
that had been added, but constituted an API change that would not
serve any real purpose).
Test: runtest
Change-Id: I1f879b2c105d2127072b88233d72097a0d78fe14
Chalard Jean [Thu, 7 Jun 2018 08:41:29 +0000 (17:41 +0900)]
[PT02] Move static methods to ProxyTracker
No logic changes. Only changes are adding nullability annotations,
final modifiers, and adding an s in a comment.
Test: runtests
Change-Id: If4986a25bb36819de8ff459c4c0439c56d4e5a50
Chalard Jean [Thu, 7 Jun 2018 07:44:04 +0000 (16:44 +0900)]
[PT01] Introduce ProxyTracker
The goal of this is to simplify ConnectivityService by reducing
the amount of code it contains. This is small enough to be obviously
correct and followup changes will move code into this class.
Test: runtest
Change-Id: Ic5ab19b521e98ae397c9bf657856820304362fbb
Chalard Jean [Thu, 7 Jun 2018 07:11:34 +0000 (16:11 +0900)]
Remove a useless parameter.
This argument is useless because all its callers pass the same
value : false.
Test: runtest
Change-Id: Id921caa4ffadef535a5bbcfea052283a07320b28
Chalard Jean [Thu, 7 Jun 2018 04:46:52 +0000 (13:46 +0900)]
Small cleanup of Network.
Test: runtest
Change-Id: I56dbd37bb8f890938d360f45835de72be4beb91a
Chalard Jean [Thu, 7 Jun 2018 04:27:00 +0000 (13:27 +0900)]
Cleanup of LinkProperties.
Test: runtest
Change-Id: I7299de93a79901635ce755a2d933666ee43767d5
Neil Fuller [Tue, 12 Jun 2018 09:50:32 +0000 (09:50 +0000)]
Merge "Minimum viable TimeDetectorService"
Winson Chung [Tue, 12 Jun 2018 07:34:56 +0000 (00:34 -0700)]
Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev
am:
b2dac061bb
Change-Id: Ia09141c88e964ccfafe75fa6a0d0c7e19ddeadd4
Winson Chung [Tue, 12 Jun 2018 06:45:15 +0000 (06:45 +0000)]
Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev
Jean-Michel Trivi [Tue, 12 Jun 2018 05:18:53 +0000 (22:18 -0700)]
Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev
am:
8a12361b8c
Change-Id: Ia47fe3acf3d637d42d0ce3efaa6be1e0718e2acd
TreeHugger Robot [Tue, 12 Jun 2018 03:59:07 +0000 (03:59 +0000)]
Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev
Bill Yi [Tue, 12 Jun 2018 02:09:11 +0000 (19:09 -0700)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev am:
c70d882667 am:
c262f7a96a am:
ac40bb76a1
am:
f8fe538f07
Change-Id: I5b5360c99aeb67e14900d178f11faf435b7c42a3
Bill Yi [Tue, 12 Jun 2018 01:59:28 +0000 (18:59 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39 am:
b1615a6d90 -s ours am:
2c56e9b54b -s ours am:
c37cca5739 -s ours
am:
9b70877ea8 -s ours
Change-Id: Iac4584e21e939ea6f770a64d7e5c16a561741bf8
Bill Yi [Tue, 12 Jun 2018 01:52:55 +0000 (18:52 -0700)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev am:
836d1db239 am:
f527941ec8 am:
f4a3d1faf2
am:
88db3b5aae
Change-Id: Ia79761d8fb5b1bbdad7a0230dd5d1daef998ead2
Bill Yi [Tue, 12 Jun 2018 01:43:20 +0000 (18:43 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe am:
6d30123999 -s ours am:
f9efc3043a -s ours am:
9e7657c13d -s ours
am:
7609e23612 -s ours
Change-Id: I556cc2268f3feb0344b21be2f4a57cd15627047d
Suprabh Shukla [Mon, 11 Jun 2018 22:11:01 +0000 (15:11 -0700)]
Allow unsuspending critical packages
PackageManager prevents certain packages from being suspended to ensure
device is in a sane state. It should not disallow unsuspening these
packages for the same reason.
Test: Existing tests:
atest FrameworksServicesTests:SuspendPackagesTest
Manually, changed the default dialer, then
adb shell pm suspend com.android.dialer
change the default dialer to com.android.dialer, then
adb shell pm unsuspend com.android.dialer
should succeeed.
Bug:
79846500
Change-Id: Ie198f61bf3b092e497f978e60a27f9d52cdda9c7
Bill Yi [Tue, 12 Jun 2018 01:36:57 +0000 (18:36 -0700)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev am:
3bbe3c7c93 am:
24701167ba am:
689cf0f8a2
am:
995c542d0c
Change-Id: I267178d0ab2cf05abdc5d685e139f05cbcc427ca
Bill Yi [Tue, 12 Jun 2018 01:27:17 +0000 (18:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce am:
71f5cfa650 -s ours am:
f2ce740a1e -s ours am:
b10ebef583 -s ours
am:
7cea26fc9e -s ours
Change-Id: I3856a4767bab27699a68b765287e26b689a3906d
Bill Yi [Tue, 12 Jun 2018 01:21:05 +0000 (18:21 -0700)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev am:
bd9caf4c6f am:
2b605d89b9 am:
64c1873c30
am:
6dbef2a740
Change-Id: Ibb8f520e2070a880028866931319ccbb60e373af
Bill Yi [Tue, 12 Jun 2018 01:11:30 +0000 (18:11 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4 am:
dafe5854dd -s ours am:
0c61c9baf6 -s ours am:
7567755399 -s ours
am:
287d484b23 -s ours
Change-Id: Ia37e5c85013732a3a0e99a6829a58f792b123499
Selim Cinek [Tue, 12 Jun 2018 00:26:34 +0000 (17:26 -0700)]
Keeping the lockdown state in sync with the notification list
Whenever the lockdown was changed, the UI wasn't consistently
updated, but only once another notification / update came
in, which lead to notifications being invisisible or visible
when they shouldn't have been.
Change-Id: I17c1b4e0ef58d6aa05f4404e52e07a098d4fce4e
Fixes:
78020486
Test: manual, hit lockdown observe notification gone, coming back when unlocked
Brad Ebinger [Tue, 12 Jun 2018 00:32:30 +0000 (17:32 -0700)]
[automerger skipped] Merge "Update Docs to clarify using a Message across IPC" am:
0be0692691 -s ours
am:
b57dfe26cf -s ours
Change-Id: Ie3294bee1121280f07d34b4ecae451779646678f
Winson Chung [Mon, 11 Jun 2018 23:58:27 +0000 (23:58 +0000)]
Revert "Defer stop for all activities becoming invisible"
This reverts commit
b824f87c65216e4dfe5e9ab0e63795466836bc0f (for b/
80313326)
Reason for revert: Cts issues (b/
110032866)
Bug:
80313326
Bug:
110032866
Change-Id: Iaca3a8650d30b475ef4331e98b4b14377072ee4d
Mike Digman [Mon, 11 Jun 2018 18:41:33 +0000 (11:41 -0700)]
Make rotate nav+qs icon consistent, understandable
Now using the same iconography (but different angle) for nav
and qs. Note nav viewport, size and pivot (for motion) change
is intentional to match other navbar icon sizing.
Test: manual
Change-Id: I1abb33130cc724b6e63e008cf7301ebce383c8d1
Fixes:
110052596
Bill Yi [Mon, 11 Jun 2018 22:43:09 +0000 (15:43 -0700)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev am:
c70d882667 am:
c262f7a96a
am:
ac40bb76a1
Change-Id: Idecbdcc5616a974fe75d99667ec4a5e8d37d97c5
Bill Yi [Mon, 11 Jun 2018 22:35:45 +0000 (15:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39 am:
b1615a6d90 -s ours am:
2c56e9b54b -s ours
am:
c37cca5739 -s ours
Change-Id: If954d237d06c522c78198b0fadd8c6394978855a
Brad Ebinger [Mon, 11 Jun 2018 22:24:19 +0000 (15:24 -0700)]
[automerger skipped] Merge "Update Docs to clarify using a Message across IPC"
am:
0be0692691 -s ours
Change-Id: I1d3887c7d4a868a1f1b56c0d2e4f824eef29fb3a
Bill Yi [Mon, 11 Jun 2018 22:17:06 +0000 (15:17 -0700)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev am:
836d1db239 am:
f527941ec8
am:
f4a3d1faf2
Change-Id: I5bff44b8b6e7384eada300a2c904ab11c12e028f
TreeHugger Robot [Mon, 11 Jun 2018 22:10:59 +0000 (22:10 +0000)]
Merge "Remove test-* sources for Metalava api-stubs." into pi-dev-plus-aosp
Bill Yi [Mon, 11 Jun 2018 22:09:52 +0000 (15:09 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe am:
6d30123999 -s ours am:
f9efc3043a -s ours
am:
9e7657c13d -s ours
Change-Id: Ie100fd774ad3262f3edf1b5b2baaa3786200dccc
Bill Yi [Mon, 11 Jun 2018 22:04:23 +0000 (15:04 -0700)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev am:
3bbe3c7c93 am:
24701167ba
am:
689cf0f8a2
Change-Id: I211002b40f5acf9f7ad0a44e4530019df72c3b7c
Bill Yi [Mon, 11 Jun 2018 21:57:09 +0000 (14:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce am:
71f5cfa650 -s ours am:
f2ce740a1e -s ours
am:
b10ebef583 -s ours
Change-Id: Ieb35e183766df1fae623f85ccb2c3a3291b35085
Bill Yi [Mon, 11 Jun 2018 21:51:44 +0000 (14:51 -0700)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev am:
bd9caf4c6f am:
2b605d89b9
am:
64c1873c30
Change-Id: Ie4a67f372f3a7d187a7c7fe9c5d364c460535376
Bill Yi [Mon, 11 Jun 2018 21:44:34 +0000 (14:44 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4 am:
dafe5854dd -s ours am:
0c61c9baf6 -s ours
am:
7567755399 -s ours
Change-Id: If1fa2cf8485670184771de6faf7042b7c7b227eb
Bill Yi [Mon, 11 Jun 2018 21:43:19 +0000 (14:43 -0700)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev am:
c70d882667
am:
c262f7a96a
Change-Id: If96c64288656012f02de0edfd0d8cf7ff26abae4
Bill Yi [Mon, 11 Jun 2018 21:36:55 +0000 (14:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39 am:
b1615a6d90 -s ours
am:
2c56e9b54b -s ours
Change-Id: I947aee957d91c286204282e84162e9733ace9018
Bill Yi [Mon, 11 Jun 2018 21:31:45 +0000 (14:31 -0700)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev am:
836d1db239
am:
f527941ec8
Change-Id: I641ba8de65451ddfab0bd38dcdb09d98f1039fb1
Bill Yi [Mon, 11 Jun 2018 21:25:28 +0000 (14:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe am:
6d30123999 -s ours
am:
f9efc3043a -s ours
Change-Id: Ia4ef7b14406c4f0f15b9d17d107308f93282684b
Bill Yi [Mon, 11 Jun 2018 21:03:15 +0000 (14:03 -0700)]
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into oc-dev am:
5b882b9dd7 am:
9ce893db7d am:
053160d965
am:
a5f49873c1
Change-Id: Iff391bdbc66ec59c30f36fc14e9501c7fb770f30
OSDN Git Service
