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

173927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
b9470f3a23 am 9490c597: am bae051f6: Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev 
* commit '9490c597460a2fcaaf0d510576f4f752b7a725ce':
  Use consistent logic for data icon overlays.
 2015-01-27 22:09:08 +00:00
Tim Kilbourn
597bb6968b Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev 2015-01-27 22:03:50 +00:00
Jeff Davidson
9490c59746 am bae051f6: Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev 
* commit 'bae051f6bd8ae4f103d8067ed96accbced173664':
  Use consistent logic for data icon overlays.
 2015-01-27 22:03:24 +00:00
Leon Scroggins III
01287549ad am 9a6143fa: Handle bad ninepatch data. 
* commit '9a6143fab7d93797e4b22a12b89e07c160e5c31d':
  Handle bad ninepatch data.
 2015-01-27 22:01:08 +00:00
Jeff Davidson
bae051f6bd Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev 2015-01-27 21:57:06 +00:00
Christopher Tate
57792912ee Fix 'always' preferred app assignment 
In the case when some possible resolutions of a given intent are at
different priorities (typically when they're intended as fallbacks when
no "normal" handler for the intent exists) the check for "is this the
same set of possible handlers that we saw last time?" was broken.  We
now ignore resolver priority entirely in that check: match set comparison
should be orthogonal to prioritization within the set, and indeed the
priority is dealt with separately in any event.

Bug 19011225

Change-Id: I3c1658442cc88b1f4a5c5f2fe9f64472799e156c
 2015-01-27 13:52:17 -08:00
Tim Kilbourn
9626854543 Add a config for whether to start in touch mode. 
Bug: 18925810
Change-Id: Ic9b956cde380cffcad7ca229f1669692b1743e6d
 2015-01-27 13:51:58 -08:00
Ricardo Cervera
3c6cd6273c am 8ff85c5e: am be3731f0: am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class. 
* commit '8ff85c5ecb09f297d8926bae5ad09f0423594ed0':
  docs: Transitions training class.
 2015-01-27 21:43:26 +00:00
Ricardo Cervera
8ff85c5ecb am be3731f0: am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class. 
* commit 'be3731f028cf815d51e7c49b7415d7d1e8ac3639':
  docs: Transitions training class.
 2015-01-27 21:34:45 +00:00
Ricardo Cervera
be3731f028 am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class. 
* commit 'f5386a9a949297be1321cce7eed5d0975c7b64ad':
  docs: Transitions training class.
 2015-01-27 21:28:14 +00:00
Ricardo Cervera
f5386a9a94 am 8ec3eb4e: am de113066: docs: Transitions training class. 
* commit '8ec3eb4e7c38c3c368c62bc47805d802df15f2a8':
  docs: Transitions training class.
 2015-01-27 21:23:19 +00:00
Ricardo Cervera
8ec3eb4e7c am de113066: docs: Transitions training class. 
* commit 'de113066d80c3f19979eb531484af73f64640de9':
  docs: Transitions training class.
 2015-01-27 21:16:53 +00:00
Craig Mautner
bf6af73de6 am 604a9e28: am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev 
* commit '604a9e280e8273f6ed1f1a50724c0d510cf09bb0':
  Defer tap outside stack until multiwindows
 2015-01-27 21:00:29 +00:00
Craig Mautner
604a9e280e am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev 
* commit '5426e7ae93e0e728e0e12bc98a02c957d464cfe0':
  Defer tap outside stack until multiwindows
 2015-01-27 20:54:42 +00:00
Jason Sams
45e6c8b312 am 02236295: am 4dd0cf42: Merge "Initialize clipping structure" 
* commit '02236295a43380b21e4cae10b13da3398d607627':
  Initialize clipping structure
 2015-01-27 20:54:08 +00:00
