git.osdn.net Git - android-x86/frameworks-base.git/log

Steve McKay [Mon, 11 Jan 2016 19:05:00 +0000 (19:05 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

Steve McKay [Mon, 11 Jan 2016 19:04:00 +0000 (19:04 +0000)]

am c05605ae: am 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev am: c226801a43
am: 2dbf679cf0

* commit '2dbf679cf080df06e5340ea4bb766ea4f1aa1956':

commit | commitdiff | tree

Steve McKay [Mon, 11 Jan 2016 19:01:55 +0000 (19:01 +0000)]

am c05605ae: am 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev am: c226801a43
am: 2dbf679cf0

* commit '2dbf679cf080df06e5340ea4bb766ea4f1aa1956':

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 18:59:56 +0000 (18:59 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 18:59:02 +0000 (18:59 +0000)]

am ffdbf7da: (-s ours) am cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev am: f68020abf3 -s ours
am: 44ad3ac50a -s ours

* commit '44ad3ac50aca8ec2fc23ad1ac9defdc1446d518b':

commit | commitdiff | tree

Xiaohui Chen [Mon, 11 Jan 2016 18:58:14 +0000 (18:58 +0000)]

Merge "sysui: refactor out PanelHolder"

commit | commitdiff | tree

Andrew Flynn [Mon, 11 Jan 2016 18:56:38 +0000 (18:56 +0000)]

am 10dced7a: am ae499d19: Merge "SystemUI Carrier Network Change unit tests" into mnc-dev am: 4aa8c7df2e
am: dfe384fed8

* commit 'dfe384fed881eaab1d7585fb4e23edfab0823c33':

commit | commitdiff | tree

Victor Chan [Mon, 11 Jan 2016 18:55:22 +0000 (18:55 +0000)]

Merge "Null check mRecentsComponent and mDivider."

commit | commitdiff | tree

John Reck [Mon, 11 Jan 2016 18:53:03 +0000 (18:53 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

John Reck [Mon, 11 Jan 2016 18:52:10 +0000 (18:52 +0000)]

am cc8418fc: am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev am: dd447382cd
am: aa768491c3

* commit 'aa768491c3463849df9f3e52ff37e6d9136271af':

commit | commitdiff | tree

Jeff Davidson [Mon, 11 Jan 2016 18:51:20 +0000 (18:51 +0000)]

Merge "Define new APIs for metering and roaming network stats buckets."

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 18:48:01 +0000 (18:48 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 18:46:53 +0000 (18:46 +0000)]

am 577e34c9: (-s ours) am 3f2f2cbb: (-s ours) Import translations. DO NOT MERGE am: 896262ef52 -s ours
am: 625b8124a0 -s ours

* commit '625b8124a03a2bec5bc168ab27777263a3f8e114':

commit | commitdiff | tree

Tor Norbye [Mon, 11 Jan 2016 18:46:10 +0000 (18:46 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Tor Norbye [Mon, 11 Jan 2016 18:45:08 +0000 (18:45 +0000)]

am 7a560701: am 335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev am: 20ccf13fbc
am: a4f3fa62a3

* commit 'a4f3fa62a36a0bcb0dfc3adae54bb802084cd690':

commit | commitdiff | tree

Steve McKay [Mon, 11 Jan 2016 18:44:59 +0000 (18:44 +0000)]

am c05605ae: am 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev
am: c226801a43

* commit 'c226801a43c17d41e59988adbb77fd06f2f77c9d':

commit | commitdiff | tree

Adam Lesinski [Mon, 11 Jan 2016 18:44:58 +0000 (18:44 +0000)]

Merge "AAPT2: Warn when positional arguments exist and --legacy is on"

commit | commitdiff | tree

Gustav Sennton [Mon, 11 Jan 2016 18:43:05 +0000 (18:43 +0000)]

Merge "Fix WebView loading logic to allow changing provider if current disabled"

commit | commitdiff | tree

Adam Lesinski [Mon, 11 Jan 2016 18:42:19 +0000 (10:42 -0800)]

AAPT2: Warn when positional arguments exist and --legacy is on

This is normally an error, but old AAPT didn't check for it correctly,
so many projects violate this. With --legacy, this becomes a warning.

Change-Id: I23647e029930e11b719591cd38609e1b43247e20

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 18:41:56 +0000 (18:41 +0000)]

am ffdbf7da: (-s ours) am cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
am: f68020abf3 -s ours

* commit 'f68020abf3a51ffefcf3cd8d2043684501b6f3ce':

commit | commitdiff | tree

Lorenzo Colitti [Mon, 11 Jan 2016 18:40:55 +0000 (18:40 +0000)]

am e0c29e8e: am 0fdf7eee: Merge "Add a status bar icon for Ethernet." into mnc-dev am: 1c562bbb61
am: a4486aa875

* commit 'a4486aa875e8908b6527da9958e556651fc33ccf':

commit | commitdiff | tree

Matthew Williams [Mon, 11 Jan 2016 18:39:22 +0000 (18:39 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Andrew Flynn [Mon, 11 Jan 2016 18:39:12 +0000 (18:39 +0000)]

am 10dced7a: am ae499d19: Merge "SystemUI Carrier Network Change unit tests" into mnc-dev
am: 4aa8c7df2e

* commit '4aa8c7df2e09892c305cf9984ecf1916fa034e7f':

commit | commitdiff | tree

Matthew Williams [Mon, 11 Jan 2016 18:38:16 +0000 (18:38 +0000)]

am c341c1f7: am 303650c9: Add full backup criteria to android manifest am: ead811790e
am: 33265de780

* commit '33265de780b47e5cbc9924236e368f33d43257ee':

commit | commitdiff | tree

John Reck [Mon, 11 Jan 2016 18:36:18 +0000 (18:36 +0000)]

am 01b321de: am 05dc201f: Merge "Remove Bitmap#getSkBitmap" into mnc-dev
am: 0b1c17bd31

* commit '0b1c17bd314ab093e8455077b1740e30b6189c02':

commit | commitdiff | tree

Matthew Williams [Mon, 11 Jan 2016 18:36:15 +0000 (18:36 +0000)]

am c341c1f7: am 303650c9: Add full backup criteria to android manifest am: ead811790e
am: 33265de780

* commit '33265de780b47e5cbc9924236e368f33d43257ee':

commit | commitdiff | tree

Svet Ganov [Mon, 11 Jan 2016 18:34:19 +0000 (18:34 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Svet Ganov [Mon, 11 Jan 2016 18:33:19 +0000 (18:33 +0000)]

am 6a67cd45: am ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev am: a938239f33
am: 6f094f575e

* commit '6f094f575e8d42a08e7c9423662fb6c04f12b5fb':

commit | commitdiff | tree

John Reck [Mon, 11 Jan 2016 18:33:15 +0000 (18:33 +0000)]

am cc8418fc: am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev
am: dd447382cd

* commit 'dd447382cd2a1fb81b5d6607d25fed2c76fcd9e5':

commit | commitdiff | tree

Svet Ganov [Mon, 11 Jan 2016 18:31:18 +0000 (18:31 +0000)]

am 6a67cd45: am ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev am: a938239f33
am: 6f094f575e

* commit '6f094f575e8d42a08e7c9423662fb6c04f12b5fb':

commit | commitdiff | tree

Tor Norbye [Mon, 11 Jan 2016 18:30:26 +0000 (18:30 +0000)]

am 7a560701: am 335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev
am: 20ccf13fbc

* commit '20ccf13fbc685b96a8b1d4a59452143bec4fd711':

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 18:27:30 +0000 (18:27 +0000)]

am 577e34c9: (-s ours) am 3f2f2cbb: (-s ours) Import translations. DO NOT MERGE
am: 896262ef52 -s ours

* commit '896262ef52c5de199d1ab3e59cab4f8efc2e37e8':

commit | commitdiff | tree

Svetoslav [Mon, 11 Jan 2016 18:26:44 +0000 (18:26 +0000)]

am 0f74977b: am e9fc4cda: Merge "Add camera app op - framework" into mnc-dev am: 4e71319952
am: 857e778b8b

* commit '857e778b8bc5c552ebf51953273bb99b6dfe1f91':

commit | commitdiff | tree

Lorenzo Colitti [Mon, 11 Jan 2016 18:24:55 +0000 (18:24 +0000)]

am e0c29e8e: am 0fdf7eee: Merge "Add a status bar icon for Ethernet." into mnc-dev
am: 1c562bbb61

* commit '1c562bbb610ef83f328b53d88e4958383aea824c':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 11 Jan 2016 18:23:50 +0000 (18:23 +0000)]

Merge "Fix ninepatch scaling." into mnc-ub-dev am: 0c08fc0fc5
am: 2aebcddf02

* commit '2aebcddf02383c84a8a21279d32fd00376b8c25e':
Fix ninepatch scaling.

commit | commitdiff | tree

Jerome Gaillard [Mon, 11 Jan 2016 18:22:05 +0000 (18:22 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Matthew Williams [Mon, 11 Jan 2016 18:22:01 +0000 (18:22 +0000)]

am c341c1f7: am 303650c9: Add full backup criteria to android manifest
am: ead811790e

* commit 'ead811790e11432e994260e879edc16aa4f45297':

commit | commitdiff | tree

Jerome Gaillard [Mon, 11 Jan 2016 18:20:35 +0000 (18:20 +0000)]

Merge "Get color state list file content from PSI instead of disk" into mnc-ub-dev am: 171a2a9322
am: 1bddf2b19d

* commit '1bddf2b19dbfc3f1edc540a5aaaacd84f8831412':
Get color state list file content from PSI instead of disk

commit | commitdiff | tree

Svet Ganov [Mon, 11 Jan 2016 18:19:08 +0000 (18:19 +0000)]

am 6a67cd45: am ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev
am: a938239f33

* commit 'a938239f33f2fc615cb8e1813eb6a9773ff16c96':

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 18:19:08 +0000 (18:19 +0000)]

am 44acc73e: (-s ours) am 6b27f789: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev am: d6a9daa65e -s ours
am: ffaba5f3ec -s ours

* commit 'ffaba5f3ece78d84dae8daeeb21ad6faa76e697d':

commit | commitdiff | tree

Svetoslav [Mon, 11 Jan 2016 18:16:09 +0000 (18:16 +0000)]

am 0f74977b: am e9fc4cda: Merge "Add camera app op - framework" into mnc-dev
am: 4e71319952

* commit '4e713199526b1ddc8c8a1a518eff0d19e44a145d':

commit | commitdiff | tree

Lajos Molnar [Mon, 11 Jan 2016 18:15:19 +0000 (18:15 +0000)]

am 6a667c6f: am 4971de2a: Merge "media: hook up MediaCodec.setSurface" into mnc-dev am: fe96c1891e
am: 18e8be647d

* commit '18e8be647d9c235608c41fe065641fe7fcc43698':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 11 Jan 2016 18:15:01 +0000 (18:15 +0000)]

Merge "Fix ninepatch scaling." into mnc-ub-dev
am: 0c08fc0fc5

* commit '0c08fc0fc58be4f52527d7a0529960752056e83b':
Fix ninepatch scaling.

commit | commitdiff | tree

Mike Lockwood [Mon, 11 Jan 2016 18:13:06 +0000 (18:13 +0000)]

am 32624f29: am 5ba44aff: Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev
am: 37ba571347

* commit '37ba57134777a82227e3e12a958111d7f37beb48':

commit | commitdiff | tree

Chong Zhang [Mon, 11 Jan 2016 18:10:36 +0000 (18:10 +0000)]

am a77578d3: am 039cd7ff: Merge "MediaRecorderTest: test recording from persistent surface" into mnc-dev am: 4d3a3429d2
am: 137fba0db3

* commit '137fba0db389b6f343e9f9d6f5e9f1268a768e15':

commit | commitdiff | tree

Jerome Gaillard [Mon, 11 Jan 2016 18:10:30 +0000 (18:10 +0000)]

Merge "Get color state list file content from PSI instead of disk" into mnc-ub-dev
am: 171a2a9322

* commit '171a2a932234cdbc25ab672c5ea2285adb6eca84':
Get color state list file content from PSI instead of disk

commit | commitdiff | tree

Deepanshu Gupta [Mon, 11 Jan 2016 18:09:45 +0000 (18:09 +0000)]

Merge "Fix ninepatch scaling." into mnc-ub-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 18:09:31 +0000 (18:09 +0000)]

am e647500f: (-s ours) am 9eb25fad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
am: b38f599221 -s ours

* commit 'b38f599221e1bc56ca9bb9f510f7f8ec4495e1d2':

commit | commitdiff | tree

Chong Zhang [Mon, 11 Jan 2016 18:08:39 +0000 (18:08 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Chong Zhang [Mon, 11 Jan 2016 18:07:38 +0000 (18:07 +0000)]

am 2cfcaf48: am 1d82220a: Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev am: 0e3758333d
am: fb1f9993a7

* commit 'fb1f9993a742d0f8a46cba7e795f66324d57a334':

commit | commitdiff | tree

Geoff Mendal [Mon, 11 Jan 2016 18:06:29 +0000 (18:06 +0000)]

am 44acc73e: (-s ours) am 6b27f789: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
am: d6a9daa65e -s ours

* commit 'd6a9daa65e9237914f8877fd6d9a6965e1e39147':

commit | commitdiff | tree

Jerome Gaillard [Mon, 11 Jan 2016 18:06:10 +0000 (18:06 +0000)]

Merge "Get color state list file content from PSI instead of disk" into mnc-ub-dev

commit | commitdiff | tree

Chong Zhang [Mon, 11 Jan 2016 18:05:13 +0000 (18:05 +0000)]

am 2cfcaf48: am 1d82220a: Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev am: 0e3758333d
am: fb1f9993a7

* commit 'fb1f9993a742d0f8a46cba7e795f66324d57a334':

commit | commitdiff | tree

Lajos Molnar [Mon, 11 Jan 2016 18:03:08 +0000 (18:03 +0000)]

am 6a667c6f: am 4971de2a: Merge "media: hook up MediaCodec.setSurface" into mnc-dev
am: fe96c1891e

* commit 'fe96c1891e42a408247ff6bf8827b3c8ffb68f83':

commit | commitdiff | tree

Chris Tate [Mon, 11 Jan 2016 18:02:51 +0000 (18:02 +0000)]

am a51f14d0: Merge "Fix NPE in JobServiceContext when closing job." am: 20fb8187c4
am: f46d500984

* commit 'f46d500984e2a6eb18a153d0ca41a0f8851d2e60':

commit | commitdiff | tree

Bryce Lee [Mon, 11 Jan 2016 18:00:24 +0000 (18:00 +0000)]

am 176987b7: am 13428b50: am f626c679: am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev am: 520b550564
am: 582a9c6002

* commit '582a9c60029c7f59b545803d2d7fe16115d93c71':

commit | commitdiff | tree

Chong Zhang [Mon, 11 Jan 2016 18:00:05 +0000 (18:00 +0000)]

am a77578d3: am 039cd7ff: Merge "MediaRecorderTest: test recording from persistent surface" into mnc-dev
am: 4d3a3429d2

* commit '4d3a3429d2dced2a93fa02054fb34d2107e0364a':

commit | commitdiff | tree

Rich Slogar [Mon, 11 Jan 2016 17:58:47 +0000 (17:58 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Rich Slogar [Mon, 11 Jan 2016 17:57:33 +0000 (17:57 +0000)]

am 1705b2fd: am c2180dd5: am 31e49327: am 4e3a9193: am 7e42a822: am a00cf127: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs am: 40d0be81b7
am: a56653bb6f

* commit 'a56653bb6f0462bfdd3ae5ae6e31a62d10366354':

commit | commitdiff | tree

Chong Zhang [Mon, 11 Jan 2016 17:55:55 +0000 (17:55 +0000)]

am 1228e72b: am 03359161: MediaRecorder: implement persistent input surface APIs
am: 970be8a6eb

* commit '970be8a6eb3f1b35dee85fb26b8a49976795bfb6':

commit | commitdiff | tree

Rich Slogar [Mon, 11 Jan 2016 17:55:53 +0000 (17:55 +0000)]

commit | commitdiff | tree

Winson Chung [Mon, 11 Jan 2016 17:53:40 +0000 (17:53 +0000)]

Merge "Revert "Snap docked stack after screen rotation""

commit | commitdiff | tree

Winson Chung [Mon, 11 Jan 2016 17:53:17 +0000 (17:53 +0000)]

Revert "Snap docked stack after screen rotation"

This reverts commit e65d6bb2072471e63b93aa14a288bc59ed86208f.

Change-Id: I245aa9be3ea98ff742e02b02f6f1d344bc2e8182

commit | commitdiff | tree

Chong Zhang [Mon, 11 Jan 2016 17:52:55 +0000 (17:52 +0000)]

am 2cfcaf48: am 1d82220a: Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev
am: 0e3758333d

* commit '0e3758333de98de24b8cbb2f05fc1b53e182aa9e':

commit | commitdiff | tree

Rich Slogar [Mon, 11 Jan 2016 17:52:04 +0000 (17:52 +0000)]

am 3daee8a7: am d8417f12: am 906c4f27: am f7ef3edb: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs am: e36725b358
am: 6e5ccba67c

* commit '6e5ccba67c16e1ea3166412014bca3cc9cae4069':

commit | commitdiff | tree

Chris Tate [Mon, 11 Jan 2016 17:50:56 +0000 (17:50 +0000)]

am a51f14d0: Merge "Fix NPE in JobServiceContext when closing job."
am: 20fb8187c4

* commit '20fb8187c41cf0fd926620b9734b9211ce0c8306':
Fix NPE in JobServiceContext when closing job.

commit | commitdiff | tree

Raph Levien [Mon, 11 Jan 2016 17:49:50 +0000 (17:49 +0000)]

am 96a9c9b5: am 4bf4e4c8: Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev am: 151ccb9f58
am: 34a2b84520

* commit '34a2b84520dfae696eea1ea939ff59a0c7e117b1':

commit | commitdiff | tree

Roozbeh Pournader [Mon, 11 Jan 2016 17:48:53 +0000 (17:48 +0000)]

Merge "Support properly setting and getting LocaleLists"

commit | commitdiff | tree

Bryce Lee [Mon, 11 Jan 2016 17:48:10 +0000 (17:48 +0000)]

am 176987b7: am 13428b50: am f626c679: am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev
am: 520b550564

* commit '520b550564d9a640de655e10995a4007e836c1fa':

commit | commitdiff | tree

Yohei Yukawa [Mon, 11 Jan 2016 17:46:06 +0000 (17:46 +0000)]

am 14a60950: am b6bec1a4: Remove unused methods/variables/fields from Editor.java. am: f436e6e848
am: e19d54239a

* commit 'e19d54239a0fcd4070a5075f0c5da4b324f33fd9':

commit | commitdiff | tree

Rich Slogar [Mon, 11 Jan 2016 17:45:52 +0000 (17:45 +0000)]

am 1705b2fd: am c2180dd5: am 31e49327: am 4e3a9193: am 7e42a822: am a00cf127: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs
am: 40d0be81b7

* commit '40d0be81b720774bb05330952cfdb2d64c371a35':

commit | commitdiff | tree

Svet Ganov [Mon, 11 Jan 2016 17:44:10 +0000 (17:44 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Svet Ganov [Mon, 11 Jan 2016 17:43:25 +0000 (17:43 +0000)]

am 17daa3d0: am 574f5379: Merge "Add body sensors app op - framework base" into mnc-dev am: 107cd552f1
am: f661ca2363

* commit 'f661ca2363ab0eb1ab8704ff8fe3b085242eb2ae':

commit | commitdiff | tree

Phil Weaver [Mon, 11 Jan 2016 17:42:54 +0000 (17:42 +0000)]

Merge "Gesture dispatch from accessibility services."

commit | commitdiff | tree

Chris Craik [Mon, 11 Jan 2016 17:39:48 +0000 (17:39 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Rich Slogar [Mon, 11 Jan 2016 17:39:25 +0000 (17:39 +0000)]

am 3daee8a7: am d8417f12: am 906c4f27: am f7ef3edb: am 3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs
am: e36725b358

* commit 'e36725b3581022795562096789bc8f1d4d5c10ba':

commit | commitdiff | tree

Chris Craik [Mon, 11 Jan 2016 17:38:42 +0000 (17:38 +0000)]

am 378510c3: am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev am: 6e51a707ea
am: 132f77f0f1

* commit '132f77f0f13597e88161d6a290dc0bdf237b0234':

commit | commitdiff | tree

Ben Kwa [Mon, 11 Jan 2016 17:38:30 +0000 (17:38 +0000)]

Merge "Move the "home" root below the divider."

commit | commitdiff | tree

Chris Craik [Mon, 11 Jan 2016 17:37:15 +0000 (17:37 +0000)]

am 378510c3: am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev am: 6e51a707ea
am: 132f77f0f1

* commit '132f77f0f13597e88161d6a290dc0bdf237b0234':

commit | commitdiff | tree

Raph Levien [Mon, 11 Jan 2016 17:37:06 +0000 (17:37 +0000)]

am 741d6120: am 5c268763: Merge "Expose StaticLayout.Builder publicly" into mnc-dev
am: 86de59aa33

* commit '86de59aa33e109f237e9fc25a2bcf779dc753f0c':

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 11 Jan 2016 17:35:13 +0000 (17:35 +0000)]

am 6ae03f34: am 4eb03f8f: Merge "Remove obsolete code for App Links IntentFilterVerifier" into mnc-dev am: f157249b63
am: a86c9b1e91

* commit 'a86c9b1e9187040f4b76e3dc9962ed383547058c':

commit | commitdiff | tree

Raph Levien [Mon, 11 Jan 2016 17:34:24 +0000 (17:34 +0000)]

am 96a9c9b5: am 4bf4e4c8: Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev
am: 151ccb9f58

* commit '151ccb9f580e0082c571e50e4817ccd1cdd4379d':

commit | commitdiff | tree

Chris Craik [Mon, 11 Jan 2016 17:33:11 +0000 (17:33 +0000)]

am 3deb109a: am 5c705c59: Merge "Fix build." into mnc-dev am: 9eeb725d91
am: 315dfe735c

* commit '315dfe735cc62f92f642b57f13ec5a6dd92c0ee0':

commit | commitdiff | tree

Phil Weaver [Fri, 4 Dec 2015 23:21:35 +0000 (15:21 -0800)]

Gesture dispatch from accessibility services.

Add public APIs to describe gestures and dispatch them from
an accessibility service. Added a new capability that
services must declare to have this capability.

Bug: 22514086

Change-Id: I9bff2d9335f0310115112d14b7ed033a6d6c2393

commit | commitdiff | tree

Chris Craik [Mon, 11 Jan 2016 17:32:01 +0000 (17:32 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Yohei Yukawa [Mon, 11 Jan 2016 17:32:00 +0000 (17:32 +0000)]

am 14a60950: am b6bec1a4: Remove unused methods/variables/fields from Editor.java.
am: f436e6e848

* commit 'f436e6e8483145d25608b775c1088da4bcdea066':

commit | commitdiff | tree

Chris Craik [Mon, 11 Jan 2016 17:31:19 +0000 (17:31 +0000)]

am 2551857f: am f4ff8f70: Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev am: e920b1459a
am: e5b88bc61d

* commit 'e5b88bc61df4f73d7740ee4d6adb0726903fb92c':

commit | commitdiff | tree

Chris Craik [Mon, 11 Jan 2016 17:30:05 +0000 (17:30 +0000)]

am 2551857f: am f4ff8f70: Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev am: e920b1459a
am: e5b88bc61d

* commit 'e5b88bc61df4f73d7740ee4d6adb0726903fb92c':

commit | commitdiff | tree

Svet Ganov [Mon, 11 Jan 2016 17:30:01 +0000 (17:30 +0000)]

am 17daa3d0: am 574f5379: Merge "Add body sensors app op - framework base" into mnc-dev
am: 107cd552f1

* commit '107cd552f1d88ae22fde0284f4a64f78eaadfbc1':

commit | commitdiff | tree

Chris Craik [Mon, 11 Jan 2016 17:28:13 +0000 (17:28 +0000)]

am 3059dbb6: am 04c0f415: Merge "Update alpha documentation" into mnc-dev am: ed8623690b
am: 3eedbc0142

* commit '3eedbc0142aeeed27ec22be69c9c6a4e049efb04':

commit | commitdiff | tree

Chris Craik [Mon, 11 Jan 2016 17:27:51 +0000 (17:27 +0000)]

am 378510c3: am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev
am: 6e51a707ea

* commit '6e51a707ea986102fb507bfdf00d2a4dddee70f7':

commit | commitdiff | tree

Jorim Jaggi [Mon, 11 Jan 2016 17:26:36 +0000 (17:26 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Jorim Jaggi [Mon, 11 Jan 2016 17:25:53 +0000 (17:25 +0000)]

am 3f5f1cb6: am 0629a5d5: Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev am: 83fb90f61f
am: 93569d8b3b

* commit '93569d8b3b419ede239326197e2b71a31c9a9bba':

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 11 Jan 2016 17:25:39 +0000 (17:25 +0000)]

am 6ae03f34: am 4eb03f8f: Merge "Remove obsolete code for App Links IntentFilterVerifier" into mnc-dev
am: f157249b63

* commit 'f157249b63ea77d568856cfc4961156ae23f236c':

commit | commitdiff | tree

Jorim Jaggi [Mon, 11 Jan 2016 17:24:01 +0000 (17:24 +0000)]

am 3f5f1cb6: am 0629a5d5: Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev am: 83fb90f61f
am: 93569d8b3b

* commit '93569d8b3b419ede239326197e2b71a31c9a9bba':

commit | commitdiff | tree

Chris Craik [Mon, 11 Jan 2016 17:23:16 +0000 (17:23 +0000)]

am 3deb109a: am 5c705c59: Merge "Fix build." into mnc-dev
am: 9eeb725d91

* commit '9eeb725d91beeaec6631ec73e5856795dcdada73':

commit | commitdiff | tree

Mathieu Chartier [Mon, 11 Jan 2016 17:22:39 +0000 (17:22 +0000)]

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

commit | commitdiff | tree

Mathieu Chartier [Mon, 11 Jan 2016 17:21:45 +0000 (17:21 +0000)]

am 5cc626bb: Merge "Look at map extensions before /dev/ + ashmem." am: eec5a4e7a4
am: 661863dd42

* commit '661863dd426eba13f948e4caaa60c04ae96815f1':

commit | commitdiff | tree

Winson Chung [Mon, 11 Jan 2016 17:20:18 +0000 (17:20 +0000)]

Merge "Snap docked stack after screen rotation"

commit | commitdiff | tree

Chris Craik [Mon, 11 Jan 2016 17:17:59 +0000 (17:17 +0000)]

am 2551857f: am f4ff8f70: Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev
am: e920b1459a

* commit 'e920b1459a0ecd4240df78a616b56c0230446c5c':