OSDN Git Service
Julia Reynolds [Wed, 3 May 2017 17:07:34 +0000 (17:07 +0000)]
Merge "Treat apps that use channels as O apps" into oc-dev am:
b0744b820a
am:
65c95aab05
Change-Id: I7c71490236b10229b9592e57511a8f7e4679be49
Chen Xu [Wed, 3 May 2017 16:58:23 +0000 (16:58 +0000)]
Merge "support locale change for notification channels" into oc-dev am:
dd373a838d
am:
7f9b31601e
Change-Id: Iade3dd57f046908e0b4031b5f7a87dd5c1240909
Julia Reynolds [Wed, 3 May 2017 16:53:22 +0000 (16:53 +0000)]
Merge "Treat apps that use channels as O apps" into oc-dev
am:
b0744b820a
Change-Id: I2d9bc9ba84109408d765d2af34020f7d49921e2f
Julia Reynolds [Wed, 3 May 2017 16:50:27 +0000 (16:50 +0000)]
Merge "Treat apps that use channels as O apps" into oc-dev
Chen Xu [Wed, 3 May 2017 16:47:09 +0000 (16:47 +0000)]
Merge "support locale change for notification channels" into oc-dev
am:
dd373a838d
Change-Id: I7773fb08018925589a271baccf35ce3d9cb3c7b7
Chen Xu [Wed, 3 May 2017 16:42:43 +0000 (16:42 +0000)]
Merge "support locale change for notification channels" into oc-dev
Wale Ogunwale [Wed, 3 May 2017 16:33:59 +0000 (16:33 +0000)]
Merge "Only allow AM to update display orientation based on app containers" into oc-dev am:
9304756c28
am:
4f49a5c7ba
Change-Id: Ib8f96663e4a667385ad0891616789403d14720f5
Wale Ogunwale [Wed, 3 May 2017 16:26:53 +0000 (16:26 +0000)]
Merge "Only allow AM to update display orientation based on app containers" into oc-dev
am:
9304756c28
Change-Id: I81df798a1f2897837c6adbc622ffa64766030a6a
Roozbeh Pournader [Wed, 3 May 2017 16:26:50 +0000 (16:26 +0000)]
Merge "Update unit tests for forward delete" into oc-dev am:
995b4a2185
am:
465033c145
Change-Id: I3dc6b1c299d60a5e1aee4e30effa86e665af73e4
Roozbeh Pournader [Wed, 3 May 2017 16:21:52 +0000 (16:21 +0000)]
Merge "Update unit tests for forward delete" into oc-dev
am:
995b4a2185
Change-Id: Idc9e02ae6c792194db32070557ad3921aceca49d
TreeHugger Robot [Wed, 3 May 2017 16:21:36 +0000 (16:21 +0000)]
Merge "Only allow AM to update display orientation based on app containers" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 16:13:10 +0000 (16:13 +0000)]
Merge "Update unit tests for forward delete" into oc-dev
Julia Reynolds [Wed, 3 May 2017 15:56:37 +0000 (15:56 +0000)]
Merge "Sorting and intrusiveness updates" into oc-dev am:
abfa176b45
am:
ea447b0f40
Change-Id: I1007a52cc059addf0e583122866d79cdd5355646
Julia Reynolds [Wed, 3 May 2017 15:46:07 +0000 (15:46 +0000)]
Merge "Sorting and intrusiveness updates" into oc-dev
am:
abfa176b45
Change-Id: I238c7b739ed7bf359804e9488cf13c27fbb21d2c
Tomasz Wasilczyk [Wed, 3 May 2017 15:42:31 +0000 (15:42 +0000)]
Merge "Implement get/setConfiguration calls of ITuner."
TreeHugger Robot [Wed, 3 May 2017 15:39:26 +0000 (15:39 +0000)]
Merge "Sorting and intrusiveness updates" into oc-dev
Bartosz Fabianowski [Wed, 3 May 2017 15:20:45 +0000 (15:20 +0000)]
Merge "Add more explicit documentation for install reason" into oc-dev am:
c8ca16a85a
am:
68e947c1bb
Change-Id: I6b80084a3bd04c350b3d4f4930aa7885ec8db22c
Bartosz Fabianowski [Wed, 3 May 2017 15:15:20 +0000 (15:15 +0000)]
Merge "Add more explicit documentation for install reason" into oc-dev
am:
c8ca16a85a
Change-Id: I3d9d26ce66c74c307cb9f2cd06537b2bb3a22487
TreeHugger Robot [Wed, 3 May 2017 15:10:10 +0000 (15:10 +0000)]
Merge "Add more explicit documentation for install reason" into oc-dev
Julia Reynolds [Mon, 1 May 2017 13:20:30 +0000 (09:20 -0400)]
Treat apps that use channels as O apps
... even if they don't target O
- Delete misc channel
- Read settings from channel instead of notification
Test: runtest systemui-notification
Change-Id: I00814959eddd10998806dd67cc30421091ae9aab
Fixes:
37540996
Fixes:
35378789
Wale Ogunwale [Tue, 2 May 2017 21:49:04 +0000 (14:49 -0700)]
Only allow AM to update display orientation based on app containers
Activity manager choregraphs several app states when starting an
activity including when the display orientation should be updated based
on the app that is now in the foreground. It is possible for a call to
originate within WM after AM adds the starting app token, but before AM
makes the app visible and resumed. E.g. A relayout call due to a
starting window. When this happens WM can prematurely update the display
orientation with incomplete information causing the starting app to be
in an incorrect orientation initially.
To fix this problem we now only factor in app containers (stacks, task,
..) when updating the display orientation if the call to update is
coming from AM. Otherwise we only use the non-app/system containers to
determine the orientation or return the last orientation.
Change-Id: I431ce9260ee31257732311a548c62cbcdb27eae7
Fixes:
37550022
Test: Launch 2 apps that don't fix orientation and use the recent button
to switch between them while holding the device in landscape.
Johan Torås Halseth [Wed, 3 May 2017 14:07:47 +0000 (14:07 +0000)]
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev am:
3eafb6e2c6
am:
bdc3dd8d5d -s ours
Change-Id: I9895d98e8f1565b2bda044c405b83ae9d5c49e54
Johan Torås Halseth [Wed, 3 May 2017 14:02:11 +0000 (14:02 +0000)]
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev
am:
3eafb6e2c6
Change-Id: I33cac59253e106423680c70d5f79d83402109afd
TreeHugger Robot [Wed, 3 May 2017 13:55:49 +0000 (13:55 +0000)]
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev
Adrian Roos [Wed, 3 May 2017 13:55:11 +0000 (13:55 +0000)]
Merge "DozePlugin: Remove" into oc-dev am:
b2484f2258
am:
825b574892
Change-Id: I5994fbdd9cc15c1dc42fbecd63792eb2214ab017
Adrian Roos [Wed, 3 May 2017 13:49:41 +0000 (13:49 +0000)]
Merge "DozePlugin: Remove" into oc-dev
am:
b2484f2258
Change-Id: Id660a1dcfd49aeb6f46285927696a822a8e8c8f9
Julia Reynolds [Tue, 2 May 2017 19:04:34 +0000 (15:04 -0400)]
Sorting and intrusiveness updates
- The intrusiveness extractor needs to know about channels
- Allow comparisons by contact affinity even in the min bucket.
Test: cts-verifier, attention management test
Bug:
36197567
Change-Id: I1bb53d758fc2334aad5e380620fc6e39a724195c
TreeHugger Robot [Wed, 3 May 2017 13:43:14 +0000 (13:43 +0000)]
Merge "DozePlugin: Remove" into oc-dev
Jorim Jaggi [Wed, 3 May 2017 13:28:39 +0000 (13:28 +0000)]
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev am:
251894b134
am:
53f6c02354
Change-Id: I83c68cf4bad91f7baa5016aab0f66f1d5fe2700f
Geoffrey Pitsch [Wed, 3 May 2017 13:26:43 +0000 (13:26 +0000)]
Merge "Delete default channel for all apps targeting O." into oc-dev am:
b9ee2d4677
am:
29fecaf2a6
Change-Id: I2032881d163f6ba08d3d288dbdfbd8d0cb70f321
Jorim Jaggi [Wed, 3 May 2017 13:21:52 +0000 (13:21 +0000)]
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev
am:
251894b134
Change-Id: I63323963266b4194f61c8e6d6cc30a63f9af78eb
Geoffrey Pitsch [Wed, 3 May 2017 13:19:03 +0000 (13:19 +0000)]
Merge "Delete default channel for all apps targeting O." into oc-dev
am:
b9ee2d4677
Change-Id: Icef88789844286860a348fab200ec8169dabbe51
Bartosz Fabianowski [Tue, 18 Apr 2017 12:39:23 +0000 (14:39 +0200)]
Add more explicit documentation for install reason
This CL adds more explicit documentation of the install reason argument /
return value to PackageInstaller.SessionInfo.
Bug:
37324584
Test: None
Change-Id: I2450cc669b194e611c5dc07c6a0a5cd78a98c039
TreeHugger Robot [Wed, 3 May 2017 13:16:27 +0000 (13:16 +0000)]
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev
Geoffrey Pitsch [Wed, 3 May 2017 13:15:16 +0000 (13:15 +0000)]
Merge "Delete default channel for all apps targeting O." into oc-dev
Abodunrinwa Toki [Wed, 3 May 2017 12:45:04 +0000 (12:45 +0000)]
Merge "Avoid classifying text mulitple times." into oc-dev am:
d30044407e
am:
e52458d98e
Change-Id: I1a67407a7d9bcf240f1a519060192ee220e9becc
Abodunrinwa Toki [Wed, 3 May 2017 12:40:34 +0000 (12:40 +0000)]
Merge "Avoid classifying text mulitple times." into oc-dev
am:
d30044407e
Change-Id: Ie6b8c7e95e47c5e382d3f2dab505faee1c03a6e8
TreeHugger Robot [Wed, 3 May 2017 12:35:17 +0000 (12:35 +0000)]
Merge "Avoid classifying text mulitple times." into oc-dev
Johan Torås Halseth [Wed, 26 Apr 2017 20:20:32 +0000 (21:20 +0100)]
Increase timeout for ADB backup/restore of SharedStorage.
It previously used a backup timeout of 5 min, and restore timeout of 1
min, that would always timeout if the files on shared storage were big.
Now increase both to 60 minutes.
Bug:
37201952
Test: adb backup -shared && adb restore backup.ab
Merged-In: Ice6648554933baf76e96fd151b506564487c91c6
Change-Id: I99095249e960fd47fc742154bc513347bf506548
Jorim Jaggi [Tue, 2 May 2017 16:02:46 +0000 (18:02 +0200)]
Fix lock contention: Call into power manager service from handler
Make sure to not hold the wm lock when calling into power manager
service, because PWM will acquire a lock that might be contended.
Test: Make sure user activity timeout is still respected on
Keyguard
Test: Have activity with screenBrightness=1.0, make sure screen
is fully bright when opened
Bug:
37888898
Bug:
36631902
Change-Id: I4b5433dbaf8aa151465ae32232d3b3b8597715df
TreeHugger Robot [Wed, 3 May 2017 11:22:31 +0000 (11:22 +0000)]
Merge "Increase timeout for ADB backup/restore of SharedStorage."
Artem Iglikov [Wed, 3 May 2017 10:13:20 +0000 (10:13 +0000)]
Merge "Move message ids to BackupHandler."
TreeHugger Robot [Wed, 3 May 2017 10:04:25 +0000 (10:04 +0000)]
Merge "Revert "Add more explicit documentation for install reason""
Andrei Stingaceanu [Wed, 3 May 2017 09:55:25 +0000 (09:55 +0000)]
Merge "Move text coretests to JUnit (1)" into oc-dev am:
e0857a5800
am:
9b6f0e6e1b
Change-Id: Ic349bde8c693210077a8ec1ad8e3f5d90f0855aa
Andrei Stingaceanu [Wed, 3 May 2017 09:53:28 +0000 (09:53 +0000)]
Merge "Move text coretests to JUnit (2)" into oc-dev am:
2b0d0671b8
am:
411b7d9b5e
Change-Id: Ia5d517564c925debf882db0a3f976790a22a2f0f
Andrei Stingaceanu [Wed, 3 May 2017 09:48:11 +0000 (09:48 +0000)]
Merge "Move text coretests to JUnit (1)" into oc-dev
am:
e0857a5800
Change-Id: I295b78a4397bb6409eef1963362b766c0ea78640
Andrei Stingaceanu [Wed, 3 May 2017 09:45:52 +0000 (09:45 +0000)]
Merge "Move text coretests to JUnit (2)" into oc-dev
am:
2b0d0671b8
Change-Id: I8f5457aacd79bdaf7be72f7cdc082d0c915f61c6
Johan Torås Halseth [Wed, 3 May 2017 09:43:06 +0000 (10:43 +0100)]
Increase timeout for ADB backup/restore of SharedStorage.
This is a manual merge of ag/
2161962 into master.
Test: it compiles.
Change-Id: Ice6648554933baf76e96fd151b506564487c91c6
TreeHugger Robot [Wed, 3 May 2017 09:42:01 +0000 (09:42 +0000)]
Merge "Move text coretests to JUnit (1)" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 09:41:30 +0000 (09:41 +0000)]
Merge "Move text coretests to JUnit (2)" into oc-dev
Nicolas Geoffray [Wed, 3 May 2017 08:20:12 +0000 (08:20 +0000)]
Merge "Update frameworks/base to new compiler filters." into oc-dev am:
e4f36952ab
am:
2c6741b660
Change-Id: I7a0f751d0ab2934435bfd0ed335308250b21f872
Bartosz Fabianowski [Wed, 3 May 2017 08:15:15 +0000 (08:15 +0000)]
Revert "Add more explicit documentation for install reason"
This reverts commit
839e8535898314f9cbca6f811a98f2d40ac61e2e.
We have a better solution in ag/
2135964.
Change-Id: Icfed2d883149c9e648b69ae88b64f76daf4030f3
Nicolas Geoffray [Wed, 3 May 2017 08:10:55 +0000 (08:10 +0000)]
Merge "Update frameworks/base to new compiler filters." into oc-dev
am:
e4f36952ab
Change-Id: I37102edeba93a4b18c943c16946b609f04c1f0eb
Nicolas Geoffray [Wed, 3 May 2017 08:04:28 +0000 (08:04 +0000)]
Merge "Update frameworks/base to new compiler filters." into oc-dev
Vladislav Kaznacheev [Wed, 3 May 2017 07:45:51 +0000 (07:45 +0000)]
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev am:
33f2b3b3b1
am:
f2b4b8306e
Change-Id: I8f76715c22c456b2b0aa1dcff88953487ee7399d
Vladislav Kaznacheev [Wed, 3 May 2017 07:38:47 +0000 (07:38 +0000)]
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev
am:
33f2b3b3b1
Change-Id: I212a872da24ea6e64a90e3339cfc9e68f2eaa933
TreeHugger Robot [Wed, 3 May 2017 07:31:44 +0000 (07:31 +0000)]
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev
Sundeep Ghuman [Wed, 3 May 2017 04:37:12 +0000 (04:37 +0000)]
Merge "Updating network info state should return true." into oc-dev am:
703a233b03
am:
3b2ac89b9a
Change-Id: Ie80882f6d119a334065af7728ddda3867b21d4cf
Sundeep Ghuman [Wed, 3 May 2017 04:30:05 +0000 (04:30 +0000)]
Merge "Updating network info state should return true." into oc-dev
am:
703a233b03
Change-Id: Ib8a36b3880b65ea333a93dc4bd3ab5bca66272e7
Sundeep Ghuman [Wed, 3 May 2017 04:24:38 +0000 (04:24 +0000)]
Merge "Updating network info state should return true." into oc-dev
Ruben Brunk [Wed, 3 May 2017 04:01:11 +0000 (04:01 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev am:
24f4743f92
am:
44e317e278
Change-Id: I2a66a50580a3e7c535c0eceec6f1d8fc1cf9b32e
Ruben Brunk [Wed, 3 May 2017 03:56:01 +0000 (03:56 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev
am:
24f4743f92
Change-Id: I23f5fdf5b3584861818bc378b85f98fc2e33ebb8
TreeHugger Robot [Wed, 3 May 2017 03:48:19 +0000 (03:48 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev
Ben Lin [Wed, 3 May 2017 02:37:27 +0000 (02:37 +0000)]
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev am:
d6bfaba59c
am:
bb87997182
Change-Id: I82a9b7c4542e4a2f157a608be3a991c158707f12
Ben Lin [Wed, 3 May 2017 02:30:29 +0000 (02:30 +0000)]
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev
am:
d6bfaba59c
Change-Id: I807eaa3090e655fdc959a10fe2652c2f4d932b01
Daichi Hirono [Wed, 3 May 2017 02:27:56 +0000 (02:27 +0000)]
Merge "Don't add other's child as header or footer" into oc-dev am:
9e37a2e419
am:
9227334834
Change-Id: I07df9ddb7136e7018b0be1d2dfaa1c7f589e0df2
Ben Lin [Wed, 3 May 2017 02:25:03 +0000 (02:25 +0000)]
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev
Android Build Merger (Role) [Wed, 3 May 2017 02:23:49 +0000 (02:23 +0000)]
Merge "Merge "Optionally let the instant app into disambig" into oc-dev am:
1f1d60c5a1 am:
74e39de950"
Todd Kennedy [Wed, 3 May 2017 02:23:03 +0000 (02:23 +0000)]
Merge "Optionally let the instant app into disambig" into oc-dev am:
1f1d60c5a1
am:
74e39de950
Change-Id: I4e48ba4c05d764322ad2e953430b8b02c7c09712
TreeHugger Robot [Wed, 3 May 2017 02:22:52 +0000 (02:22 +0000)]
Merge "Fade clock when pulling QS down"
TreeHugger Robot [Wed, 3 May 2017 02:22:52 +0000 (02:22 +0000)]
Merge "Quick Settings surface opacity"
Daichi Hirono [Wed, 3 May 2017 02:18:52 +0000 (02:18 +0000)]
Merge "Don't add other's child as header or footer" into oc-dev
am:
9e37a2e419
Change-Id: I7377848132c5334f0becc640ea82255ff41dee7c
Todd Kennedy [Wed, 3 May 2017 02:12:28 +0000 (02:12 +0000)]
Merge "Optionally let the instant app into disambig" into oc-dev
am:
1f1d60c5a1
Change-Id: I78725fadab5bb7222f9d4528d21b22d881df45a1
TreeHugger Robot [Wed, 3 May 2017 02:12:03 +0000 (02:12 +0000)]
Merge "Don't add other's child as header or footer" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 02:06:29 +0000 (02:06 +0000)]
Merge "Optionally let the instant app into disambig" into oc-dev
Dianne Hackborn [Wed, 3 May 2017 02:03:12 +0000 (02:03 +0000)]
Merge "More work on issue #
36891897: Need to ensure foreground..." into oc-dev am:
6ff7df502b
am:
6a6f5c657f
Change-Id: I51546db03c92db0b3c1751eb8e395cace528b2fe
Dianne Hackborn [Wed, 3 May 2017 01:54:08 +0000 (01:54 +0000)]
Merge "More work on issue #
36891897: Need to ensure foreground..." into oc-dev
am:
6ff7df502b
Change-Id: Ic7de70297ab0eae610aeb5c359da381264779d6b
Dianne Hackborn [Wed, 3 May 2017 01:46:25 +0000 (01:46 +0000)]
Merge "More work on issue #
36891897: Need to ensure foreground..." into oc-dev
Roozbeh Pournader [Wed, 3 May 2017 01:33:12 +0000 (18:33 -0700)]
Update unit tests for forward delete
Changes in the definition of grapheme boundaries for emoji (which
now relies more on what actually ligates in a font) need updating the
unit tests. The changes in the unit tests are cases where the old
code in Minikin assumed a single grapheme, but the new code looks in
the font and finds that there are two grapheme clusters indeed.
Change-Id: Icd3d2563776fb295f48e70b67a8af8e6bd3f4b38
Fixes:
37769578
Test: updated tests pass
fionaxu [Tue, 2 May 2017 22:56:58 +0000 (15:56 -0700)]
support locale change for notification channels
Bug:
37911731
Test: Manual test with different languages
Change-Id: I36ce985dfc8fdb0f6c2b8b20c411b63099942f44
Sundeep Ghuman [Fri, 21 Apr 2017 04:25:41 +0000 (21:25 -0700)]
Updating network info state should return true.
Update AccessPoint.java so that network state changes return updated
equals true, so that corresponding UI elements will updated
appropriately.
Bug: b/
37289220
Test: runtest --path
packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I1bc74997227b46468ef11efbf183a95ec0d2b15f
Andrii Kulian [Wed, 3 May 2017 00:24:44 +0000 (00:24 +0000)]
Merge "Update ime touch exclude region for hosting display" into oc-dev am:
40d0f86783
am:
9f2ab1c037
Change-Id: Ide89e5b1fc51f747d8a8c420ba0b26353b9be33a
Michael Wright [Wed, 3 May 2017 00:16:45 +0000 (00:16 +0000)]
Merge changes from topic 'frankenbuild' into oc-dev am:
adb87ec50b
am:
8efaefb5d9
Change-Id: I7a5a438aa64777a50e1f181fa5f5f0570a02170b
Andrii Kulian [Wed, 3 May 2017 00:14:14 +0000 (00:14 +0000)]
Merge "Update ime touch exclude region for hosting display" into oc-dev
am:
40d0f86783
Change-Id: I20f2cbc97202417d57cd36aa37ebd85e4ec27bd6
Ruben Brunk [Mon, 1 May 2017 23:57:31 +0000 (16:57 -0700)]
Fix Bluetooth GATT API default handler assignment
Restores previous behaviour where GATT callbacks are invoked on the
binder thread and not the calling process main looper thread.
This fixes performance regressions as well as some
NetworkOnMainThreadException's for some applications.
Bug:
37544152
Bug:
37871717
Test: Covered by prior API tests.
Change-Id: Id8ab705dd4d7f00030e6ac29e056dde5180670e9
Michael Wright [Wed, 3 May 2017 00:08:11 +0000 (00:08 +0000)]
Merge changes from topic 'frankenbuild' into oc-dev
am:
adb87ec50b
Change-Id: I5ede652c22717b2a986b6fd7608a97e6a3531fa0
Makoto Onuki [Wed, 3 May 2017 00:06:30 +0000 (00:06 +0000)]
Merge "Add more information to WTF to investigate bug
37809561" into oc-dev am:
e497b698d2
am:
bab47edecb
Change-Id: Ie781c121fbf3b71e3189cf1a84257116afd963a8
Todd Kennedy [Wed, 26 Apr 2017 19:58:28 +0000 (12:58 -0700)]
Optionally let the instant app into disambig
When a user clicks "view on web", it's not assumed this is meant to be
forever. In this case, we will adjust the instant app's verification
status so that the instant isn't automatically run.
Change-Id: I246de901dafb23159a064d205fdb614d657a99dc
Fixes:
37686922
Test: Manual
Test: 1) Install instant app
Test: 2) Set to always-ask -- adb shell pm set-app-link package.name always-ask
Test: 3) Notice that we get a disambig w/ the instant app and chrome as options
Test: 4) Set to never -- adb shell pm set-app-link package.name never
Test: 5) Notice that we don't get the instant app
Andrii Kulian [Wed, 3 May 2017 00:03:25 +0000 (00:03 +0000)]
Merge "Update ime touch exclude region for hosting display" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 23:59:46 +0000 (23:59 +0000)]
Merge changes from topic 'frankenbuild' into oc-dev
* changes:
Revert "Resource ID fixup."
Resource ID fixup.
Wale Ogunwale [Tue, 2 May 2017 23:57:47 +0000 (23:57 +0000)]
Merge "Skip Pip animation to fullscreen if orientation is going to change" into oc-dev am:
5772ffcb9f
am:
9d6474140f
Change-Id: Ifc93c3af98eaf738deb9a0f1c17cceca1407489a
Makoto Onuki [Tue, 2 May 2017 23:57:45 +0000 (23:57 +0000)]
Merge "Add more information to WTF to investigate bug
37809561" into oc-dev
am:
e497b698d2
Change-Id: I0d5ace9d9b302e8f924d096fb245a81a3dfa8568
TreeHugger Robot [Tue, 2 May 2017 23:51:33 +0000 (23:51 +0000)]
Merge "Add more information to WTF to investigate bug
37809561" into oc-dev
Wale Ogunwale [Tue, 2 May 2017 23:51:32 +0000 (23:51 +0000)]
Merge "Skip Pip animation to fullscreen if orientation is going to change" into oc-dev
am:
5772ffcb9f
Change-Id: Ia344564dd1a9f6221e0737691eb4e8c8b9e27310
TreeHugger Robot [Tue, 2 May 2017 23:43:13 +0000 (23:43 +0000)]
Merge "Fixes issue where the notification menu was not visible after RTL changes"
TreeHugger Robot [Tue, 2 May 2017 23:41:26 +0000 (23:41 +0000)]
Merge "Skip Pip animation to fullscreen if orientation is going to change" into oc-dev
Winson Chung [Tue, 2 May 2017 23:34:46 +0000 (23:34 +0000)]
Merge "Restoring old methods for compatibility." into oc-dev am:
d6c190c8d2
am:
3d66fb6519
Change-Id: I1066d1efed081776286ef8ded7933998a89e1dd8
Winson Chung [Tue, 2 May 2017 23:27:48 +0000 (23:27 +0000)]
Merge "Restoring old methods for compatibility." into oc-dev
am:
d6c190c8d2
Change-Id: I306a8520873eb76182f3b04617265f5bf662aaf8
Siddharth Ray [Tue, 2 May 2017 23:27:43 +0000 (23:27 +0000)]
Merge "Added Channel for Network Initiated Notifications" into oc-dev am:
84ed81ed39
am:
e24e12df35
Change-Id: Id050d77a7df66451311713cdd54209109cda9d7a
Siddharth Ray [Tue, 2 May 2017 23:21:14 +0000 (23:21 +0000)]
Merge "Added Channel for Network Initiated Notifications" into oc-dev
am:
84ed81ed39
Change-Id: Idfc023f7e06242f778ec8530e61aab29143e9b31