Craig Mautner
5426e7ae93 Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev 2015-01-27 20:48:55 +00:00
Jason Sams
02236295a4 am 4dd0cf42: Merge "Initialize clipping structure" 
* commit '4dd0cf42f5941d9e25aa042bf75fa003b1f5ec76':
  Initialize clipping structure
 2015-01-27 20:48:04 +00:00
Jason Sams
4dd0cf42f5 Merge "Initialize clipping structure" 2015-01-27 20:41:43 +00:00
Marco Nelissen
2c2415a552 am 3ea395dd: am 4e853598: Merge "Fix printf format" 
* commit '3ea395ddc7785bf8fb6df1e5e6ed142c9336a7eb':
  Fix printf format
 2015-01-27 20:33:09 +00:00
Marco Nelissen
3ea395ddc7 am 4e853598: Merge "Fix printf format" 
* commit '4e85359879cb417f0540a5cfbf91242ebd9546c7':
  Fix printf format
 2015-01-27 20:25:59 +00:00
Marco Nelissen
4e85359879 Merge "Fix printf format" 2015-01-27 20:19:46 +00:00
Marco Nelissen
6cd6110773 Fix printf format 
Change-Id: Ied2f10bb59fe0e13b23bf1f9913ab3b081348a28
 2015-01-27 12:17:48 -08:00
Craig Mautner
baf6bef001 Defer tap outside stack until multiwindows 
Taps outside of the stack boundary were causing the current app to
lose focus. This led to timeouts waiting for the app to respond.

Disabling the tap recognition keeps the focus from changing. It will
be reenabled for multiwindows.

Fixes bug 17721767.

Change-Id: Iad854b19979390e73b97239e489ad7ef82e03d47
 2015-01-27 11:44:59 -08:00
Ricardo Cervera
de113066d8 docs: Transitions training class. 
Change-Id: Ib41b42a890c44fdc001242bc356442ef9201b591
 2015-01-27 11:35:20 -08:00
Leon Scroggins III
9a6143fab7 Handle bad ninepatch data. 
Changes proposed by Ben Hawkes of Google Project Zero.

NinePatchPeeker.cpp:
Instead of asserting, return false for bad data.

ResourceTypes.h:
Store ninepatch values as unsigned.

BUG:19151999
Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
(cherry picked from commit a730ef3f77fc495bc90199b4d45efab26d609782)
 2015-01-27 19:04:57 +00:00
Leon Scroggins III
847514499f am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev 
* commit '3523e4fcb3c74a5dee2f4497e2b8ec7b9e2b5e57':
  Handle bad ninepatch data.
 2015-01-27 18:33:46 +00:00
Marco Nelissen
6e14c5705c am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec" 
* commit '99985d98c23b32acc0014031d7b88ee4eed21a4b':
  Make SoundPool use MediaCodec
 2015-01-27 18:28:53 +00:00
Leon Scroggins III
3523e4fcb3 am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev 
* commit 'efe085ffbd97b6f9d1460a9642084a6d3be11797':
  Handle bad ninepatch data.
 2015-01-27 18:27:18 +00:00
Matthew Xie
e213c6813e am 46c3304a: am 485813a0: Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev 
* commit '46c3304aed2cabb592e499b0b3de56a312e1d67f':
  Delay the second message for 30ms more than the last message for a2dp
 2015-01-27 18:22:57 +00:00
Leon Scroggins III
efe085ffbd Merge "Handle bad ninepatch data." into lmp-mr1-dev 2015-01-27 18:22:42 +00:00
Matthew Xie
46c3304aed am 485813a0: Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev 
* commit '485813a00cfd857fadab30c67cab985835857801':
  Delay the second message for 30ms more than the last message for a2dp
 2015-01-27 18:17:00 +00:00
Matthew Xie
485813a00c Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev 2015-01-27 18:13:40 +00:00
Marco Nelissen
99985d98c2 am e74da38e: Merge "Make SoundPool use MediaCodec" 
* commit 'e74da38e21a320528d0c94d076e59bd503c37623':
  Make SoundPool use MediaCodec
 2015-01-27 17:53:03 +00:00
