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

84837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
96d7213f1f am f80de4ca: am a99e4caa: Merge "Bind to screenshot service for current user." into jb-mr1-dev 
* commit 'f80de4cac88d3be2200e2f4629eddf2c193e553b':
  Bind to screenshot service for current user.
 2012-08-29 22:34:21 -07:00
Jeff Sharkey
f80de4cac8 am a99e4caa: Merge "Bind to screenshot service for current user." into jb-mr1-dev 
* commit 'a99e4caa94ed3261d11c650e778c7c9b26b3e590':
  Bind to screenshot service for current user.
 2012-08-29 22:31:27 -07:00
Jeff Sharkey
a99e4caa94 Merge "Bind to screenshot service for current user." into jb-mr1-dev 2012-08-29 22:29:43 -07:00
Romain Guy
d4c8456c8b am e70f4b77: am 7808581c: Merge "Pre-multiply color components for 2-stop gradients Bug #7033344" into jb-mr1-dev 
* commit 'e70f4b77a8b29852a689d9bc8825fb359bb8491b':
  Pre-multiply color components for 2-stop gradients Bug #7033344
 2012-08-29 22:01:17 -07:00
Romain Guy
e70f4b77a8 am 7808581c: Merge "Pre-multiply color components for 2-stop gradients Bug #7033344" into jb-mr1-dev 
* commit '7808581ca3b462fb187aed6b0d1b86fb83a8a215':
  Pre-multiply color components for 2-stop gradients Bug #7033344
 2012-08-29 21:59:11 -07:00
Romain Guy
7808581ca3 Merge "Pre-multiply color components for 2-stop gradients Bug #7033344" into jb-mr1-dev 2012-08-29 21:56:44 -07:00
Romain Guy
d679b57ef2 Pre-multiply color components for 2-stop gradients 
Bug #7033344

Change-Id: Ia168501f1dc56ba7a1bb0c55078320432309a66a
 2012-08-29 21:56:18 -07:00
Daniel Sandler
ac49e58445 am 4615695e: am 8601e8b3: Merge "Expand the navbar dead zone briefly after touches elsewhere." into jb-mr1-dev 
* commit '4615695e49593dc10ad27204dfb93add2d2d5a4c':
  Expand the navbar dead zone briefly after touches elsewhere.
 2012-08-29 20:34:36 -07:00
Daniel Sandler
4615695e49 am 8601e8b3: Merge "Expand the navbar dead zone briefly after touches elsewhere." into jb-mr1-dev 
* commit '8601e8b3ab3b166166543baaab663224b787d68f':
  Expand the navbar dead zone briefly after touches elsewhere.
 2012-08-29 20:32:21 -07:00
Daniel Sandler
8601e8b3ab Merge "Expand the navbar dead zone briefly after touches elsewhere." into jb-mr1-dev 2012-08-29 20:29:28 -07:00
Jim Miller
2170fbc950 am 07fb8e8a: am 5b81de4d: Merge "Fix Camera and GoogleNow launching in keyguard" into jb-mr1-dev 
* commit '07fb8e8a818fd9546ffa64bcf9f1e0636b2d7c69':
  Fix Camera and GoogleNow launching in keyguard
 2012-08-29 20:12:44 -07:00
Jim Miller
07fb8e8a81 am 5b81de4d: Merge "Fix Camera and GoogleNow launching in keyguard" into jb-mr1-dev 
* commit '5b81de4de741f736889fd86e1dd324ad88136ebe':
  Fix Camera and GoogleNow launching in keyguard
 2012-08-29 20:10:54 -07:00
Jim Miller
5b81de4de7 Merge "Fix Camera and GoogleNow launching in keyguard" into jb-mr1-dev 2012-08-29 20:07:56 -07:00
Jim Miller
5f75aa15d7 Fix Camera and GoogleNow launching in keyguard 
This change allows keyguard to launch the secure camera when the device
is in a secure mode.  It also allows launching delayed actions after the
user has entered their security, such as that required for GoogleNow.

Change-Id: I54975001728ced3c339f86eafc3a38cea606082b
 2012-08-29 20:06:47 -07:00
Adam Cohen
8c4b4a8692 am cd37ece7: am b07e89f6: Merge "Integrate overscroll into KeyguardWidgetView." into jb-mr1-dev 
* commit 'cd37ece71bb0174f0624b56960b7b2a367ca9af1':
  Integrate overscroll into KeyguardWidgetView.
 2012-08-29 19:53:07 -07:00
Adam Cohen
cd37ece71b am b07e89f6: Merge "Integrate overscroll into KeyguardWidgetView." into jb-mr1-dev 
* commit 'b07e89f6fdbf85d2f436dc67074793444462abf9':
  Integrate overscroll into KeyguardWidgetView.
 2012-08-29 19:51:19 -07:00
Adam Cohen
b07e89f6fd Merge "Integrate overscroll into KeyguardWidgetView." into jb-mr1-dev 2012-08-29 19:49:02 -07:00
Amith Yamasani
f7e5898ab1 am 9e8d101a: am 694121c4: Merge "Fix an NPE in PackageManager when getting the AppInfo for an app" into jb-mr1-dev 
* commit '9e8d101aa48421f6e6582d01f7b2bc1e7fafcbf8':
  Fix an NPE in PackageManager when getting the AppInfo for an app
 2012-08-29 18:56:39 -07:00
