OSDN Git Service
Bill Yi [Sat, 22 Jul 2017 03:18:50 +0000 (20:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie2d7d20d08bce356f69db60c9bc481e2e8ceed51
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Michael Wright [Fri, 21 Jul 2017 17:53:34 +0000 (17:53 +0000)]
Merge changes from topic 'am-
5efdd8bbd86a42118789e95a7f0799a6' into oc-mr1-dev-plus-aosp
am:
9bbf911f25
Change-Id: Ifece413bce768b100ac101be9335e44edee1e7d9
Adrian Roos [Fri, 21 Jul 2017 17:52:03 +0000 (17:52 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev am:
5f62026b4e am:
4c535d5580
am:
d1f6ab43d1
Change-Id: If9f499f411e01d7646a05213276c71257fffd172
Michael Wright [Fri, 21 Jul 2017 17:48:31 +0000 (17:48 +0000)]
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev am:
cb423e42b3 am:
d9cc31d158
am:
ec0e69cd8f
Change-Id: I44c9ffcfaa92c9b2a5f60c201fbab49e9fc569a7
Adrian Roos [Fri, 21 Jul 2017 17:47:32 +0000 (17:47 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev am:
5f62026b4e am:
67c19ff3a6
am:
8a77c6e38a
Change-Id: I3bcd7c6cb530a00927525740503763ad78a3b5fd
TreeHugger Robot [Fri, 21 Jul 2017 17:36:31 +0000 (17:36 +0000)]
Merge "resolve merge conflicts of
180f4ee7f78e to master"
TreeHugger Robot [Fri, 21 Jul 2017 15:19:59 +0000 (15:19 +0000)]
Merge "Remove a couple of unused android.webkit methods."
Android Build Merger (Role) [Fri, 21 Jul 2017 15:12:58 +0000 (15:12 +0000)]
Merge changes from topic 'am-
5efdd8bbd86a42118789e95a7f0799a6' into oc-mr1-dev-plus-aosp
* changes:
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev am:
cb423e42b3 am:
f0613cdab7
Merge "Flicker free screen-on from AOD" into oc-dr1-dev am:
5f62026b4e am:
4c535d5580
Michael Wright [Fri, 21 Jul 2017 15:10:49 +0000 (15:10 +0000)]
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev am:
cb423e42b3
am:
d9cc31d158
Change-Id: I7365dbd9e69c86f84ad88c78ad0f24c2c8f16986
Narayan Kamath [Fri, 21 Jul 2017 15:10:40 +0000 (15:10 +0000)]
Merge "Unhide DelegateLastClassLoader."
Michael Wright [Fri, 21 Jul 2017 15:10:37 +0000 (15:10 +0000)]
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev am:
cb423e42b3
am:
f0613cdab7
Change-Id: I74acd77221995f6c92c004fdec6e97e059a4591f
Adrian Roos [Fri, 21 Jul 2017 15:09:50 +0000 (15:09 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev am:
5f62026b4e
am:
67c19ff3a6
Change-Id: Idf75f2b3c9c3468e1970ba59eb117cc60c784599
Adrian Roos [Fri, 21 Jul 2017 15:09:40 +0000 (15:09 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev am:
5f62026b4e
am:
4c535d5580
Change-Id: I2c7bf05d801323121ea2f57c5ed191553b5e05bb
Michael Wright [Fri, 21 Jul 2017 15:00:18 +0000 (15:00 +0000)]
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev
am:
cb423e42b3
Change-Id: I37bedda77be7b9d832da8dd4e9efeab714ac8d66
Michael Wright [Fri, 21 Jul 2017 15:00:18 +0000 (15:00 +0000)]
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev
am:
cb423e42b3
Change-Id: Ie643ec6a1c917aa2d9364dbc431121f19a8a7e31
Adrian Roos [Fri, 21 Jul 2017 14:59:12 +0000 (14:59 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev
am:
5f62026b4e
Change-Id: I8710b4b748d415bb3c44ec8b5e14010f70468261
Adrian Roos [Fri, 21 Jul 2017 14:59:11 +0000 (14:59 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev
am:
5f62026b4e
Change-Id: I70c0f6e119344358ef460c994adc6189d396400b
TreeHugger Robot [Fri, 21 Jul 2017 14:53:44 +0000 (14:53 +0000)]
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 14:53:44 +0000 (14:53 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev
Geoffrey Pitsch [Fri, 21 Jul 2017 14:35:11 +0000 (10:35 -0400)]
resolve merge conflicts of
180f4ee7f78e to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic6a7751e75899c5faf32bb2b392fa623d6482e7b
Geoffrey Pitsch [Fri, 21 Jul 2017 14:11:40 +0000 (14:11 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-mr1-dev
am:
2d3356375a
Change-Id: I76dc18d9216213b1308c9f54dcf9adcb355c3300
TreeHugger Robot [Fri, 21 Jul 2017 14:02:59 +0000 (14:02 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-mr1-dev
Suprabh Shukla [Fri, 21 Jul 2017 09:48:44 +0000 (09:48 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev am:
928aad3e4d am:
e7e68b8991
am:
5f86e9f72c
Change-Id: I18de067739532452175f2cdfde7288b5452b5cd8
Suprabh Shukla [Fri, 21 Jul 2017 09:46:58 +0000 (09:46 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev am:
928aad3e4d am:
ab0e78c4b4
am:
023dbcd1c1
Change-Id: Ieefdd854ee044c245234a8fc62db61d3b58943d1
Suprabh Shukla [Fri, 21 Jul 2017 09:43:05 +0000 (09:43 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev am:
928aad3e4d
am:
e7e68b8991
Change-Id: Ib74abddd20d84e1841564598161fe916f9b14ca3
Suprabh Shukla [Fri, 21 Jul 2017 09:39:57 +0000 (09:39 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev am:
928aad3e4d
am:
ab0e78c4b4
Change-Id: Iaf833dd548543d7b0f8e6353080692fbb3ab7cd2
Suprabh Shukla [Fri, 21 Jul 2017 09:34:47 +0000 (09:34 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev
am:
928aad3e4d
Change-Id: I11c65cd3194427fc43fe0cea445715d1f8ce2254
Suprabh Shukla [Fri, 21 Jul 2017 09:34:47 +0000 (09:34 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev
am:
928aad3e4d
Change-Id: Id1796f42598f56a59beda381388448eefd6353cc
TreeHugger Robot [Fri, 21 Jul 2017 09:28:52 +0000 (09:28 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev
Adrian Roos [Wed, 19 Jul 2017 16:08:07 +0000 (18:08 +0200)]
Flicker free screen-on from AOD
When pulsing from AOD, we force the display OFF first. This allows
us to transition smoothly from AOD.
Also, we add a scrim transition for whenever we are waking up from
dozing. This relies on I4f3a863709a970f0fc8682c0a0c3547886e1fd0f
which forces the DOZE -> ON transition through OFF first.
Also fixes the WAKE_AND_UNLOCK transition that happens when waking
up with the fingerprint sensor.
Also fix an issue where KeyguardViewMediator's mWakeAndUnlocking
was cleared in onScreenTurnedOff; this should have been added to
the wakefulness lifecycle instead and now that the AOD -> ON transtion
dispatches the screen off callback it broke the fingerprint unlock
transition.
Fixes:
35849781
Fixes:
63887857
Fixes:
63783651
Fixes:
63727166
Test: AOD, receive notification; AOD, unlock with fingerprint; AOD, wake to lockscreen. Verify that everything is flicker-free.
Change-Id: I7d539db80a1c7e9216cf4c5c1e6d314c1893f12d
Hugo Benichi [Fri, 21 Jul 2017 08:39:00 +0000 (08:39 +0000)]
Merge "IpManagerTest: fix flaky test for real" am:
e0a743d035 am:
3d423c9c39 am:
8b8a0ef586 am:
34ad34d199
am:
eff89fc84e
Change-Id: I99d2f807e285841a768721cc034a4106e53daf78
Hugo Benichi [Fri, 21 Jul 2017 08:33:46 +0000 (08:33 +0000)]
Merge "IpManagerTest: fix flaky test for real" am:
e0a743d035 am:
3d423c9c39 am:
8b8a0ef586
am:
34ad34d199
Change-Id: Icf07be6dcb2bb87307b87af4ffed7d77413c49c7
Hugo Benichi [Fri, 21 Jul 2017 08:26:49 +0000 (08:26 +0000)]
Merge "IpManagerTest: fix flaky test for real" am:
e0a743d035 am:
3d423c9c39
am:
8b8a0ef586
Change-Id: I63414de17f71be8f8e24296ba820f5e855f2975f
Hugo Benichi [Fri, 21 Jul 2017 08:21:48 +0000 (08:21 +0000)]
Merge "IpManagerTest: fix flaky test for real" am:
e0a743d035
am:
3d423c9c39
Change-Id: If8173e2b320e252ac9dcb95d1967472d505f1121
Hugo Benichi [Fri, 21 Jul 2017 08:15:20 +0000 (08:15 +0000)]
Merge "IpManagerTest: fix flaky test for real"
am:
e0a743d035
Change-Id: If1e0024d81bb24586f2cbd691e39a2d66f827c41
TreeHugger Robot [Fri, 21 Jul 2017 08:08:31 +0000 (08:08 +0000)]
Merge "Refactor TextUtils.join() and add documentation"
Treehugger Robot [Fri, 21 Jul 2017 08:07:40 +0000 (08:07 +0000)]
Merge "IpManagerTest: fix flaky test for real"
Amith Yamasani [Fri, 21 Jul 2017 05:45:47 +0000 (05:45 +0000)]
Merge "Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am:
6b4f0bb6fe" into oc-mr1-dev am:
5f927337c0" into oc-mr1-dev-plus-aosp
am:
e8977e9c10
Change-Id: I0e17332b7fa2476044b20b3854e3b6c8e95159d9
Amith Yamasani [Fri, 21 Jul 2017 05:40:16 +0000 (05:40 +0000)]
Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am:
6b4f0bb6fe am:
30f2df2f34" into oc-mr1-dev-plus-aosp
am:
d1496ec2c0
Change-Id: Ib0fb011ab8723c9da3869987b354515e59b88d65
Etan Cohen [Fri, 21 Jul 2017 05:34:26 +0000 (05:34 +0000)]
Merge "[P2P] Public API to clean-up resources of P2P" into oc-mr1-dev am:
dde0e6ad21
am:
ee58159419
Change-Id: I47058edb24ab179ccda4e12880b4c022cd33f563
Love Khanna [Fri, 21 Jul 2017 05:25:14 +0000 (05:25 +0000)]
Merge "Merge "NFC DTA Integration" into oc-dr1-dev am:
f8469ccf17 am:
1e43a74a47" into oc-mr1-dev-plus-aosp
am:
04f7602c32
Change-Id: I0dc6bc3dea6777719beac1c3f6779dba066fec1a
Android Build Merger (Role) [Fri, 21 Jul 2017 05:23:42 +0000 (05:23 +0000)]
Merge "Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am:
6b4f0bb6fe" into oc-mr1-dev am:
5f927337c0" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 21 Jul 2017 05:23:00 +0000 (05:23 +0000)]
Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am:
6b4f0bb6fe am:
30f2df2f34" into oc-mr1-dev-plus-aosp
Amith Yamasani [Fri, 21 Jul 2017 05:22:14 +0000 (05:22 +0000)]
Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am:
6b4f0bb6fe" into oc-mr1-dev
am:
5f927337c0
Change-Id: I4007453b4f4df48f5f8a885f624822b49605293e
Amith Yamasani [Fri, 21 Jul 2017 05:21:20 +0000 (05:21 +0000)]
Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am:
6b4f0bb6fe
am:
30f2df2f34
Change-Id: Iff9161c952f9327dbe8da34d22c0dc36d6e3d831
Love Khanna [Fri, 21 Jul 2017 05:21:07 +0000 (05:21 +0000)]
Merge "NFC DTA Integration" into oc-dr1-dev am:
f8469ccf17 am:
1d3929d46a
am:
d206755f74
Change-Id: I58983c51b05931da60cca762f4a5aeff974264a1
Etan Cohen [Fri, 21 Jul 2017 05:19:58 +0000 (05:19 +0000)]
Merge "[P2P] Public API to clean-up resources of P2P" into oc-mr1-dev
am:
dde0e6ad21
Change-Id: Iaf93437093fe461d202918d187a89832b0b9ddbc
Android Build Merger (Role) [Fri, 21 Jul 2017 05:17:01 +0000 (05:17 +0000)]
Merge "Merge "NFC DTA Integration" into oc-dr1-dev am:
f8469ccf17 am:
1e43a74a47" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 21 Jul 2017 05:16:27 +0000 (05:16 +0000)]
Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am:
6b4f0bb6fe" into oc-mr1-dev
Amith Yamasani [Fri, 21 Jul 2017 05:14:51 +0000 (05:14 +0000)]
Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev
am:
6b4f0bb6fe
Change-Id: Id069c0fd99a3a1b9ebd429c7f44542a2ae068926
Love Khanna [Fri, 21 Jul 2017 05:14:37 +0000 (05:14 +0000)]
Merge "NFC DTA Integration" into oc-dr1-dev am:
f8469ccf17
am:
1d3929d46a
Change-Id: I024c1929515f514746c9e74369a259d231036b9b
Amith Yamasani [Fri, 21 Jul 2017 05:14:33 +0000 (05:14 +0000)]
Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev
am:
6b4f0bb6fe
Change-Id: I9c71705f57c65fc99da831f9ee382168f131937e
Love Khanna [Fri, 21 Jul 2017 05:14:32 +0000 (05:14 +0000)]
Merge "NFC DTA Integration" into oc-dr1-dev am:
f8469ccf17
am:
1e43a74a47
Change-Id: Ic8dee5078c3d977052c5ec4151013bc57358548f
Hugo Benichi [Fri, 21 Jul 2017 05:12:26 +0000 (14:12 +0900)]
IpManagerTest: fix flaky test for real
Commit
c10fe5f46367 tried to fix the flaky unit test for a default
ProvisioningConfiguration but failed to reinitialize the mock class
involved, so that in practice the flaky assertion is as flaky as before.
This patch correctly resets the mock after the default assertions are
done once an IpManager object is created.
Bug:
32561414
Bug:
62918393
Test: runtest frameworks-net
Change-Id: I516b6981f96e83a90cb372a727c41f0b2ea59801
TreeHugger Robot [Fri, 21 Jul 2017 05:14:15 +0000 (05:14 +0000)]
Merge "[P2P] Public API to clean-up resources of P2P" into oc-mr1-dev
Love Khanna [Fri, 21 Jul 2017 05:09:02 +0000 (05:09 +0000)]
Merge "NFC DTA Integration" into oc-dr1-dev
am:
f8469ccf17
Change-Id: I661800e26a8dc66b2a7a7676e0df11d928272f89
Love Khanna [Fri, 21 Jul 2017 05:08:25 +0000 (05:08 +0000)]
Merge "NFC DTA Integration" into oc-dr1-dev
am:
f8469ccf17
Change-Id: I8acca990e6191360fc3f4f9c668f74d7a06d6a52
TreeHugger Robot [Fri, 21 Jul 2017 05:03:15 +0000 (05:03 +0000)]
Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 05:01:38 +0000 (05:01 +0000)]
Merge "NFC DTA Integration" into oc-dr1-dev
Glen Kuhne [Fri, 21 Jul 2017 02:57:28 +0000 (02:57 +0000)]
Merge "Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am:
860f185c66 am:
ed005b2928" into oc-mr1-dev-plus-aosp
am:
7df3410dc1
Change-Id: Iebbb74ced2474117f4d7215356316d1423c0de74
Glen Kuhne [Fri, 21 Jul 2017 02:50:11 +0000 (02:50 +0000)]
Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am:
860f185c66 am:
640f04ef38
am:
d6d285ecca
Change-Id: I6c97db37a23d73fee9e8511d62702e4e0e900a13
Android Build Merger (Role) [Fri, 21 Jul 2017 02:46:39 +0000 (02:46 +0000)]
Merge "Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am:
860f185c66 am:
ed005b2928" into oc-mr1-dev-plus-aosp
Glen Kuhne [Fri, 21 Jul 2017 02:45:09 +0000 (02:45 +0000)]
Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am:
860f185c66
am:
ed005b2928
Change-Id: Ic8fa54bd2058f00c2a78b87a8bdbdcad27f37438
Glen Kuhne [Fri, 21 Jul 2017 02:44:27 +0000 (02:44 +0000)]
Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am:
860f185c66
am:
640f04ef38
Change-Id: Icea3ffdcb85dca2d00f4fb10ab1fcd84066a02bf
Glen Kuhne [Fri, 21 Jul 2017 02:37:58 +0000 (02:37 +0000)]
Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev
am:
860f185c66
Change-Id: I9069d51fa6214d9b78c04eea6ab6adebff13ca2e
Glen Kuhne [Fri, 21 Jul 2017 02:37:55 +0000 (02:37 +0000)]
Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev
am:
860f185c66
Change-Id: Ie89e7361d90accde957dc6490dc483c4d4885c0e
TreeHugger Robot [Fri, 21 Jul 2017 02:30:17 +0000 (02:30 +0000)]
Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev
Sundeep Ghuman [Fri, 21 Jul 2017 01:16:51 +0000 (01:16 +0000)]
Merge "Merge "Do not clear scores during stopTracking." into oc-dr1-dev am:
3b63aa79eb am:
06a6d6bbed" into oc-mr1-dev-plus-aosp
am:
e2f98d286f
Change-Id: Ic10695690b0c6b0284786cbd45367ec4bea98491
Sundeep Ghuman [Fri, 21 Jul 2017 01:15:14 +0000 (01:15 +0000)]
Merge "Do not clear scores during stopTracking." into oc-dr1-dev am:
3b63aa79eb am:
34df6c0af3
am:
e4e3419855
Change-Id: Ic78237f03036cb9919e23ccabbfcb9e4e4183e78
Android Build Merger (Role) [Fri, 21 Jul 2017 01:10:23 +0000 (01:10 +0000)]
Merge "Merge "Do not clear scores during stopTracking." into oc-dr1-dev am:
3b63aa79eb am:
06a6d6bbed" into oc-mr1-dev-plus-aosp
Sundeep Ghuman [Fri, 21 Jul 2017 01:08:47 +0000 (01:08 +0000)]
Merge "Do not clear scores during stopTracking." into oc-dr1-dev am:
3b63aa79eb
am:
34df6c0af3
Change-Id: I583ac138154f1fbb46c6ad536de7038b1847dda4
Sundeep Ghuman [Fri, 21 Jul 2017 01:08:45 +0000 (01:08 +0000)]
Merge "Do not clear scores during stopTracking." into oc-dr1-dev am:
3b63aa79eb
am:
06a6d6bbed
Change-Id: I2daefb02101725a180cd11811ba0aee9b94da1e3
Sundeep Ghuman [Fri, 21 Jul 2017 01:02:07 +0000 (01:02 +0000)]
Merge "Do not clear scores during stopTracking." into oc-dr1-dev
am:
3b63aa79eb
Change-Id: I9c24f764d2f94baa183b62c253799a605f22390c
Sundeep Ghuman [Fri, 21 Jul 2017 01:01:52 +0000 (01:01 +0000)]
Merge "Do not clear scores during stopTracking." into oc-dr1-dev
am:
3b63aa79eb
Change-Id: Iab18b4e433aa1de2bb4acde5db2e8b8ea5a56710
TreeHugger Robot [Fri, 21 Jul 2017 01:01:41 +0000 (01:01 +0000)]
Merge "Use the Context's locale in DateFormat"
TreeHugger Robot [Fri, 21 Jul 2017 00:56:42 +0000 (00:56 +0000)]
Merge "Do not clear scores during stopTracking." into oc-dr1-dev
Winson Chung [Fri, 21 Jul 2017 00:25:39 +0000 (00:25 +0000)]
Merge "Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am:
a363ab9d6f am:
82bc67193d" into oc-mr1-dev-plus-aosp
am:
7abb9621c2
Change-Id: I762daf66dff731b242c693721cafc45557f709c6
Winson Chung [Fri, 21 Jul 2017 00:23:19 +0000 (00:23 +0000)]
Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am:
a363ab9d6f am:
65d5b0b93d
am:
3270c21602
Change-Id: Ic3956c078ba3fafc894cead5c41f98a84f487031
Roozbeh Pournader [Thu, 20 Jul 2017 22:23:33 +0000 (15:23 -0700)]
Refactor TextUtils.join() and add documentation
Added documentation to clarify what happens in the case of null or
empty arguments.
Change-Id: I694dc0f6a6d95ab6ca7ed95b51d81938618eb75f
Fixes:
36861796
Test: bit CtsTextTestCases:*
Test: bit CtsGraphicsTestCases:android.graphics.cts.FontVariationAxisTest
Android Build Merger (Role) [Fri, 21 Jul 2017 00:18:30 +0000 (00:18 +0000)]
Merge "Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am:
a363ab9d6f am:
82bc67193d" into oc-mr1-dev-plus-aosp
Winson Chung [Fri, 21 Jul 2017 00:16:44 +0000 (00:16 +0000)]
Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am:
a363ab9d6f
am:
82bc67193d
Change-Id: I8cf195c277fb03ee8023c8b718baf294bc274230
Winson Chung [Fri, 21 Jul 2017 00:16:39 +0000 (00:16 +0000)]
Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am:
a363ab9d6f
am:
65d5b0b93d
Change-Id: I3fb14141b38e3bbbd450ce00235b574b63544645
Winson Chung [Fri, 21 Jul 2017 00:09:53 +0000 (00:09 +0000)]
Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev
am:
a363ab9d6f
Change-Id: I77df82fb8fab936b4affaf57661a227eefcb06b3
Winson Chung [Fri, 21 Jul 2017 00:09:46 +0000 (00:09 +0000)]
Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev
am:
a363ab9d6f
Change-Id: I05701052c0eeaef4453f044039f8fe7af2a63a2a
Winson Chung [Fri, 21 Jul 2017 00:03:27 +0000 (00:03 +0000)]
Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 23:37:22 +0000 (23:37 +0000)]
Merge "Support font resource in TextAppearanceSpan"
Rajeev Kumar [Thu, 20 Jul 2017 22:22:10 +0000 (22:22 +0000)]
Merge "Data plan setting in SystemUI quick settings."
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Bug:
63903843
Test: compiles.
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Amit Mahajan [Thu, 20 Jul 2017 21:41:46 +0000 (21:41 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am:
37a9991be9 am:
f4292bacf9
am:
3a6bfc61f8
Change-Id: Ib31536a7068de6350ec3093520f922731e874e4c
Amit Mahajan [Thu, 20 Jul 2017 21:37:45 +0000 (21:37 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am:
37a9991be9 am:
d57fcca823
am:
7b2fac8578
Change-Id: Ifcb583e6bb4969efa92c9f45a0aeeb8be85f3b8a
Amit Mahajan [Thu, 20 Jul 2017 21:26:38 +0000 (21:26 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am:
37a9991be9
am:
f4292bacf9
Change-Id: I0c41b74751b2605404ef35cb25e6dbbe33408435
Android Build Merger (Role) [Thu, 20 Jul 2017 21:15:33 +0000 (21:15 +0000)]
Merge "Merge "Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am:
2ed613ca80 am:
8b1a5af473" into oc-mr1-dev-plus-aosp am:
6f62fe1adc"
TreeHugger Robot [Thu, 20 Jul 2017 21:13:18 +0000 (21:13 +0000)]
Merge "Media API: fix possible NPE"
Selim Cinek [Thu, 20 Jul 2017 21:13:06 +0000 (21:13 +0000)]
Merge "Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am:
2ed613ca80 am:
8b1a5af473" into oc-mr1-dev-plus-aosp
am:
6f62fe1adc
Change-Id: Ieb36b921bff27c46f20f55cfd37fd465aee00909
Amit Mahajan [Thu, 20 Jul 2017 21:11:34 +0000 (21:11 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am:
37a9991be9
am:
d57fcca823
Change-Id: Ia636defc0757b0480a6a2b0e160bd848fec8cf99
Selim Cinek [Thu, 20 Jul 2017 21:07:56 +0000 (21:07 +0000)]
Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am:
2ed613ca80 am:
0d7ff5328e
am:
ae74e8d8da
Change-Id: Ia9842fb548e60f7406b414b9b5321c734b7e4a66
Mady Mellor [Thu, 20 Jul 2017 21:03:17 +0000 (21:03 +0000)]
Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev am:
0b8a985cd6 am:
f86be8d22d
am:
5cd07d5a4b
Change-Id: Ib20bfaa3d4941c0367af88a5c0befc980b824884
Mady Mellor [Thu, 20 Jul 2017 21:00:47 +0000 (21:00 +0000)]
Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev am:
0b8a985cd6 am:
dbb5c98423
am:
e95503d26e
Change-Id: I8368b23b3bf5df24000c2494fe7dd4e9ce9c779f
Amit Mahajan [Thu, 20 Jul 2017 20:59:52 +0000 (20:59 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am:
37a9991be9
Change-Id: I5b5499ed9528aab6718ffe325afe8f51265fd548
Amit Mahajan [Thu, 20 Jul 2017 20:58:39 +0000 (20:58 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am:
37a9991be9
Change-Id: Ib0cd3d66a4eef9d93e8f952dfd528d0cf714e8e5
OSDN Git Service