Marco Nelissen
e74da38e21 Merge "Make SoundPool use MediaCodec" 2015-01-27 17:49:02 +00:00
Leon Scroggins III
a730ef3f77 Handle bad ninepatch data. 
Changes proposed by Ben Hawkes of Google Project Zero.

NinePatchPeeker.cpp:
Instead of asserting, return false for bad data.

ResourceTypes.h:
Store ninepatch values as unsigned.

BUG:19151999
Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
 2015-01-27 16:41:16 +00:00
George Mount
5c25f5b0a7 am fff84a23: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev automerge: aa6945a 
* commit 'fff84a232a964a8587eabee4e34cc38344309593':
  Activity Transition: fix quick back after enter.
 2015-01-27 15:21:23 +00:00
George Mount
fff84a232a Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev 
automerge: aa6945a

* commit 'aa6945ac7904611499ae4ad33799d1f1fe434d32':
  Activity Transition: fix quick back after enter.
 2015-01-27 15:15:38 +00:00
George Mount
aa6945ac79 Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev 2015-01-27 15:13:32 +00:00
Lorenzo Colitti
94615260a8 am b84e0040: am 525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev 
* commit 'b84e0040d8c2f44790e7ceeda8cddf3524f33d29':
  Make NetworkMonitor less aggressive on broken networks.
 2015-01-27 11:55:51 +00:00
Lorenzo Colitti
b84e0040d8 am 525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev 
* commit '525588c593794cf52d93665e9cf55f06abd3d1b7':
  Make NetworkMonitor less aggressive on broken networks.
 2015-01-27 11:46:31 +00:00
Lorenzo Colitti
525588c593 Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev 2015-01-27 11:41:10 +00:00
Yabin Cui
3a10a672f0 am f7049289: am 3812e68e: Merge "kill HAVE_PTHREADS." 
* commit 'f70492898b3efa3c5f480f195062fa6f293bc764':
  kill HAVE_PTHREADS.
 2015-01-27 07:04:55 +00:00
Yabin Cui
f70492898b am 3812e68e: Merge "kill HAVE_PTHREADS." 
* commit '3812e68ea788782c54c27f69d08bcc1419066cb2':
  kill HAVE_PTHREADS.
 2015-01-27 06:54:06 +00:00
Yabin Cui
3812e68ea7 Merge "kill HAVE_PTHREADS." 2015-01-27 06:49:16 +00:00
Yabin Cui
1610486d37 kill HAVE_PTHREADS. 
Bug: 19083585
Change-Id: Ib466949bb6cd6d1bbc4680e989f0f9fae62ca564
 2015-01-26 22:32:38 -08:00
Svetoslav
3fd1ebff6c am fcecdccc: am 369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev 
* commit 'fcecdccc0f24b9c9447fe5bd69c31ca29c35d5c8':
  Add a missing file to print spooler resources
 2015-01-27 04:36:37 +00:00
Svetoslav
e5743753ee am 55120a0f: am 197adec3: Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev 
* commit '55120a0f1acb9a46dc56bbdab877bc2c635f1356':
  Accessibility: Ignore overlapping siblings when computing a click location
 2015-01-27 04:36:31 +00:00
Svetoslav
fcecdccc0f am 369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev 
* commit '369f1ec6ea78637870f35822456628e7ae8caf95':
  Add a missing file to print spooler resources
 2015-01-27 04:26:55 +00:00
Svetoslav
55120a0f1a am 197adec3: Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev 
* commit '197adec3656fc087d4aa56396e601bb8d04aa9fd':
  Accessibility: Ignore overlapping siblings when computing a click location
 2015-01-27 04:26:51 +00:00
Svetoslav
369f1ec6ea Merge "Add a missing file to print spooler resources" into lmp-mr1-dev 2015-01-27 04:24:08 +00:00