drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
229,293 Commits 1 Branch 0 Tags
Commit Graph

229293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chong Zhang
07a85951c4 am a77578d3: am 039cd7ff: Merge "MediaRecorderTest: test recording from persistent surface" into mnc-dev am: 4d3a3429d2 
am: 137fba0db3

* commit '137fba0db389b6f343e9f9d6f5e9f1268a768e15':
 2016-01-11 18:10:36 +00:00
Jerome Gaillard
1bddf2b19d 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
 2016-01-11 18:10:30 +00:00
Deepanshu Gupta
0c08fc0fc5 Merge "Fix ninepatch scaling." into mnc-ub-dev 2016-01-11 18:09:45 +00:00
Geoff Mendal
1c3098e627 am e647500f: (-s ours) am 9eb25fad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
am: b38f599221  -s ours

* commit 'b38f599221e1bc56ca9bb9f510f7f8ec4495e1d2':
 2016-01-11 18:09:31 +00:00
Chong Zhang
3f918f5279 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 18:08:39 +00:00
Chong Zhang
56a221a9d9 am 2cfcaf48: am 1d82220a: Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev am: 0e3758333d 
am: fb1f9993a7

* commit 'fb1f9993a742d0f8a46cba7e795f66324d57a334':
 2016-01-11 18:07:38 +00:00
Geoff Mendal
ffaba5f3ec am 44acc73e: (-s ours) am 6b27f789: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
am: d6a9daa65e  -s ours

* commit 'd6a9daa65e9237914f8877fd6d9a6965e1e39147':
 2016-01-11 18:06:29 +00:00
Jerome Gaillard
171a2a9322 Merge "Get color state list file content from PSI instead of disk" into mnc-ub-dev 2016-01-11 18:06:10 +00:00
Chong Zhang
0e37b1dbaf am 2cfcaf48: am 1d82220a: Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev am: 0e3758333d 
am: fb1f9993a7

* commit 'fb1f9993a742d0f8a46cba7e795f66324d57a334':
 2016-01-11 18:05:13 +00:00
Lajos Molnar
18e8be647d am 6a667c6f: am 4971de2a: Merge "media: hook up MediaCodec.setSurface" into mnc-dev 
am: fe96c1891e

* commit 'fe96c1891e42a408247ff6bf8827b3c8ffb68f83':
 2016-01-11 18:03:08 +00:00
Chris Tate
07c0abf4cc am a51f14d0: Merge "Fix NPE in JobServiceContext when closing job." am: 20fb8187c4 
am: f46d500984

* commit 'f46d500984e2a6eb18a153d0ca41a0f8851d2e60':
 2016-01-11 18:02:51 +00:00
Bryce Lee
0606ff6a16 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':
 2016-01-11 18:00:24 +00:00
Chong Zhang
137fba0db3 am a77578d3: am 039cd7ff: Merge "MediaRecorderTest: test recording from persistent surface" into mnc-dev 
am: 4d3a3429d2

* commit '4d3a3429d2dced2a93fa02054fb34d2107e0364a':
 2016-01-11 18:00:05 +00:00
Rich Slogar
b0dbff455d Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 17:58:47 +00:00
Rich Slogar
50aef84dbd 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':
 2016-01-11 17:57:33 +00:00
Chong Zhang
0628607494 am 1228e72b: am 03359161: MediaRecorder: implement persistent input surface APIs 
am: 970be8a6eb

* commit '970be8a6eb3f1b35dee85fb26b8a49976795bfb6':
 2016-01-11 17:55:55 +00:00
Rich Slogar
fbe351ce91 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':
 2016-01-11 17:55:53 +00:00
Winson Chung
d0b0fa16a3 Merge "Revert "Snap docked stack after screen rotation"" 2016-01-11 17:53:40 +00:00
Winson Chung
3dc52ed179 Revert "Snap docked stack after screen rotation" 
This reverts commit e65d6bb2072471e63b93aa14a288bc59ed86208f.

Change-Id: I245aa9be3ea98ff742e02b02f6f1d344bc2e8182
 2016-01-11 17:53:17 +00:00
Chong Zhang
fb1f9993a7 am 2cfcaf48: am 1d82220a: Merge "MediaCodec: implement persistent input surface APIs" into mnc-dev 
am: 0e3758333d

* commit '0e3758333de98de24b8cbb2f05fc1b53e182aa9e':
 2016-01-11 17:52:55 +00:00
Rich Slogar
51df6b88f4 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':
 2016-01-11 17:52:04 +00:00
Chris Tate
f46d500984 am a51f14d0: Merge "Fix NPE in JobServiceContext when closing job." 
am: 20fb8187c4

* commit '20fb8187c41cf0fd926620b9734b9211ce0c8306':
  Fix NPE in JobServiceContext when closing job.
 2016-01-11 17:50:56 +00:00
Raph Levien
c9480eeec9 am 96a9c9b5: am 4bf4e4c8: Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev am: 151ccb9f58 
am: 34a2b84520

* commit '34a2b84520dfae696eea1ea939ff59a0c7e117b1':
 2016-01-11 17:49:50 +00:00
Roozbeh Pournader
a514b63749 Merge "Support properly setting and getting LocaleLists" 2016-01-11 17:48:53 +00:00
Bryce Lee
582a9c6002 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':
 2016-01-11 17:48:10 +00:00