Amith Yamasani
9e8d101aa4 am 694121c4: Merge "Fix an NPE in PackageManager when getting the AppInfo for an app" into jb-mr1-dev 
* commit '694121c4004e80deec71736481cfb03bd50e38f5':
  Fix an NPE in PackageManager when getting the AppInfo for an app
 2012-08-29 18:54:23 -07:00
Amith Yamasani
694121c400 Merge "Fix an NPE in PackageManager when getting the AppInfo for an app" into jb-mr1-dev 2012-08-29 18:52:14 -07:00
Amith Yamasani
317046a087 Fix an NPE in PackageManager when getting the AppInfo for an app 
Bug: 7072043
Change-Id: I37378b13820152434e7b3249e13c27001fe4ae5a
 2012-08-29 18:48:08 -07:00
Jim Miller
f2dfc351de Integrate overscroll into KeyguardWidgetView. 
This integrates overscroll behavior into keyguard.

Change-Id: I19c0f70c85a4ebb0ddd3f433b6f88a992f40919b
 2012-08-29 18:42:21 -07:00
Jake Hamby
e4f8539089 am 223d699d: am c452a40e: am 044a9b97: resolved conflicts for merge of b35e4d77 to jb-dev-plus-aosp 
* commit '223d699d24bcf6687bfda13c0a334594c965ba16':
  Fix CDMA decoding of multipart UTF-16 SMS messages.
 2012-08-29 18:23:47 -07:00
Jake Hamby
223d699d24 am c452a40e: am 044a9b97: resolved conflicts for merge of b35e4d77 to jb-dev-plus-aosp 
* commit 'c452a40eea5a8bc23b05201e70a9ca740ee9ceec':
  Fix CDMA decoding of multipart UTF-16 SMS messages.
 2012-08-29 18:21:20 -07:00
Dianne Hackborn
cf8e40ebe2 am 0322498e: am 12631ec3: Merge "Start implementing concept of "running" users." into jb-mr1-dev 
* commit '0322498e05cfec1d73bc5205d46ce86847e7dd79':
  Start implementing concept of "running" users.
 2012-08-29 18:20:09 -07:00
Jake Hamby
c452a40eea am 044a9b97: resolved conflicts for merge of b35e4d77 to jb-dev-plus-aosp 
* commit '044a9b97b01a934e6cd9ef2f2914d401c4fa145b':
  Fix CDMA decoding of multipart UTF-16 SMS messages.
 2012-08-29 18:19:04 -07:00
Dianne Hackborn
0322498e05 am 12631ec3: Merge "Start implementing concept of "running" users." into jb-mr1-dev 
* commit '12631ec35eafc466e0deef315daa5fdfb5066372':
  Start implementing concept of "running" users.
 2012-08-29 18:17:41 -07:00
Dianne Hackborn
12631ec35e Merge "Start implementing concept of "running" users." into jb-mr1-dev 2012-08-29 18:15:07 -07:00
Jake Hamby
044a9b97b0 resolved conflicts for merge of b35e4d77 to jb-dev-plus-aosp 
Change-Id: Idec590dbd9e051a3faeded1af9eb4a78216f0496
 2012-08-29 18:09:29 -07:00
Daniel Sandler
c26185bb7b Expand the navbar dead zone briefly after touches elsewhere. 
For now, each time the dead zone captures a touch, it will
flash to let you know that's what happened. We should
probably turn this off before shipping.

Note also that this currently only expands the navbar on
ACTION_DOWN elsewhere in the UI (because this is the only
time ACTION_OUTSIDE is generated); this isn't perfect and
we'll need to do some mucking about with the input system to
get information about ongoing drags or additional pointers
down, but this CL is a good start and introduces the general
mechanism for expanding and contracting the dead zone.

Change-Id: I43e63aed1e541fd07d83fde4d66bcb5be89b69d2
 2012-08-29 20:11:21 -04:00
Benoit Goby
a5d983e2f2 am 4c0087ff: am ffc45b7d: Merge "UsbDebuggingManager: Fix restart when toggling USB debugging" into jb-mr1-dev 
* commit '4c0087ff61ebf553f8f8deb080d406aa9b8a9a50':
  UsbDebuggingManager: Fix restart when toggling USB debugging
 2012-08-29 17:10:07 -07:00
Benoit Goby
4c0087ff61 am ffc45b7d: Merge "UsbDebuggingManager: Fix restart when toggling USB debugging" into jb-mr1-dev 
* commit 'ffc45b7d5708e706aeb19454c5172136761d214b':
  UsbDebuggingManager: Fix restart when toggling USB debugging
 2012-08-29 17:08:00 -07:00
