Chris Craik
3eedbc0142
am 3059dbb6: am 04c0f415: Merge "Update alpha documentation" into mnc-dev
...
am: ed8623690b
* commit 'ed8623690b710ccb601373a622b09d96d7d15904':
2016-01-11 17:14:52 +00:00
Mathieu Chartier
86a70fec88
am 4c7518e1: am 9a4cdf5c: Merge "Look at map extensions before /dev/ + ashmem." into mnc-dev am: 292ef72cc4
...
am: d54a10daaf
* commit 'd54a10daafbe7b8e0214f551427fd8245d77b467':
2016-01-11 17:14:34 +00:00
Chris Wren
0b82a807c9
am f114e3d9: am b1ad8e9e: Merge changes from topic \'tron\' into mnc-dev am: c04a5df9c5
...
am: 4631f9174f
* commit '4631f9174fcaad6f8ebb0470ddebfc919573fdae':
2016-01-11 17:10:59 +00:00
Jorim Jaggi
93569d8b3b
am 3f5f1cb6: am 0629a5d5: Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev
...
am: 83fb90f61f
* commit '83fb90f61fa24ba7cc2b69ce91ad03b95d9d6024':
2016-01-11 17:08:29 +00:00
Alan Viverette
473a3e2e26
am aeedef55: am da0d6a6b: Merge "Correctly handle intercepted touch events in FastScroller" into mnc-dev am: f71c93ff9a
...
am: 0052a166c4
* commit '0052a166c4163add0743d4f8689f0b0e7df388cf':
2016-01-11 17:07:56 +00:00
Ruben Brunk
e01f25a279
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
2016-01-11 17:06:39 +00:00
Mathieu Chartier
661863dd42
am 5cc626bb: Merge "Look at map extensions before /dev/ + ashmem."
...
am: eec5a4e7a4
* commit 'eec5a4e7a4b21fa1e109918a6b97c33c22a5d124':
Look at map extensions before /dev/ + ashmem.
2016-01-11 17:06:03 +00:00
Ruben Brunk
2499eccd03
am 626cd0fb: am 0f2be13d: camera: Update Camera2 API for arbitration. am: 128a2fa002
...
am: cbd35d6f54
* commit 'cbd35d6f543d2b1b94e933cd0018d72d400a447d':
2016-01-11 17:06:00 +00:00
Ruben Brunk
0df8a4c574
am 626cd0fb: am 0f2be13d: camera: Update Camera2 API for arbitration. am: 128a2fa002
...
am: cbd35d6f54
* commit 'cbd35d6f543d2b1b94e933cd0018d72d400a447d':
2016-01-11 17:04:34 +00:00
Mathieu Chartier
d54a10daaf
am 4c7518e1: am 9a4cdf5c: Merge "Look at map extensions before /dev/ + ashmem." into mnc-dev
...
am: 292ef72cc4
* commit '292ef72cc46c21d7f1a5e7fe63960e1662d2d2d7':
2016-01-11 17:04:01 +00:00
Fabrice Di Meglio
7fc25e6446
am 359b96e5: am 83bb765b: Merge "Add IntentFilter auto verification - part 7" into mnc-dev am: 620649263f
...
am: e62b815c8b
* commit 'e62b815c8b21915c0cf3459b0f7424bc52b899c4':
2016-01-11 17:02:20 +00:00
Chris Wren
4631f9174f
am f114e3d9: am b1ad8e9e: Merge changes from topic \'tron\' into mnc-dev
...
am: c04a5df9c5
* commit 'c04a5df9c52fe026f1d0188eb092f12d0ad62505':
2016-01-11 17:01:44 +00:00
Andrew Lee
91706adabc
am da5e8ba0: am f3280041: Merge "Add Properties to Call.Details." into mnc-dev am: 72f95561f1
...
am: 5644af64ef
* commit '5644af64ef86e74325058569353f8c09703aa26e':
2016-01-11 16:58:55 +00:00
Jorim Jaggi
e65d6bb207
Snap docked stack after screen rotation
...
- Move DividerSnapAlgorithm to com.android.internal, also move
some utility stuff into DividerUtils which is used from both
SystemUI and window manager
- When the screen rotation changes, rotate the stacks like before
but then also snap the docked stack to a valid snap position.
Change-Id: Ifb0c65dfbdfca2343a76b12de982c0701fe0c3ab
2016-01-11 16:58:54 +00:00
Alan Viverette
0052a166c4
am aeedef55: am da0d6a6b: Merge "Correctly handle intercepted touch events in FastScroller" into mnc-dev
...
am: f71c93ff9a
* commit 'f71c93ff9aefade3bb0f9a056f88a38f6cf737c3':
2016-01-11 16:58:45 +00:00
Ruben Brunk
cbd35d6f54
am 626cd0fb: am 0f2be13d: camera: Update Camera2 API for arbitration.
...
am: 128a2fa002
* commit '128a2fa0021d2ef0bc1d1932cbbd877c69465c74':
2016-01-11 16:56:04 +00:00
Yohei Yukawa
2ca16f83ac
am 71cbadf3: am 097d5f10: Merge "Suggestions popup must be dismissed before device rotation." into mnc-dev am: 784480b62c
...
am: 4b41f7287e
* commit '4b41f7287ee27c31de113070bc4ee9d29b1d11f6':
2016-01-11 16:55:48 +00:00
Amith Yamasani
b5d09bb485
am 17d5e266: am 92d42057: Merge "Exclude bound app widgets from idle app list" into mnc-dev am: bd898e707b
...
am: ffe704c389
* commit 'ffe704c389b0015710ff9d04656e4856c11e50c8':
2016-01-11 16:52:55 +00:00
Fabrice Di Meglio
e62b815c8b
am 359b96e5: am 83bb765b: Merge "Add IntentFilter auto verification - part 7" into mnc-dev
...
am: 620649263f
* commit '620649263fc9e8e3d782dba49bd46d5ae199c636':
2016-01-11 16:52:54 +00:00
Andrew Lee
5644af64ef
am da5e8ba0: am f3280041: Merge "Add Properties to Call.Details." into mnc-dev
...
am: 72f95561f1
* commit '72f95561f1094525ad5f42d174d78dc36a21baf1':
2016-01-11 16:49:57 +00:00
Dan Sandler
5584bb67af
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
2016-01-11 16:49:53 +00:00
Dan Sandler
c5eec9d832
am 548f4d6c: am 9fc943d1: Merge "Icon: a clean, parcelable place for images." into mnc-dev am: a89899a324
...
am: 40e2285979
* commit '40e22859799161183766c1cb54d4c3bb449e401c':
2016-01-11 16:49:06 +00:00
Benjamin Franz
58647664d7
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
2016-01-11 16:47:41 +00:00
Benjamin Franz
8d2142e6a6
am cecb3621: am a7cba44a: Merge "Improve Accessibility behaviour in recents" into mnc-dev am: 48bb01e1ef
...
am: 96d80aeb00
* commit '96d80aeb00c816de7f721b1c4f9e895be36b49f2':
2016-01-11 16:46:05 +00:00
Yohei Yukawa
4b41f7287e
am 71cbadf3: am 097d5f10: Merge "Suggestions popup must be dismissed before device rotation." into mnc-dev
...
am: 784480b62c
* commit '784480b62cbcbd86c48da8191af66755211d3f4f':
2016-01-11 16:44:20 +00:00
Benjamin Franz
a97a21ef54
am cecb3621: am a7cba44a: Merge "Improve Accessibility behaviour in recents" into mnc-dev am: 48bb01e1ef
...
am: 96d80aeb00
* commit '96d80aeb00c816de7f721b1c4f9e895be36b49f2':
2016-01-11 16:44:11 +00:00
Amith Yamasani
ffe704c389
am 17d5e266: am 92d42057: Merge "Exclude bound app widgets from idle app list" into mnc-dev
...
am: bd898e707b
* commit 'bd898e707b724a6f2e339a6231aa531670bdf5e6':
2016-01-11 16:40:45 +00:00
Doris Liu
79232853f0
am 3ebbc50c: am 27cfed7b: Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev am: b343db76aa
...
am: 71760d026e
* commit '71760d026edefdb84c99dfabbaa6455925254628':
2016-01-11 16:39:52 +00:00
Dan Sandler
40e2285979
am 548f4d6c: am 9fc943d1: Merge "Icon: a clean, parcelable place for images." into mnc-dev
...
am: a89899a324
* commit 'a89899a3241008679cf1c37651ea8bf9adc65ecd':
2016-01-11 16:38:20 +00:00
Roozbeh Pournader
54f715cbdf
am 33d1c27e: am 087497d2: Merge "Rename Noto Han fonts to their latest names." into mnc-dev am: 20a862ba14
...
am: 38be32783b
* commit '38be32783b7b26f5fd290dfe015946f412ebc132':
2016-01-11 16:37:28 +00:00
Benjamin Franz
96d80aeb00
am cecb3621: am a7cba44a: Merge "Improve Accessibility behaviour in recents" into mnc-dev
...
am: 48bb01e1ef
* commit '48bb01e1ef74a8e3e7595ba880bb5072b3d1a23b':
2016-01-11 16:35:06 +00:00
Amit Mahajan
2e650c8d7c
am c23975da: am 13a98b6c: Support for bearer_bitmask. am: 5eac90f93f
...
am: 5fed76fd12
* commit '5fed76fd1286bcf739c9d4748a5889d7a87f541a':
2016-01-11 16:34:47 +00:00
Filip Gruszczynski
e8b3bb9af0
Merge "Load background drawable before passing to backdrop renderer."
2016-01-11 16:33:33 +00:00
Doris Liu
71760d026e
am 3ebbc50c: am 27cfed7b: Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev
...
am: b343db76aa
* commit 'b343db76aa8623a0253746f70beb5543c3ae5473':
2016-01-11 16:32:57 +00:00
Jeff Sharkey
caed256569
am 3b342179: am a320505f: Merge "Move both app code and data together." into mnc-dev am: 399199fe82
...
am: 4f171b4cc2
* commit '4f171b4cc25f8d3e4588513c368bd8c1df01f40c':
2016-01-11 16:32:00 +00:00
Roozbeh Pournader
38be32783b
am 33d1c27e: am 087497d2: Merge "Rename Noto Han fonts to their latest names." into mnc-dev
...
am: 20a862ba14
* commit '20a862ba1474ac994c2ed35daf094910c0215ff3':
2016-01-11 16:31:02 +00:00
Amit Mahajan
5fed76fd12
am c23975da: am 13a98b6c: Support for bearer_bitmask.
...
am: 5eac90f93f
* commit '5eac90f93fd0214012a3c039422b4dcdfad97eef':
2016-01-11 16:29:02 +00:00
John Reck
6b5a4c6155
am 7e22cc99: am 78760b4a: Merge "A bunch more cleanups" into mnc-dev am: 1ad0936c77
...
am: 6c7eb9059e
* commit '6c7eb9059ef4ab78f772bb5899d1ff0c21d4a888':
2016-01-11 16:28:47 +00:00
Jeff Sharkey
4f171b4cc2
am 3b342179: am a320505f: Merge "Move both app code and data together." into mnc-dev
...
am: 399199fe82
* commit '399199fe8239c11f902265b03f90dc8194e59a53':
2016-01-11 16:26:46 +00:00
John Reck
6c7eb9059e
am 7e22cc99: am 78760b4a: Merge "A bunch more cleanups" into mnc-dev
...
am: 1ad0936c77
* commit '1ad0936c77d3c742970e7051c62c715a00c082ca':
2016-01-11 16:24:27 +00:00
Geoff Mendal
dc8b2125b1
Import translations. DO NOT MERGE
...
am: a579950907 -s ours
* commit 'a579950907c4acc7dc54b1788a4cbdaa63bff051':
Import translations. DO NOT MERGE
2016-01-11 16:21:49 +00:00
Geoff Mendal
89a2ed1ef6
Merge branch \'mnc-dr1.5-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr1.5-dev am: ddee7d949d am: da3a7d4cff
...
am: 4fdce74459
* commit '4fdce74459541b24ce52700a7f9c4f93de323d47':
2016-01-11 15:11:49 +00:00
Geoff Mendal
82b77122fa
Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours am: 14c37a57ea -s ours am: 0b8de39728 -s ours am: 9f094ac04d -s ours am: 38aaa9981a -s ours am: 188ed31261 -s ours
...
am: ef3e9e66b0 -s ours
* commit 'ef3e9e66b04e66d877ac74d84280cc93e37b8b7d':
Revert "Import translations. DO NOT MERGE"
2016-01-11 15:09:58 +00:00
Geoff Mendal
6590d75cb4
Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours am: 42692affe2 -s ours am: 8ea585955c -s ours am: 4ae777097e -s ours am: 23c92d99cf -s ours am: 67ba224dbf -s ours am: 18ad80370f -s ours
...
am: 4fdd7772e2 -s ours
* commit '4fdd7772e26fb26e1e5432db93f7899ef1f624cd':
Import translations. DO NOT MERGE
2016-01-11 15:08:27 +00:00
Geoff Mendal
4fdce74459
Merge branch \'mnc-dr1.5-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr1.5-dev am: ddee7d949d
...
am: da3a7d4cff
* commit 'da3a7d4cff5b1269ce06e88d94271cb0d4502afa':
2016-01-11 15:07:22 +00:00
Geoff Mendal
ef3e9e66b0
Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours am: 14c37a57ea -s ours am: 0b8de39728 -s ours am: 9f094ac04d -s ours am: 38aaa9981a -s ours
...
am: 188ed31261 -s ours
* commit '188ed31261ed27b764feaa970ac8eea0ed59ff62':
Revert "Import translations. DO NOT MERGE"
2016-01-11 15:05:31 +00:00
Geoff Mendal
4fdd7772e2
Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours am: 42692affe2 -s ours am: 8ea585955c -s ours am: 4ae777097e -s ours am: 23c92d99cf -s ours am: 67ba224dbf -s ours
...
am: 18ad80370f -s ours
* commit '18ad80370f7b96a0edccbfc2801a8f56a093f158':
Import translations. DO NOT MERGE
2016-01-11 15:03:55 +00:00
Geoff Mendal
da3a7d4cff
Merge branch \'mnc-dr1.5-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr1.5-dev
...
am: ddee7d949d
* commit 'ddee7d949dbd1fd5d18e11322532e78cd8330554':
2016-01-11 15:02:10 +00:00
Geoff Mendal
188ed31261
Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours am: 14c37a57ea -s ours am: 0b8de39728 -s ours am: 9f094ac04d -s ours
...
am: 38aaa9981a -s ours
* commit '38aaa9981a62b0978c65f86f22102383bb2d5f01':
Revert "Import translations. DO NOT MERGE"
2016-01-11 15:00:49 +00:00
Geoff Mendal
18ad80370f
Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours am: 42692affe2 -s ours am: 8ea585955c -s ours am: 4ae777097e -s ours am: 23c92d99cf -s ours
...
am: 67ba224dbf -s ours
* commit '67ba224dbf81e6c1a63bc11a1b02edd45c5c1d4a':
Import translations. DO NOT MERGE
2016-01-11 14:59:20 +00:00