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

220154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach Kuznia
60547db581 Merge "Move stroke buffer and gesture recognition out of TouchExplorer." 2015-10-21 00:26:25 +00:00
Zachary Kuznia
407df712e2 Move stroke buffer and gesture recognition out of TouchExplorer. 
This also adds a return value to the callbacks on
AccessibilityGestureDetector.Listener, so that the listener can indicate if the
event has been consumed, and processing should be halted.

b/25021896

Change-Id: If4d366ff207c1cebd0e3f7dab5f27a2037ddb510
 2015-10-20 17:22:47 -07:00
Chris Craik
5fde3d4363 Merge "Add initial OpReorderer benchmarks" 2015-10-21 00:20:47 +00:00
Chris Craik
0a24b146cd Add initial OpReorderer benchmarks 
Change-Id: I6ca8ea89be2159331b2ad7031769c65f54161918
 2015-10-20 17:19:33 -07:00
Rob Carr
e7413fc53f Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev am: 9ada400e98 am: 894dd2b078 
am: a153a8072c

* commit 'a153a8072c0a28c36db2489a2ba13b1fc8e179db':
  Catch exceptions thrown by pending activity launches.
 2015-10-21 00:06:43 +00:00
Rob Carr
a153a8072c Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev am: 9ada400e98 
am: 894dd2b078

* commit '894dd2b078a5808704f462023c8fcb00b5579ef0':
  Catch exceptions thrown by pending activity launches.
 2015-10-20 23:59:11 +00:00
Matthew Williams
9e7d8c714d Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev am: cf43b5523f am: 07de80bd87 am: 4e18ec7343 
am: f012481a44  -s ours

* commit 'f012481a4442cb0289a7d77444c59d7f0041eb18':
  DO NOT MERGE Race condition in JobServiceContext
 2015-10-20 23:56:28 +00:00
Alan Viverette
668895acc4 Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev am: 4823493647 am: ac02be311d am: 41707942a8 
am: e21329ad86  -s ours

* commit 'e21329ad86a7877484fdaa5e6bdc941c2745ad36':
  DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
 2015-10-20 23:55:04 +00:00
Matthew Williams
cd38651e7d DO NOT MERGE Sync extras bundle comparison can throw NPE am: 7d7a2254bc am: cb937cbc6a am: d7d56a4feb 
am: c31529097d  -s ours

* commit 'c31529097de3011cb2145d7bc4b609c2ddc69d41':
  DO NOT MERGE Sync extras bundle comparison can throw NPE
 2015-10-20 23:53:32 +00:00
Elliott Hughes
46a114dfcf Merge "Fix lseek argument order." am: 12dccb8a24 am: 9bbe41642a 
am: 2876b1f169

* commit '2876b1f169e5342e46b27f3f94a8816837c9f61a':
  Fix lseek argument order.
 2015-10-20 23:51:55 +00:00
Rob Carr
894dd2b078 Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev 
am: 9ada400e98

* commit '9ada400e98451d3ff39ea284be5c205c8c8a3f95':
  Catch exceptions thrown by pending activity launches.
 2015-10-20 23:51:23 +00:00
Rob Carr
d1e0f4601c Merge "Correct ActivityInfo constructors." into mnc-dr-dev am: cfea184d6c am: e2a49862c1 am: 8caf80d571 
am: 2d021f9f48

* commit '2d021f9f48e8792181d13c269cc4d2484a62e040':
  Correct ActivityInfo constructors.
 2015-10-20 23:49:55 +00:00
Abodunrinwa Toki
c8d8288832 Merge "Re-set PROCESS_TEXT selection if nothing was returned." into mnc-dr-dev am: 3bd3655fd0 am: 9e97c20ed9 am: 0eef4ab567 
am: 4d14e65cdf

* commit '4d14e65cdf968ba43e47fe79e7b6d7e62d8b2ed1':
  Re-set PROCESS_TEXT selection if nothing was returned.
 2015-10-20 23:48:20 +00:00
Jeff Sharkey
7e94976cb2 Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 
am: d0fd8cbd1d

* commit 'd0fd8cbd1d1fcfe85c7b03821c2dc400395c9900':
 2015-10-20 23:46:27 +00:00