Benoit Goby
ffc45b7d57 Merge "UsbDebuggingManager: Fix restart when toggling USB debugging" into jb-mr1-dev 2012-08-29 17:05:26 -07:00
Jeff Brown
b538d9354d am ae9eb7c0: am f404d102: Merge "Fix build for some javac compilers." into jb-mr1-dev 
* commit 'ae9eb7c05c1933126b7448acec74054c866c1a43':
  Fix build for some javac compilers.
 2012-08-29 17:05:24 -07:00
Jim Miller
bd4dc276e8 am 4faf9233: am 5a05f2bf: Merge "Fix MENU key in keyguard." into jb-mr1-dev 
* commit '4faf923397954271abfe6cab445092014ab34c6a':
  Fix MENU key in keyguard.
 2012-08-29 17:03:50 -07:00
Jeff Brown
ae9eb7c05c am f404d102: Merge "Fix build for some javac compilers." into jb-mr1-dev 
* commit 'f404d10225a2df60eb118089f8f0e72ab5845d48':
  Fix build for some javac compilers.
 2012-08-29 17:03:14 -07:00
Jim Miller
4faf923397 am 5a05f2bf: Merge "Fix MENU key in keyguard." into jb-mr1-dev 
* commit '5a05f2bf22954fdbd294bca8adc2b8ef0e8c5e00':
  Fix MENU key in keyguard.
 2012-08-29 17:01:39 -07:00
Jeff Brown
f404d10225 Merge "Fix build for some javac compilers." into jb-mr1-dev 2012-08-29 17:00:30 -07:00
Jeff Brown
29d8d267dd Fix build for some javac compilers. 
It seems some compiler versions don't like trailing
commas in attribute lists.  Weird.

Change-Id: I3a05f49a2e94f63fe1662d14c1d8a7ee249d8a16
 2012-08-29 16:59:27 -07:00
Jim Miller
5a05f2bf22 Merge "Fix MENU key in keyguard." into jb-mr1-dev 2012-08-29 16:58:35 -07:00
Jim Miller
95b005c196 Fix MENU key in keyguard. 
This re-enables the MENU key in keyguard so that automation tests still work.

Change-Id: I3d2fbf9240e12dc4a243354fa09e5d639304be6e
 2012-08-29 16:45:54 -07:00
Jake Hamby
b35e4d778a Fix CDMA decoding of multipart UTF-16 SMS messages. 
Recent changes to support CMAS over CDMA introduced a bug causing
an exception to be thrown when decoding multipart UTF-16 encoded
messages. This change fixes the exception by correctly subtracting
the header size from the number of bytes to decode. It also adds
more robust error handling to try to decode the maximum length
possible instead of throwing an exception if the length is still
larger than the user data length after subtracting the header.

This also fixes a bug in the encoder, which was padding the
UTF-16 user data to 16-bit alignment, which is incorrect (should
be padded to an 8-bit boundary). The code happened to work because
we always generated a UDH that was an even number of bytes
(including length) so the padding was a no-op. The decoder works
correctly.

Bug: 6939151
Change-Id: Iba9e7156bd7df94e972963959a7ce1c78464f7f5
 2012-08-29 16:36:22 -07:00
Matthew Xie
2fe2700b7c am ba118c25: am 9e3045c7: Merge "Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f" into jb-mr1-dev 
* commit 'ba118c25fb03b67514cd86a791bb63367cb21645':
  Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f
 2012-08-29 16:34:31 -07:00
Matthew Xie
ba118c25fb am 9e3045c7: Merge "Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f" into jb-mr1-dev 
* commit '9e3045c75c80d859dd16087e69f5bfbe15ca8bf4':
  Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f
 2012-08-29 16:32:21 -07:00
Matthew Xie
9e3045c75c Merge "Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f" into jb-mr1-dev 2012-08-29 16:30:14 -07:00
Irfan Sheriff
005caa5322 am 5df5e7da: am a28c18fc: Merge "Fix DHCP handling at disconnect/reconnect" into jb-mr1-dev 
* commit '5df5e7da516e4021062b0b8f2ff73166d4f216f2':
  Fix DHCP handling at disconnect/reconnect
 2012-08-29 16:00:05 -07:00
Chris Craik
d29a2f384e am 339d48d5: am 402206b6: Merge "Use smoothstep to eliminate branches in AA shader" into jb-mr1-dev 
* commit '339d48d5d6137b64b8024247b7dfad60744778eb':
  Use smoothstep to eliminate branches in AA shader
 2012-08-29 15:58:26 -07:00
John Spurlock
9e3421eb06 am 1f2e9b59: am b2c94ec8: Merge "Change default setting for dreams to \'when docked\'" into jb-mr1-dev 
* commit '1f2e9b59247c656774ca09449179c001df22cd59':
  Change default setting for dreams to 'when docked'
 2012-08-29 15:58:22 -07:00
Irfan Sheriff
5df5e7da51 am a28c18fc: Merge "Fix DHCP handling at disconnect/reconnect" into jb-mr1-dev 
* commit 'a28c18fc618e4bf58da6417166b1ee249dc16ea9':
  Fix DHCP handling at disconnect/reconnect
 2012-08-29 15:57:58 -07:00
Irfan Sheriff
a28c18fc61 Merge "Fix DHCP handling at disconnect/reconnect" into jb-mr1-dev 2012-08-29 15:55:43 -07:00