OSDN Git Service
Evan Rosky [Tue, 2 May 2017 21:18:23 +0000 (21:18 +0000)]
Merge "Don't focus search user-specified views which are invisible" into oc-dev am:
3b213ed438
am:
078728f100
Change-Id: I313b35f2f20ed4e0a0af5c45ba95816a2ed7d083
Evan Rosky [Tue, 2 May 2017 21:01:30 +0000 (21:01 +0000)]
Merge "Don't focus search user-specified views which are invisible" into oc-dev
am:
3b213ed438
Change-Id: I5a058c7024020e41ba8747c243d7209127cba19f
Evan Rosky [Tue, 2 May 2017 20:54:00 +0000 (20:54 +0000)]
Merge "Don't focus search user-specified views which are invisible" into oc-dev
Wale Ogunwale [Tue, 2 May 2017 20:37:30 +0000 (20:37 +0000)]
Merge "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays" into oc-dev am:
5f0e436548
am:
19ac164d1b
Change-Id: Ie7a6c7341725c6d63da0e9861d059c6bd3ad6281
Wale Ogunwale [Tue, 2 May 2017 20:29:00 +0000 (20:29 +0000)]
Merge "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays" into oc-dev
am:
5f0e436548
Change-Id: Icc1d09c16abc31d15a7ea5960ab1640ae265c31c
Abodunrinwa Toki [Tue, 2 May 2017 20:24:08 +0000 (20:24 +0000)]
Merge "Support resetting "smart selection" to any word in the selection." into oc-dev am:
3cb61255ab
am:
0ed16d0d42
Change-Id: I8ccf6ff7f16cc94e9213442383e8eb9c58b5d18d
Wale Ogunwale [Tue, 2 May 2017 20:23:43 +0000 (20:23 +0000)]
Merge "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays" into oc-dev
Android Build Merger (Role) [Tue, 2 May 2017 20:21:51 +0000 (20:21 +0000)]
Merge "Merge "Fix cancel when the same notification is enqueued twice." into oc-dev am:
67ced6c08f am:
ef8ba7dc61"
Geoffrey Pitsch [Tue, 2 May 2017 20:20:58 +0000 (20:20 +0000)]
Merge "Fix cancel when the same notification is enqueued twice." into oc-dev am:
67ced6c08f
am:
ef8ba7dc61
Change-Id: I5fa7da9a5779220deeaf00e00a5cbf3eca0a5ca5
Abodunrinwa Toki [Tue, 2 May 2017 20:17:18 +0000 (20:17 +0000)]
Merge "Support resetting "smart selection" to any word in the selection." into oc-dev
am:
3cb61255ab
Change-Id: Ie089ed63df8064798fa98a8a2378b81d09cf3b1c
Wale Ogunwale [Tue, 2 May 2017 20:16:39 +0000 (13:16 -0700)]
Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays
Reduce pre-submit noise. We can re-enable once we figure-out why it
is flaky.
Bug:
37908381
Test: disabled!
Change-Id: Ia82ba73fafafc433487027f2ee2d582dceb65ed2
Sudheer Shanka [Tue, 2 May 2017 20:14:38 +0000 (20:14 +0000)]
Merge "Add commandline option to update power-save-except-idle whitelist." into oc-dev am:
89bc8b17d6
am:
1c4a1c8bdb
Change-Id: Id8b15764fb613a78bc497b349f7b716e4a1b3b88
Geoffrey Pitsch [Tue, 2 May 2017 20:11:50 +0000 (20:11 +0000)]
Merge "Fix cancel when the same notification is enqueued twice." into oc-dev
am:
67ced6c08f
Change-Id: Iadde1ec051096176e68fbec5f0a3ce2acf3eb39b
TreeHugger Robot [Tue, 2 May 2017 20:05:42 +0000 (20:05 +0000)]
Merge "Support resetting "smart selection" to any word in the selection." into oc-dev
Sudheer Shanka [Tue, 2 May 2017 20:04:57 +0000 (20:04 +0000)]
Merge "Add commandline option to update power-save-except-idle whitelist." into oc-dev
am:
89bc8b17d6
Change-Id: Id87f06d4e13059e2f258508bf31348aba85ca5a9
TreeHugger Robot [Tue, 2 May 2017 20:02:13 +0000 (20:02 +0000)]
Merge "Fix cancel when the same notification is enqueued twice." into oc-dev
Yi Kong [Tue, 2 May 2017 20:00:21 +0000 (20:00 +0000)]
Merge "Resolve merge conflicts of
ccc5b9bbd02a to oc-dev-plus-aosp" into oc-dev-plus-aosp
am:
51ccc24d57
Change-Id: Ib6109c22c278ce00ad1a0c6d3d1e6a7903cfad2f
Sudheer Shanka [Tue, 2 May 2017 19:56:59 +0000 (19:56 +0000)]
Merge "Add commandline option to update power-save-except-idle whitelist." into oc-dev
Calin Juravle [Tue, 2 May 2017 19:55:16 +0000 (19:55 +0000)]
Merge "Make PM#registerDexModule oneway"
TreeHugger Robot [Tue, 2 May 2017 19:54:21 +0000 (19:54 +0000)]
Merge "Resolve merge conflicts of
ccc5b9bbd02a to oc-dev-plus-aosp" into oc-dev-plus-aosp
Yi Kong [Tue, 2 May 2017 19:49:25 +0000 (12:49 -0700)]
Resolve merge conflicts of
ccc5b9bbd02a to oc-dev-plus-aosp
Test: Build
Change-Id: I7d3d6bb4c436b2025a0293f9c6475855243f4dd9
Jean-Michel Trivi [Tue, 2 May 2017 19:42:15 +0000 (19:42 +0000)]
Merge "Message about audio stream deprecation as warning" into oc-dev am:
dd8a71f4a9
am:
86af1cd18f
Change-Id: I8c3627d5756661115c66228187c2b0685a7145f3
Winson Chung [Tue, 2 May 2017 19:31:01 +0000 (19:31 +0000)]
Merge "Merge "Removing check preventing pinned stack tasks from matching by affinity." into oc-dev am:
4ec5dd1d88" into oc-dev-plus-aosp
am:
ad2827eef4
Change-Id: Idb25a7c850d39232d32acbd98b68f37a70a5f621
Steven Moreland [Tue, 2 May 2017 19:26:20 +0000 (19:26 +0000)]
Merge "RenderScript: IWYU" into oc-dev-plus-aosp
am:
6ab4c986f2
Change-Id: Ib6cb3067743b3ef5fd341bd8f9826793c6a8a0e7
Jean-Michel Trivi [Tue, 2 May 2017 19:24:43 +0000 (19:24 +0000)]
Merge "Message about audio stream deprecation as warning" into oc-dev
am:
dd8a71f4a9
Change-Id: I35b530efc40eb025b5e1b0fe757ed2e4ed6a33ac
Android Build Merger (Role) [Tue, 2 May 2017 19:20:28 +0000 (19:20 +0000)]
Merge "Merge "Removing check preventing pinned stack tasks from matching by affinity." into oc-dev am:
4ec5dd1d88" into oc-dev-plus-aosp
Winson Chung [Tue, 2 May 2017 19:19:15 +0000 (19:19 +0000)]
Merge "Removing check preventing pinned stack tasks from matching by affinity." into oc-dev
am:
4ec5dd1d88
Change-Id: I72050ea3a1a6d2345d1f511cad2f048b4224c63c
TreeHugger Robot [Tue, 2 May 2017 19:18:33 +0000 (19:18 +0000)]
Merge "RenderScript: IWYU" into oc-dev-plus-aosp
Calin Juravle [Tue, 2 May 2017 19:16:24 +0000 (19:16 +0000)]
Merge "Make PM#notifyDexLoad oneway" into oc-dev am:
5f016f6705
am:
711016dfbc
Change-Id: Ifde71f3cfaa3a1053f3f19f3b722620111e7e0f5
TreeHugger Robot [Tue, 2 May 2017 19:13:19 +0000 (19:13 +0000)]
Merge "Message about audio stream deprecation as warning" into oc-dev
Calin Juravle [Tue, 2 May 2017 19:10:17 +0000 (19:10 +0000)]
Merge "Make PM#notifyDexLoad oneway" into oc-dev
am:
5f016f6705
Change-Id: Ica5f01a3c66c71104ff0e3b26e9e5fdf7802bc60
Winson Chung [Tue, 2 May 2017 19:07:24 +0000 (19:07 +0000)]
Merge "Removing check preventing pinned stack tasks from matching by affinity." into oc-dev
Abodunrinwa Toki [Tue, 2 May 2017 19:07:30 +0000 (19:07 +0000)]
Merge "Close file descriptor after SmartSelection is initialized." into oc-dev am:
b950ac6b0f
am:
2deb2fab29
Change-Id: I7cf2ecfb78c64f626371dedab5394d0079c8cadc
Steven Moreland [Mon, 1 May 2017 19:56:08 +0000 (12:56 -0700)]
RenderScript: IWYU
Renderscript was depending on macros from android-base that were
transitively included from MQDescriptor.h
Test: links
Bug:
37791060
Change-Id: Ie34ddef67328c5fcc6b0122a32725b980615ff43
(cherry picked from commit
dc01e938c2550390a540311b22e3e6c7603ed975)
Calin Juravle [Tue, 2 May 2017 19:03:18 +0000 (19:03 +0000)]
Merge "Make PM#notifyDexLoad oneway" into oc-dev
Abodunrinwa Toki [Tue, 2 May 2017 19:00:53 +0000 (19:00 +0000)]
Merge "Close file descriptor after SmartSelection is initialized." into oc-dev
am:
b950ac6b0f
Change-Id: I9ec0463e9641fb6a54e26311273932d3d1a6d41e
TreeHugger Robot [Tue, 2 May 2017 18:54:59 +0000 (18:54 +0000)]
Merge "Close file descriptor after SmartSelection is initialized." into oc-dev
TreeHugger Robot [Tue, 2 May 2017 18:48:14 +0000 (18:48 +0000)]
Merge "Color extracted gradient on Overview"
TreeHugger Robot [Tue, 2 May 2017 18:48:14 +0000 (18:48 +0000)]
Merge "Color extraction shareable library"
TreeHugger Robot [Tue, 2 May 2017 18:48:14 +0000 (18:48 +0000)]
Merge "Color extraction on scrims"
Yi Kong [Tue, 2 May 2017 18:31:59 +0000 (18:31 +0000)]
Merge "SymbolComparator operator() is missing const" am:
e74483074e
am:
a522b4af78
Change-Id: If68306b217d19fb1d1d4bc71a8fd452a47aa8ed2
Yi Kong [Tue, 2 May 2017 18:26:57 +0000 (18:26 +0000)]
Merge "SymbolComparator operator() is missing const"
am:
e74483074e
Change-Id: I86f332f10f87d519c42c5880c49dacf98be2c9e5
Yi Kong [Tue, 2 May 2017 18:15:02 +0000 (18:15 +0000)]
Merge "SymbolComparator operator() is missing const"
Jean-Michel Trivi [Tue, 2 May 2017 18:02:25 +0000 (18:02 +0000)]
Merge "Audio focus: fix notifying apps to pause without an external policy" into oc-dev am:
dce4dfc6fc
am:
7f2cc46a0f
Change-Id: I7e6c6099690f514d4f4797a13989bdc61ad390f1
Dianne Hackborn [Tue, 2 May 2017 18:00:22 +0000 (18:00 +0000)]
Merge "Work on issue #
37815224: DeviceManagementService is incorrectly..." into oc-dev am:
72c0ab518a
am:
c812cf27ab
Change-Id: I7a7b4b17a4eeeeda7619e6fa9702ef059af7d76f
Jean-Michel Trivi [Tue, 2 May 2017 17:56:07 +0000 (17:56 +0000)]
Merge "Audio focus: fix notifying apps to pause without an external policy" into oc-dev
am:
dce4dfc6fc
Change-Id: Ic42056d370ecd0a08574dd575856ff15813bc8c0
Jean-Michel Trivi [Tue, 2 May 2017 17:52:32 +0000 (17:52 +0000)]
Merge "Audio focus: fix notifying apps to pause without an external policy" into oc-dev
Dianne Hackborn [Tue, 2 May 2017 17:51:20 +0000 (17:51 +0000)]
Merge "Work on issue #
37815224: DeviceManagementService is incorrectly..." into oc-dev
am:
72c0ab518a
Change-Id: I1987075221d0d5fa16483e6a41003b0394291d10
Dianne Hackborn [Tue, 2 May 2017 17:45:46 +0000 (17:45 +0000)]
Merge "Work on issue #
37815224: DeviceManagementService is incorrectly..." into oc-dev
Seigo Nonaka [Tue, 2 May 2017 17:44:46 +0000 (17:44 +0000)]
Merge "Fix NPE happens if no source was specified to font element." into oc-dev am:
b3e92234fa
am:
159f549c8f
Change-Id: Ief83bf6522468ab40d8dd9c3a68ab72892952ea4
Abodunrinwa Toki [Tue, 2 May 2017 17:44:19 +0000 (18:44 +0100)]
Support resetting "smart selection" to any word in the selection.
Test: See topic
Bug:
34779207
Change-Id: I75a9b991571f750b362047baa13675250e929223
TreeHugger Robot [Tue, 2 May 2017 17:41:50 +0000 (17:41 +0000)]
Merge "Make IMidiDeviceServer.setDeviceInfo method oneway"
Amith Yamasani [Tue, 2 May 2017 17:37:13 +0000 (17:37 +0000)]
Merge "Clear calling uid before changing whitelist" into oc-dev am:
97e3db9aee
am:
d74a51bd62
Change-Id: I2da254531ea4d5e24828501cadb2b37c28ce8719
Jorim Jaggi [Tue, 2 May 2017 17:34:18 +0000 (17:34 +0000)]
Merge "Fix app transition logging when switching quickly" into oc-dev am:
4cbad7fac1
am:
86c8ba41f3
Change-Id: I6c0355c4d90e127e809620d857ce138a077c6840
Seigo Nonaka [Tue, 2 May 2017 17:32:04 +0000 (17:32 +0000)]
Merge "Fix NPE happens if no source was specified to font element." into oc-dev
am:
b3e92234fa
Change-Id: If06bf0e49030839f1b4f95c0a776e4aab1ed94d8
Amith Yamasani [Tue, 2 May 2017 17:29:39 +0000 (17:29 +0000)]
Merge "Clear calling uid before changing whitelist" into oc-dev
am:
97e3db9aee
Change-Id: Icc858733afb22720a9adf1a1c4e85ba47cf03e2d
Geoffrey Pitsch [Tue, 2 May 2017 15:41:31 +0000 (11:41 -0400)]
Fix cancel when the same notification is enqueued twice.
Change-Id: I6563c70ac441ff1c1951d5220c2e6a7c5f210d49
Fixes:
37706685
Test: runtest systemui-notification
Android Build Merger (Role) [Tue, 2 May 2017 17:26:39 +0000 (17:26 +0000)]
Merge "Merge "Don't crash during app uninstall." into oc-dev am:
661b6badef am:
b9fcccb0c0"
Daniel Nishi [Tue, 2 May 2017 17:25:47 +0000 (17:25 +0000)]
Merge "Don't crash during app uninstall." into oc-dev am:
661b6badef
am:
b9fcccb0c0
Change-Id: I91401f5692892519da476fe75f60afc632cc87e0
TreeHugger Robot [Tue, 2 May 2017 17:22:58 +0000 (17:22 +0000)]
Merge "Fix NPE happens if no source was specified to font element." into oc-dev
Jorim Jaggi [Tue, 2 May 2017 17:21:24 +0000 (17:21 +0000)]
Merge "Fix app transition logging when switching quickly" into oc-dev
am:
4cbad7fac1
Change-Id: I2b759dbcc3f010172c843e84835ccb68182b5efd
Amith Yamasani [Tue, 2 May 2017 17:20:31 +0000 (17:20 +0000)]
Merge "Clear calling uid before changing whitelist" into oc-dev
Lucas Dupin [Mon, 1 May 2017 22:59:41 +0000 (15:59 -0700)]
Color extracted gradient on Overview
Picking system wallpaper colors and drawing them
instead of the default black overlay.
Alpha also changed to 80% to match new designs.
Bug:
37013382
Test: visual - background color shouldn't be black
Change-Id: I8d68fa03729f663a701b49ad179b15040fe2b0bd
Daniel Nishi [Tue, 2 May 2017 17:17:47 +0000 (17:17 +0000)]
Merge "Don't crash during app uninstall." into oc-dev am:
661b6badef
am:
b9fcccb0c0
Change-Id: I96165dece81c0d04cee6e8330216f63100a5cbd3
Abodunrinwa Toki [Fri, 28 Apr 2017 18:25:24 +0000 (19:25 +0100)]
Close file descriptor after SmartSelection is initialized.
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug:
37446398
Change-Id: I6f6d927f447d3cc1dffaee2406ff240d0600eb19
Bill Yi [Tue, 2 May 2017 17:15:18 +0000 (17:15 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 2 May 2017 17:14:57 +0000 (17:14 +0000)]
Merge "Fix app transition logging when switching quickly" into oc-dev
Daniel Nishi [Tue, 2 May 2017 17:09:51 +0000 (17:09 +0000)]
Merge "Don't crash during app uninstall." into oc-dev
am:
661b6badef
Change-Id: Iceab4bdd88e348c4bd4019ee1fb6c7c8b3f5baf1
Daniel Nishi [Tue, 2 May 2017 17:03:51 +0000 (17:03 +0000)]
Merge "Don't crash during app uninstall." into oc-dev
Jean-Michel Trivi [Tue, 2 May 2017 17:01:08 +0000 (10:01 -0700)]
Message about audio stream deprecation as warning
The message indicating the use of stream types for operations
other than volume control is deprecated shouldn't be an
error but a warning
Test: use apps that request audio focus with a stream type, check log
Bug:
37887058
Change-Id: Iaafae8aa599984688dae448e868de81317add4d3
Abodunrinwa Toki [Tue, 2 May 2017 16:40:12 +0000 (16:40 +0000)]
Merge "Add "Paste as plain text" in TextView's toolbar." into oc-dev am:
0fe5a2d5b3
am:
1b048b299c
Change-Id: I1793a8ab5bf98bf4e0c558df38238fbbfc6560c9
Abodunrinwa Toki [Tue, 2 May 2017 16:31:50 +0000 (16:31 +0000)]
Merge "Add "Paste as plain text" in TextView's toolbar." into oc-dev
am:
0fe5a2d5b3
Change-Id: I72d5fdd4351860bc02289abde6b1c36e13407e69
Erik Wolsheimer [Tue, 2 May 2017 16:30:43 +0000 (16:30 +0000)]
Merge "Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286 -s ours" into oc-dev am:
550e1c9a6b" into oc-dev-plus-aosp
am:
17d766c917
Change-Id: Ie501008a3696b02e836cf92c0671b3c160b1ef24
Jiwen Cai [Tue, 2 May 2017 16:25:03 +0000 (16:25 +0000)]
Merge "Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev am:
9967a4d3af" into oc-dev-plus-aosp
am:
edae7a8e1c
Change-Id: I16a9bc71853eef3334fec3ff7939859818daae13
TreeHugger Robot [Tue, 2 May 2017 16:21:10 +0000 (16:21 +0000)]
Merge "Add "Paste as plain text" in TextView's toolbar." into oc-dev
Erik Wolsheimer [Tue, 2 May 2017 16:20:11 +0000 (16:20 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286 am:
ab4617dd92 -s ours
am:
b1d8568349
Change-Id: Ia698bc1244fffbd7adac7aaf85e320564a2852e5
The Android Open Source Project [Tue, 2 May 2017 16:17:25 +0000 (16:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7f43068aa5 -s ours
am:
05713dc164 -s ours
Change-Id: Ic2b16fc7ce66575225c6247f2c6d2df90ceeb5f5
The Android Open Source Project [Tue, 2 May 2017 16:15:44 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
71ffd8bc87 -s ours
am:
3db706109b -s ours
Change-Id: I40daf0ddcc9e14070a6e585fe932632e08752cce
Android Build Merger (Role) [Tue, 2 May 2017 16:10:47 +0000 (16:10 +0000)]
Merge "Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286 -s ours" into oc-dev am:
550e1c9a6b" into oc-dev-plus-aosp
Erik Wolsheimer [Tue, 2 May 2017 16:10:00 +0000 (16:10 +0000)]
Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286 -s ours" into oc-dev
am:
550e1c9a6b
Change-Id: Ie3ec9c7b8aee293f79cccde97b197c8c77d63281
Android Build Merger (Role) [Tue, 2 May 2017 16:09:21 +0000 (16:09 +0000)]
Merge "Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev am:
9967a4d3af" into oc-dev-plus-aosp
Erik Wolsheimer [Tue, 2 May 2017 16:07:10 +0000 (16:07 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286
am:
ab4617dd92 -s ours
Change-Id: I4d65ed8df4f31b6e7aff05a554207a6a3d093614
Jiwen Cai [Tue, 2 May 2017 16:04:26 +0000 (16:04 +0000)]
Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev
am:
9967a4d3af
Change-Id: If2ec26782f82e0f22deb7d952b79436e30a91867
Android Build Merger (Role) [Tue, 2 May 2017 16:00:52 +0000 (16:00 +0000)]
Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286 -s ours" into oc-dev
Erik Wolsheimer [Tue, 2 May 2017 15:59:55 +0000 (15:59 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759
am:
a399705286
Change-Id: I31b67a7bb496051a9062d4770a96119251a1b434
Erik Wolsheimer [Tue, 2 May 2017 15:59:43 +0000 (15:59 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759
am:
a399705286 -s ours
Change-Id: I654fc19afef7f11d894590d287cde3650b8252af
Jiwen Cai [Tue, 2 May 2017 15:59:21 +0000 (15:59 +0000)]
Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev
Vladislav Kaznacheev [Tue, 2 May 2017 15:58:35 +0000 (15:58 +0000)]
Merge "Fix submenu position when showing with Gravity.END" into oc-dev am:
883af0766a
am:
1ae2909045
Change-Id: I178f0af13e2df05acf0918e492a9b8a44d1107e6
The Android Open Source Project [Tue, 2 May 2017 15:56:20 +0000 (15:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7f43068aa5 -s ours
Change-Id: Ib3bf970248fec4410e2a4de47825c511b34fff6e
Tony Mak [Tue, 2 May 2017 15:55:21 +0000 (15:55 +0000)]
Merge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev am:
91c6e44e9e
am:
1fe0c5cae8
Change-Id: I2fb7103267fbcf76ede3f168b4d7b4892c501943
Erik Wolsheimer [Tue, 2 May 2017 15:54:40 +0000 (15:54 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s
am:
a686345759
Change-Id: I0598c6210dbf0d0447c31112419a2fee829037be
The Android Open Source Project [Tue, 2 May 2017 15:54:35 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
71ffd8bc87 -s ours
Change-Id: Iff4a81cc730f7d35d95da27937df2d171b3379d9
TreeHugger Robot [Tue, 2 May 2017 15:49:24 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Jorim Jaggi [Tue, 2 May 2017 15:49:06 +0000 (15:49 +0000)]
Merge "Split out whether frame callback and tick is scheduled" into oc-dev am:
756efea145
am:
62c1e21a25
Change-Id: I5e6d697a43327fc583f0248201ab4c7d2bd277cd
Vladislav Kaznacheev [Tue, 2 May 2017 15:48:11 +0000 (15:48 +0000)]
Merge "Fix submenu position when showing with Gravity.END" into oc-dev
am:
883af0766a
Change-Id: Ib2799189f34cb8fc2baeb19a6a4a005eb13b64d1
TreeHugger Robot [Tue, 2 May 2017 15:47:33 +0000 (15:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Wale Ogunwale [Tue, 2 May 2017 15:47:10 +0000 (15:47 +0000)]
Merge "Don't send configuration that app doesn't support to it." into oc-dev am:
22c1275c89
am:
f528efd2fc
Change-Id: I5ad92b83b66996101ec7c8144d5924ff2bfd08c4
Tony Mak [Tue, 2 May 2017 15:46:13 +0000 (15:46 +0000)]
Merge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev
am:
91c6e44e9e
Change-Id: I360c03f15bf8a84d58100e371ed5528db6975f4d
Oleksiy Avramchenko [Tue, 2 May 2017 15:45:25 +0000 (15:45 +0000)]
Merge "Force a light to be set for the first time" am:
e6ad7a6704 am:
96a8556990 am:
db877fa31c
am:
f12993a715
Change-Id: I3b4ef0bd22da42883c4ae76640343ec4484e7e2d
TreeHugger Robot [Tue, 2 May 2017 15:40:37 +0000 (15:40 +0000)]
Merge "Fix submenu position when showing with Gravity.END" into oc-dev
OSDN Git Service