Yohei Yukawa
7111232533 am 14a60950: am b6bec1a4: Remove unused methods/variables/fields from Editor.java. am: f436e6e848 
am: e19d54239a

* commit 'e19d54239a0fcd4070a5075f0c5da4b324f33fd9':
 2016-01-11 17:46:06 +00:00
Rich Slogar
a56653bb6f 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':
 2016-01-11 17:45:52 +00:00
Svet Ganov
ed98649d80 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 17:44:10 +00:00
Svet Ganov
d369ac8a4f am 17daa3d0: am 574f5379: Merge "Add body sensors app op - framework base" into mnc-dev am: 107cd552f1 
am: f661ca2363

* commit 'f661ca2363ab0eb1ab8704ff8fe3b085242eb2ae':
 2016-01-11 17:43:25 +00:00
Phil Weaver
0ff7f17984 Merge "Gesture dispatch from accessibility services." 2016-01-11 17:42:54 +00:00
Chris Craik
da0d3f2801 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 17:39:48 +00:00
Rich Slogar
6e5ccba67c 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':
 2016-01-11 17:39:25 +00:00
Chris Craik
7b93cbc120 am 378510c3: am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev am: 6e51a707ea 
am: 132f77f0f1

* commit '132f77f0f13597e88161d6a290dc0bdf237b0234':
 2016-01-11 17:38:42 +00:00
Ben Kwa
22f5fce70b Merge "Move the "home" root below the divider." 2016-01-11 17:38:30 +00:00
Chris Craik
47eef704d1 am 378510c3: am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev am: 6e51a707ea 
am: 132f77f0f1

* commit '132f77f0f13597e88161d6a290dc0bdf237b0234':
 2016-01-11 17:37:15 +00:00
Raph Levien
de7b4fe9b8 am 741d6120: am 5c268763: Merge "Expose StaticLayout.Builder publicly" into mnc-dev 
am: 86de59aa33

* commit '86de59aa33e109f237e9fc25a2bcf779dc753f0c':
 2016-01-11 17:37:06 +00:00
Fabrice Di Meglio
ef2a42b09c am 6ae03f34: am 4eb03f8f: Merge "Remove obsolete code for App Links IntentFilterVerifier" into mnc-dev am: f157249b63 
am: a86c9b1e91

* commit 'a86c9b1e9187040f4b76e3dc9962ed383547058c':
 2016-01-11 17:35:13 +00:00
Raph Levien
34a2b84520 am 96a9c9b5: am 4bf4e4c8: Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev 
am: 151ccb9f58

* commit '151ccb9f580e0082c571e50e4817ccd1cdd4379d':
 2016-01-11 17:34:24 +00:00
Chris Craik
4b091e36b9 am 3deb109a: am 5c705c59: Merge "Fix build." into mnc-dev am: 9eeb725d91 
am: 315dfe735c

* commit '315dfe735cc62f92f642b57f13ec5a6dd92c0ee0':
 2016-01-11 17:33:11 +00:00
Phil Weaver
a6b64f5099 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
 2016-01-11 09:32:43 -08:00
Chris Craik
b2e8fa783e Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 17:32:01 +00:00
Yohei Yukawa
e19d54239a am 14a60950: am b6bec1a4: Remove unused methods/variables/fields from Editor.java. 
am: f436e6e848

* commit 'f436e6e8483145d25608b775c1088da4bcdea066':
 2016-01-11 17:32:00 +00:00
Chris Craik
83cc08b381 am 2551857f: am f4ff8f70: Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev am: e920b1459a 
am: e5b88bc61d

* commit 'e5b88bc61df4f73d7740ee4d6adb0726903fb92c':
 2016-01-11 17:31:19 +00:00
Chris Craik
c4413f9360 am 2551857f: am f4ff8f70: Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev am: e920b1459a 
am: e5b88bc61d

* commit 'e5b88bc61df4f73d7740ee4d6adb0726903fb92c':
 2016-01-11 17:30:05 +00:00
Svet Ganov
f661ca2363 am 17daa3d0: am 574f5379: Merge "Add body sensors app op - framework base" into mnc-dev 
am: 107cd552f1

* commit '107cd552f1d88ae22fde0284f4a64f78eaadfbc1':
 2016-01-11 17:30:01 +00:00
Chris Craik
0e34531d12 am 3059dbb6: am 04c0f415: Merge "Update alpha documentation" into mnc-dev am: ed8623690b 
am: 3eedbc0142

* commit '3eedbc0142aeeed27ec22be69c9c6a4e049efb04':
 2016-01-11 17:28:13 +00:00
Chris Craik
132f77f0f1 am 378510c3: am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev 
am: 6e51a707ea

* commit '6e51a707ea986102fb507bfdf00d2a4dddee70f7':
 2016-01-11 17:27:51 +00:00
Jorim Jaggi
a44f27a677 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 17:26:36 +00:00
Jorim Jaggi
cd7e71ea50 am 3f5f1cb6: am 0629a5d5: Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev am: 83fb90f61f 
am: 93569d8b3b

* commit '93569d8b3b419ede239326197e2b71a31c9a9bba':
 2016-01-11 17:25:53 +00:00
Fabrice Di Meglio
a86c9b1e91 am 6ae03f34: am 4eb03f8f: Merge "Remove obsolete code for App Links IntentFilterVerifier" into mnc-dev 
am: f157249b63

* commit 'f157249b63ea77d568856cfc4961156ae23f236c':
 2016-01-11 17:25:39 +00:00