OSDN Git Service
Wale Ogunwale [Thu, 14 Jun 2018 22:15:35 +0000 (15:15 -0700)]
Make testSplitscreenPortraitAppOrientationRequests pass to unblock release
am:
cf2d6475f9
Change-Id: Ie0862784fd537c0a669d3085b2d86a7ab482db7f
Wale Ogunwale [Thu, 14 Jun 2018 15:55:42 +0000 (08:55 -0700)]
Make testSplitscreenPortraitAppOrientationRequests pass to unblock release
Work around to unblock the release for failing test
ActivityManagerAppConfigurationTests#testSplitscreenPortraitAppOrientationRequests
which shouldn't be failing since home stack shouldn't be visible. We need
to dig deeper to see why it is failing.
NOTE: Not failing on current master...
Bug:
110159357
Test: atest ActivityManagerAppConfigurationTests#testSplitscreenPortraitAppOrientationRequests
Change-Id: I69423eef3661133b2a032a166745157b3e344751
Lucas Dupin [Thu, 14 Jun 2018 04:29:10 +0000 (21:29 -0700)]
Merge "Smoother wake-up animation" into pi-dev
am:
f910fdb1da
Change-Id: Ia0e6618b47a0daea89e4e17a1b3565ed9c7439c7
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:25 +0000 (18:30 -0700)]
Merge "Config to enable/disable AOD via overlay" into pi-dev
am:
b784e6f7bc
Change-Id: Ice4c1384b236f6d1fe2756ff44fdaec4200f4218
Lucas Dupin [Thu, 14 Jun 2018 01:16:44 +0000 (01:16 +0000)]
Merge "Config to enable/disable AOD via overlay" into pi-dev
Lucas Dupin [Wed, 13 Jun 2018 23:10:23 +0000 (16:10 -0700)]
Merge "Avoid showing bouncer when in a launch transition" into pi-dev
am:
a102591e13
Change-Id: I74f40e19035a1c27f0120d93af23e64a296fbf15
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
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:30:53 +0000 (14:30 -0700)]
Merge "Do not treat EXTRA_SMALL_ICON <int> as Parcelable" into pi-dev
am:
82614bed0b
Change-Id: If4791df1abd1354e886ddb528da87e57b556deb0
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
Laura Davis [Wed, 13 Jun 2018 20:22:10 +0000 (13:22 -0700)]
Merge "docs: repaired link to internal section" into pi-dev
am:
bcae0ff7a2
Change-Id: I1df0b824a4e0cd2e5e114ca0efa48d4bce486bf3
Jorim Jaggi [Wed, 13 Jun 2018 20:16:12 +0000 (13:16 -0700)]
Merge "Enable expanding of status bar just below the notch" into pi-dev
am:
c6c9a78b4e
Change-Id: If53c880f45dbc7277850ff7328a435814827812a
Laura Davis [Wed, 13 Jun 2018 18:11:23 +0000 (18:11 +0000)]
Merge "docs: repaired link to internal section" into pi-dev
Erik Wolsheimer [Wed, 13 Jun 2018 17:10:06 +0000 (17:10 +0000)]
Merge "RESTRICT AUTOMERGE Allow Wear Home app to send wallpaper commands at any time" into pi-wear-dev
Erik Wolsheimer [Fri, 21 Oct 2016 04:09:44 +0000 (21:09 -0700)]
RESTRICT AUTOMERGE Allow Wear Home app to send wallpaper commands at any time
Bug:
72527589
Exempt-From-Owner-Approval: Will not be merged to mainline
Change-Id: I6f030b6288433b9cefce0f2fb1a69de61bfa7617
(cherry picked from commit
5297b37c6f975894f370d464bbeae6a620266f74)
(cherry picked from commit
7edd51105dcaf3bfc730db72ee5641f8788025c3)
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
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 [Wed, 13 Jun 2018 00:26:42 +0000 (17:26 -0700)]
Merge "Use Uppercase instead of Lowercase for PLMN Decode" into pi-dev
am:
2125e5c59e
Change-Id: Ibf8b198689a1f39f7c8d8ca7818382a81dfebcee
Adrian Roos [Wed, 13 Jun 2018 00:16:26 +0000 (17:16 -0700)]
Merge "ScreenDecorations: fix cutout not showing in seascape" into pi-dev
am:
f60f4a4761
Change-Id: Ia7a9c44e152e72140e1bef8cf5586340e7853d8d
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
TreeHugger Robot [Tue, 12 Jun 2018 22:17:21 +0000 (22:17 +0000)]
Merge "ScreenDecorations: fix cutout not showing in seascape" into pi-dev
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
Suprabh Shukla [Tue, 12 Jun 2018 21:38:49 +0000 (14:38 -0700)]
Merge "Allow unsuspending critical packages" into pi-dev
am:
5c4b2f6e08
Change-Id: If318c9e01b240b795c36596167a330297c7fb5d7
Mike Digman [Tue, 12 Jun 2018 21:32:59 +0000 (14:32 -0700)]
Merge "Make rotate nav+qs icon consistent, understandable" into pi-dev
am:
f8dc8e378a
Change-Id: Ife59bc02c30446efe6764fcfd5e8813c46e1543f
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
Selim Cinek [Tue, 12 Jun 2018 18:19:05 +0000 (11:19 -0700)]
Merge "Keeping the lockdown state in sync with the notification list" into pi-dev
am:
1d207b3af5
Change-Id: Ifd324519350b2aaac9debbf7c89338af8e139a42
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
Winson Chung [Tue, 12 Jun 2018 07:12:28 +0000 (00:12 -0700)]
Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev
am:
b2dac061bb
Change-Id: Iacab2fc896a9fb7a8313926b0f6dfc5355d468a2
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:41:51 +0000 (22:41 -0700)]
Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev
am:
8a12361b8c
Change-Id: Iba3c61d775b47919a63a47982c0197d125dddf54
TreeHugger Robot [Tue, 12 Jun 2018 03:59:07 +0000 (03:59 +0000)]
Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev
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:06:23 +0000 (18:06 -0700)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev am:
c70d882667 am:
c262f7a96a am:
ac40bb76a1
am:
f8fe538f07
Change-Id: Ifdbce0f693c4c2fd011fdbb08b974c14da893d3b
Bill Yi [Tue, 12 Jun 2018 00:57:02 +0000 (17:57 -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: Ie14b8e87c42b4552fb743d9af07310d203570b97
Bill Yi [Tue, 12 Jun 2018 00:49:05 +0000 (17:49 -0700)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev am:
836d1db239 am:
f527941ec8 am:
f4a3d1faf2
am:
88db3b5aae
Change-Id: I73a28231684759b29e4d223ae03f9be8cb8f659b
Bill Yi [Tue, 12 Jun 2018 00:39:28 +0000 (17:39 -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: I595c862f3752852f76fdafc8651ba740ef01b6e9
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
Bill Yi [Tue, 12 Jun 2018 00:32:10 +0000 (17:32 -0700)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev am:
3bbe3c7c93 am:
24701167ba am:
689cf0f8a2
am:
995c542d0c
Change-Id: I83821002d9bddb74f9ec961313878c2be94558e7
Bill Yi [Tue, 12 Jun 2018 00:22:31 +0000 (17:22 -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: I1629396b23c0c087402a531095d4c5e5d128c3c0
Bill Yi [Tue, 12 Jun 2018 00:15:08 +0000 (17:15 -0700)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev am:
bd9caf4c6f am:
2b605d89b9 am:
64c1873c30
am:
6dbef2a740
Change-Id: Idcb33a3c4b655c5187c0d76d34ca1609044e1d45
Bill Yi [Tue, 12 Jun 2018 00:06:07 +0000 (17:06 -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: I1079b3a33c1d7a2634da82ad94d2a2358cf0d6dc
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
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
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:01:09 +0000 (14:01 -0700)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev am:
3bbe3c7c93
am:
24701167ba
Change-Id: I2cc8202e1abaf739a71126665599c3b262f5e7d7
Bill Yi [Mon, 11 Jun 2018 20:54:34 +0000 (13:54 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce am:
71f5cfa650 -s ours
am:
f2ce740a1e -s ours
Change-Id: Ibcaa1f68b57714de2a7295d93d1875274b750071
Bill Yi [Mon, 11 Jun 2018 20:49:02 +0000 (13:49 -0700)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev am:
bd9caf4c6f
am:
2b605d89b9
Change-Id: I1686e2207e5764167e1e75fcbf4d0be08bf4590d
Bill Yi [Mon, 11 Jun 2018 20:42:05 +0000 (13:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4 am:
dafe5854dd -s ours
am:
0c61c9baf6 -s ours
Change-Id: Ie95321f3e530034575a32399abcb3d07f552c0e9
Bill Yi [Mon, 11 Jun 2018 20:33:41 +0000 (13:33 -0700)]
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into oc-dev am:
5b882b9dd7 am:
9ce893db7d am:
053160d965
am:
a5f49873c1
Change-Id: Id693b92fca0b24c3df442dfa196fa3f54b5e30c7
Bill Yi [Mon, 11 Jun 2018 20:24:03 +0000 (13:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d am:
d82564708f -s ours am:
2e113959ff -s ours am:
5caff8b3ac -s ours
am:
b63aa6d5bb -s ours
Change-Id: I2221a29a450913ee217ce3c6e552fad33c2bf77e
Bill Yi [Mon, 11 Jun 2018 20:17:18 +0000 (13:17 -0700)]
Merge changes from topic "am-
f1c23412-1f54-4840-90d6-
b3eb7b06fc83" into oc-dev am:
59f13cbb8a am:
34d73a6f77 am:
331b188275
am:
a3a2117e5f
Change-Id: I59236b66f68d507b8e447d0bb595f099bcdd41db
Bill Yi [Mon, 11 Jun 2018 20:07:02 +0000 (13:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa skipped:
4f7095b464 am:
124cc34793 -s ours am:
b5af202209 -s ours am:
6c409c2e99 -s ours
am:
4256a29fcc -s ours
Change-Id: I1981ce718c800250fba896c4bdd864a5ec37a708
Bill Yi [Mon, 11 Jun 2018 20:05:00 +0000 (13:05 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faed2889f4 skipped:
091681e295 am:
4228af93a7 -s ours am:
fcd7cc11c7 -s ours am:
927396047c -s ours
am:
73eb5fee8d -s ours
Change-Id: I703ad0c542986320b6c5678b4be64333ae2629cb
Bill Yi [Mon, 11 Jun 2018 19:52:45 +0000 (12:52 -0700)]
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into oc-dev am:
5b882b9dd7 am:
9ce893db7d
am:
053160d965
Change-Id: I372e94fff2918832b307e6e7895636cfe0b218f3
Bill Yi [Mon, 11 Jun 2018 19:44:22 +0000 (12:44 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d am:
d82564708f -s ours am:
2e113959ff -s ours
am:
5caff8b3ac -s ours
Change-Id: I23a3341bc16e52343d398489b7e74a7903421cac
Bill Yi [Mon, 11 Jun 2018 19:34:18 +0000 (12:34 -0700)]
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into oc-dev am:
5b882b9dd7
am:
9ce893db7d
Change-Id: Ib2119bdd41d9266be01a34281f2b414a9d4d6d32
Bill Yi [Mon, 11 Jun 2018 19:27:12 +0000 (12:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d am:
d82564708f -s ours
am:
2e113959ff -s ours
Change-Id: I4e9f42dca080b08b61f706bb474c31c1ee1db4e5
Bill Yi [Mon, 11 Jun 2018 19:26:55 +0000 (12:26 -0700)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev
am:
c70d882667
Change-Id: I12e4db4d4d67cac9aa22f9c3fab1d141f29eb54b
Bill Yi [Mon, 11 Jun 2018 19:24:25 +0000 (12:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39
am:
b1615a6d90 -s ours
Change-Id: I9f949a268c9c25c19c731269b3299b4ca2d7aa28
Bill Yi [Mon, 11 Jun 2018 19:19:55 +0000 (12:19 -0700)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev
am:
836d1db239
Change-Id: I519b06f3c9f41b874d0c1f37f0494bbbd080e50e
Bill Yi [Mon, 11 Jun 2018 19:17:38 +0000 (12:17 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe
am:
6d30123999 -s ours
Change-Id: I1f2ad23fa8c9975b1be5e089a4001e5871958aee
Bill Yi [Mon, 11 Jun 2018 19:10:01 +0000 (12:10 -0700)]
Merge changes from topic "am-
f1c23412-1f54-4840-90d6-
b3eb7b06fc83" into oc-dev am:
59f13cbb8a am:
34d73a6f77
am:
331b188275
Change-Id: Ie7c5f82c79e8844493bd6dc203f294bc0d645150
Bill Yi [Mon, 11 Jun 2018 19:01:59 +0000 (12:01 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa skipped:
4f7095b464 am:
124cc34793 -s ours am:
b5af202209 -s ours
am:
6c409c2e99 -s ours
Change-Id: I1c2d8f7e5ccffd726c7111bb46e87e74616a28a4
Bill Yi [Mon, 11 Jun 2018 19:00:13 +0000 (12:00 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faed2889f4 skipped:
091681e295 am:
4228af93a7 -s ours am:
fcd7cc11c7 -s ours
am:
927396047c -s ours
Change-Id: Id8ad34a3a125dbe8fc7b19399ace436250ecc3a2
Bill Yi [Mon, 11 Jun 2018 18:56:42 +0000 (11:56 -0700)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev
am:
3bbe3c7c93
Change-Id: I15050b23d75c15ca69d1aeadddef4f8f955276ef
Bill Yi [Mon, 11 Jun 2018 18:54:34 +0000 (11:54 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce
am:
71f5cfa650 -s ours
Change-Id: Ia5633210e4fced8acfffa5cde6588b3159f1036f
Bill Yi [Mon, 11 Jun 2018 18:52:05 +0000 (11:52 -0700)]
Merge changes from topic "am-
f1c23412-1f54-4840-90d6-
b3eb7b06fc83" into oc-dev am:
59f13cbb8a
am:
34d73a6f77
Change-Id: I92656bba49935224c4b97c8c36aaddeaf7360950
Bill Yi [Mon, 11 Jun 2018 18:50:24 +0000 (11:50 -0700)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev
am:
bd9caf4c6f
Change-Id: I04decd84fba3ec690b6d77d2880b14245810b4fd
Bill Yi [Mon, 11 Jun 2018 18:48:00 +0000 (11:48 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4
am:
dafe5854dd -s ours
Change-Id: I7f9086ba7bf5a1754e8dd5e46ccf080b0659b3b0
Bill Yi [Mon, 11 Jun 2018 18:45:09 +0000 (11:45 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa skipped:
4f7095b464 am:
124cc34793 -s ours
am:
b5af202209 -s ours
Change-Id: I1a8c18e58b587716dccc478fa188931df79d68c4
Bill Yi [Mon, 11 Jun 2018 18:43:54 +0000 (11:43 -0700)]
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into oc-dev
am:
5b882b9dd7
Change-Id: Ieda6e812da1fb9f3ec55201f606dd4a843f63fd4
Bill Yi [Mon, 11 Jun 2018 18:41:53 +0000 (11:41 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d
am:
d82564708f -s ours
Change-Id: Ib7d487392cec9a11e587b50a5b91899a215599a8
Bill Yi [Mon, 11 Jun 2018 18:37:03 +0000 (11:37 -0700)]
Merge changes from topic "am-
f1c23412-1f54-4840-90d6-
b3eb7b06fc83" into oc-dev
am:
59f13cbb8a
Change-Id: I47a507e5c0142357a69e7520973e4f79d3d158a8
Bill Yi [Mon, 11 Jun 2018 18:35:00 +0000 (11:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa skipped:
4f7095b464
am:
124cc34793 -s ours
Change-Id: If5c49902987b4bd076509abf86aafe7407c2525b
Bill Yi [Mon, 11 Jun 2018 18:33:02 +0000 (11:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faed2889f4 skipped:
091681e295 am:
4228af93a7 -s ours
am:
fcd7cc11c7 -s ours
Change-Id: I795a9504ea8873999aff1aed5ffb508787a903a1
Bill Yi [Mon, 11 Jun 2018 18:21:05 +0000 (11:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faed2889f4 skipped:
091681e295
am:
4228af93a7 -s ours
Change-Id: I50958128b0b470ee8d2a3ba83660172f210069c0
TreeHugger Robot [Mon, 11 Jun 2018 18:19:38 +0000 (18:19 +0000)]
Merge changes from topic "am-
8bf63f1b-ab99-4537-ad90-
d648a4dd77b0" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58 skipped:
cc2c91ba39
[automerger skipped] Import translations. DO NOT MERGE skipped:
9f043e5e58
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:11:29 +0000 (18:11 +0000)]
Merge changes from topic "am-
8eb97afa-063a-44e2-8d8e-
6d5670eb50b6" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8 skipped:
c6a1d32ebe
[automerger skipped] Import translations. DO NOT MERGE skipped:
5e25fd88a8
Import translations. DO NOT MERGE
Damien Bargiacchi [Wed, 30 May 2018 20:28:15 +0000 (13:28 -0700)]
Start the WearPowerService with the other Wear system services
The WearPowerService is in charge of coordinating and keeping track of devices and state concerned
with power.
Bug:
77293569
Change-Id: Ia40ad44a53ef6872dd7ebefd58e17179126dde92
Damien Bargiacchi [Wed, 30 May 2018 20:19:41 +0000 (13:19 -0700)]
Add a setting for the User Absent, Touch Off feature in Wear
This is an extension of the User Absent power feature on Wear aka "for small batteries". Turning the
sensor off is one of the aspects of power saving we want to take advantage of when the user is
absent.
Bug:
77293569
Test: make -j80
Test: Device boots
Change-Id: I25a3577d8eb2d157c20ed344056138bc32e8d158
TreeHugger Robot [Mon, 11 Jun 2018 18:06:41 +0000 (18:06 +0000)]
Merge changes from topic "am-
63639373-f180-4cce-87e9-
95ef192ab9ec" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42 skipped:
3c2edd55ce
[automerger skipped] Import translations. DO NOT MERGE skipped:
0be149db42
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:05:42 +0000 (18:05 +0000)]
Merge changes from topic "am-
da3e9584-98c5-4975-8207-
a77d2301579a" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743 skipped:
5e66cc00a4
[automerger skipped] Import translations. DO NOT MERGE skipped:
05238c7743
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:03:31 +0000 (18:03 +0000)]
Merge changes from topic "am-
84e9fe64-a976-466c-a8d7-
d25febc3ff42" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d skipped:
ab4ca0c33d
[automerger skipped] Import translations. DO NOT MERGE skipped:
1122b10e7d
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 11 Jun 2018 18:03:15 +0000 (18:03 +0000)]
Merge changes from topic "am-
f1c23412-1f54-4840-90d6-
b3eb7b06fc83" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa skipped:
4f7095b464
[automerger skipped] Import translations. DO NOT MERGE skipped:
ce28dfa9fa
Import translations. DO NOT MERGE
Jorim Jaggi [Wed, 6 Jun 2018 15:22:56 +0000 (17:22 +0200)]
Enable expanding of status bar just below the notch
Test: Expand status bar with cutout emulation enabled
Bug:
79435224
Change-Id: I427f382578f4dc2abe347973323bb455cb67594d
Merged-In: I427f382578f4dc2abe347973323bb455cb67594d
Android Build Merger (Role) [Sun, 10 Jun 2018 06:30:57 +0000 (06:30 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faed2889f4 skipped:
091681e295
Change-Id: Idb34650f4e4ffa9086addb3fc25cf528c9b60aa8
OSDN Git Service