Filip Gruszczynski
c25f26a1d5 Merge "Fix recents from/to full screen app transition." 2015-10-20 23:33:16 +00:00
Rob Carr
9ada400e98 Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev 2015-10-20 23:30:12 +00:00
Pavel Zhamaitsiak
b4faf348f1 Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag 
Bug: 23731243
Change-Id: I3e08469ef293f0b619f95dd9fb48e8c582926270
 2015-10-20 23:28:12 +00:00
Jeff Sharkey
87073654df resolve merge conflicts of 27ddeff723 to master. 
Change-Id: I6dad081fc6dfafb78d5bd73d84e184bae7f6fd1b
 2015-10-20 16:17:21 -07:00
Jeff Sharkey
e3aafb7917 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-20 23:13:44 +00:00
Jeff Sharkey
4d8c509269 Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 
am: 272da5f8cf

* commit '272da5f8cf7f558bd239443e16347b4de0feda1a':
 2015-10-20 23:13:20 +00:00
Jeff Sharkey
c659171dd9 Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp 
am: 272da5f8cf

* commit '272da5f8cf7f558bd239443e16347b4de0feda1a':
 2015-10-20 23:10:44 +00:00
Jeff Sharkey
71f9a6f7a9 Merge "Ignore network policies with missing IMSI." into mnc-dr-dev am: 38463bb950 am: 5d7604323f am: 3b30aae6e7 
am: 647afb199e

* commit '647afb199eb60f20bf3dcc49d48bffd46bb2d0d5':
  Ignore network policies with missing IMSI.
 2015-10-20 23:08:08 +00:00
Alan Viverette
f670e6f493 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-10-20 23:04:39 +00:00
Alan Viverette
4fa91b18b6 Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev am: 840f38905c am: e3d745291e am: c3e46adc77 
am: 27c5cbe5a8

* commit '27c5cbe5a87e618f7f8eafce90559525f4c2d70b':
  Update drawable matrix when bounds change in invalidateDrawable()
 2015-10-20 23:04:11 +00:00
Alan Viverette
dee8f53a40 Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev am: 840f38905c am: e3d745291e am: c3e46adc77 
am: 27c5cbe5a8

* commit '27c5cbe5a87e618f7f8eafce90559525f4c2d70b':
  Update drawable matrix when bounds change in invalidateDrawable()
 2015-10-20 23:00:26 +00:00
Kevin Cernekee
fc5c6090ec Merge "ignore initial request to disable iptable chain" into mnc-dr-dev am: 3554d62ca0 am: d166333eb5 
am: a3625076e5

* commit 'a3625076e58bbcf4909a9c17ce18948020e65ac3':
  ignore initial request to disable iptable chain
 2015-10-20 22:59:44 +00:00
George Mount
933dec6a2b Merge "Set the bounds on the drawable for ChangeBounds reparenting." into mnc-dr-dev am: 1313020acc am: ee15f087db am: bc71059223 
am: aa4ffbc7cb

* commit 'aa4ffbc7cb54a5abf2d847ec0d43d1eca47de927':
  Set the bounds on the drawable for ChangeBounds reparenting.
 2015-10-20 22:57:59 +00:00
Matthew Williams
f012481a44 Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev am: cf43b5523f am: 07de80bd87 
am: 4e18ec7343

* commit '4e18ec7343ff91f0112dc0fedab6ea720857a6f5':
  DO NOT MERGE Race condition in JobServiceContext
 2015-10-20 22:57:06 +00:00
Michael Wright
244f776855 resolve merge conflicts of f013c3f111 to master. 
Change-Id: I2045187f8fa948a1733cb9a2cdc0a69ae97b5907
 2015-10-20 23:48:55 +01:00
Kevin Cernekee
a3625076e5 Merge "ignore initial request to disable iptable chain" into mnc-dr-dev am: 3554d62ca0 
am: d166333eb5

* commit 'd166333eb5d3886a18a3a951d833a6d01cb8340d':
  ignore initial request to disable iptable chain
 2015-10-20 22:36:49 +00:00
Matthew Williams
4e18ec7343 Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev am: cf43b5523f 
am: 07de80bd87

* commit '07de80bd873c80dfcdaed5b992ac0ff01ed41483':
  DO NOT MERGE Race condition in JobServiceContext
 2015-10-20 22:34:18 +00:00
Alan Viverette
e21329ad86 Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev am: 4823493647 am: ac02be311d 
am: 41707942a8

* commit '41707942a8aea8c9122482f28f2fd599e55d0791':
  DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
 2015-10-20 22:27:25 +00:00
Todd Kennedy
44b54aff3a Merge "update system api" 2015-10-20 22:25:25 +00:00
Todd Kennedy
14dcd07726 update system api 
Change-Id: Id5ba26efe0281ed9e4b8410f266fb41f7fde8479
 2015-10-20 15:23:40 -07:00
Kevin Cernekee
d166333eb5 Merge "ignore initial request to disable iptable chain" into mnc-dr-dev 
am: 3554d62ca0

* commit '3554d62ca02bf6bc7777d1b22699876ec388fe6c':
  ignore initial request to disable iptable chain
 2015-10-20 22:18:22 +00:00
Matthew Williams
07de80bd87 Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev 
am: cf43b5523f

* commit 'cf43b5523fd12fdc69ea25cb6dbf5e95724927ec':
  DO NOT MERGE Race condition in JobServiceContext
 2015-10-20 22:15:36 +00:00
Kevin Cernekee
3554d62ca0 Merge "ignore initial request to disable iptable chain" into mnc-dr-dev 2015-10-20 22:11:29 +00:00
Alan Viverette
41707942a8 Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev am: 4823493647 
am: ac02be311d

* commit 'ac02be311dce2ad8144429753419ca8659aa46b6':
  DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
 2015-10-20 22:09:16 +00:00
Matthew Williams
cf43b5523f Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev 2015-10-20 22:03:17 +00:00
Alan Viverette
ac02be311d Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev 
am: 4823493647

* commit '482349364715dfcd87dc83e0913fc60dc6df0497':
  DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
 2015-10-20 21:56:40 +00:00
Ben Kwa
bd96456d11 Implement enter key support for DocumentsUI. 
- Add a click handler that basically handles all cases (including the
  enter key) of Items being clicked.
- Open the focused file in non-select mode, toggle selection if in
  selection mode.
- Remove now-redundant onSingleTapUp handlers.
- Redo focus indicator, since it's now possible to toggle selection on
  the focused file.
- Don't dismiss selection on arrow-key navigation.

BUG=24705453
BUG=25114155

Change-Id: Iba74188514ecf2bc6b56573087e3c3ccc83f85d2
 2015-10-20 14:53:12 -07:00
Robert Carr
f1ddb5e090 Catch exceptions thrown by pending activity launches. 
When we perform pendign activity launches from the handler
thread (as opposed to the a client binder thread), we must
take care exceptions from such will not bring the system
server down.

Bug: 24983901
Change-Id: I0e75f6b51bf6172a8e1b9cccc5fffb9d50c63e30
 2015-10-20 21:51:26 +00:00
Alan Viverette
4823493647 Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev 2015-10-20 21:44:35 +00:00
Matthew Williams
f5e045254a DO NOT MERGE Race condition in JobServiceContext 
BUG: 23981171
JobServiceContext has a reference to the running job which
1) needs to be copied before providing access to outside callers
2) was not guarded by a lock in one case which might result in an NPE

Change-Id: I7eb04052f3fe63e7b386c564a6bdebf9144e976a
(cherry picked from commit 0cc7654e109d232e5d9a9de06482d8d349a21f28)
 2015-10-20 21:44:26 +00:00
Matthew Williams
7019d8bfcd Merge "Race condition in JobServiceContext" 2015-10-20 21:43:44 +00:00
Todd Kennedy
04d6a65f51 Merge "Retain fragment loaders" into mnc-dr-dev am: ad968cf4e5 am: 6320767fb1 am: 02940eb47f 
am: 186fcb8b64

* commit '186fcb8b648edd31f7a59a358587264659e84f4f':
  Retain fragment loaders
 2015-10-20 21:38:55 +00:00
Alan Viverette
b5817779a9 DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure 
Bug: 22824701
Bug: 25107144
Change-Id: Ia0afd3edc20b8127605aef2653fa9b5472f41be2
(cherry picked from commit 130ce740d1aa4b9a7b024c76f8adec2c24278a81)
 2015-10-20 17:29:39 -04:00
Todd Kennedy
2fbd20fd7b Merge "Enable "quick install"" 2015-10-20 21:25:24 +00:00
John Reck
d0374c6b25 Fix a few view ctors to not call Looper.myLooper 
Bug: 25116730
Change-Id: I4e394c281feef6f7987433298d66f2df11352416
 2015-10-20 14:20:33 -07:00
Alan Viverette
924a4a1a56 Merge "Apply density scaling when updating from typed array" 2015-10-20 21:20:29 +00:00