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

103908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
17917a95f3 am d3f9ffe2: Merge "Prevent transformed ops from merging in the first place" into jb-mr2-dev 
* commit 'd3f9ffe28d1599e40f8c9a7c0c32465324bb2828':
  Prevent transformed ops from merging in the first place
 2013-04-18 13:45:49 -07:00
Chris Craik
d3f9ffe28d Merge "Prevent transformed ops from merging in the first place" into jb-mr2-dev 2013-04-18 20:43:25 +00:00
Chris Craik
ee5b2c6de7 Prevent transformed ops from merging in the first place 
bug:8649215

Previously we prevented ops with non-translate transforms from
merging, but missed the case of the first op in a merging batch
containing a non-translate transform.

This fulfills the assumption of drawText's non-immediate mode that
merged ops will have pure translate transforms.

Change-Id: I6f6db341aff3f7e84e74b4c3ccf970d585a2db1a
 2013-04-18 12:57:07 -07:00
Robert Greenwalt
e3e55f2a19 am 5d1a182a: Merge "Secure broadcasts." into jb-mr2-dev 
* commit '5d1a182a8a2dd9613ef3b1f2de7b6a3d690ae890':
  Secure broadcasts.
 2013-04-18 11:49:39 -07:00
Robert Greenwalt
5d1a182a8a Merge "Secure broadcasts." into jb-mr2-dev 2013-04-18 18:45:53 +00:00
Svetoslav Ganov
7a3e91f4f9 am 467a052e: Magnification does not work if no enabled accessibility services. 
* commit '467a052e159d5dc87b27ce94f8559576ec73040b':
  Magnification does not work if no enabled accessibility services.
 2013-04-18 11:36:42 -07:00
Svetoslav Ganov
467a052e15 Magnification does not work if no enabled accessibility services. 
This is a regression in which the input filter of the accessibility
manager service is not set if magnification is enabled but accessibility
is not - i.e. no accessibility serivces are enabled. Fixed the logic to
install the input filter if magnification is on but services are not
enabled in addition to services being enabled.

bug:8652765

Change-Id: Ia73e1064035f95ba0f246f4cabcc42d58c12a11f
 2013-04-18 10:42:30 -07:00
Robert Greenwalt
68b13ba12f Secure broadcasts. 
Prevents 3rd party spoofing.

bug:7622253
Change-Id: I1e1a9887afe009d060205e349c31e3aefba2ea5b
 2013-04-18 10:34:13 -07:00
Wink Saville
b71ec91a32 am 7f6fc129: Merge "Add CellInfoWcdma and related classes." into jb-mr2-dev 
* commit '7f6fc12997d67ae80a044bc0b4cc17797d887911':
  Add CellInfoWcdma and related classes.
 2013-04-18 10:10:31 -07:00
Wink Saville
7f6fc12997 Merge "Add CellInfoWcdma and related classes." into jb-mr2-dev 2013-04-18 17:06:46 +00:00
Baligh Uddin
ba237151d7 am 9968b523: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '9968b523e53dd16a4d8fad207d435abd2eaf266f':
  Import translations. DO NOT MERGE
 2013-04-18 09:45:50 -07:00
Baligh Uddin
9968b523e5 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-18 16:43:35 +00:00
Jeff Tinker
4efe71ae55 am 45d59a99: Merge "Make MediaDrm APIs public" into jb-mr2-dev 
* commit '45d59a997f639662e4ce427933d81667fee39bcd':
  Make MediaDrm APIs public
 2013-04-18 09:11:57 -07:00
Jeff Tinker
45d59a997f Merge "Make MediaDrm APIs public" into jb-mr2-dev 2013-04-18 16:08:37 +00:00
Michael Wright
53b6d5106d am 2b296319: Merge "Standardize gamepad layouts on existing controllers" into jb-mr2-dev 
* commit '2b29631953d05c5202483817f5d2b07a26ddc14c':
  Standardize gamepad layouts on existing controllers
 2013-04-18 01:19:23 -07:00
Michael Wright
2b29631953 Merge "Standardize gamepad layouts on existing controllers" into jb-mr2-dev 2013-04-18 08:15:58 +00:00
Jaikumar Ganesh
d5af172450 am 176c245c: Merge "Hardware geofence API changes." into jb-mr2-dev 
* commit '176c245cefaf08f33043e9b67cb787efeb6ad662':
  Hardware geofence API changes.
 2013-04-17 22:21:32 -07:00
Jaikumar Ganesh
176c245cef Merge "Hardware geofence API changes." into jb-mr2-dev 2013-04-18 05:18:41 +00:00
Jaikumar Ganesh
da6508954a Hardware geofence API changes. 
b/8631678

1.GeofenceRequest object created.
2.MonitorState moved to a new callback
3.getTypeAndStatus separated to 2 calls.
4.Binder death implemented
5.geofenceChange callback name changed.
6.Parameters rearranged in some calls.

Change-Id: I8fe9621186aeb49efeb0eef1821a2556afe03cfc
 2013-04-17 22:18:01 -07:00
Satoshi Kataoka
3e3a7b3b1e am f024e7ac: Merge "Fix possible NPE" into jb-mr2-dev 
* commit 'f024e7ac44e00ea560f547b4e5d67645a2e6c9b4':
  Fix possible NPE
 2013-04-17 20:36:12 -07:00
Satoshi Kataoka
f024e7ac44 Merge "Fix possible NPE" into jb-mr2-dev 2013-04-18 03:33:39 +00:00
Dianne Hackborn
fb4e1c21ed am 25b49734: Merge "Fix issue #8540550: Screenshots should never have transparency" into jb-mr2-dev 
* commit '25b49734cac1ecd17dba2af2a1af8328490236d4':
  Fix issue #8540550: Screenshots should never have transparency
 2013-04-17 19:03:09 -07:00
Dianne Hackborn
25b49734ca Merge "Fix issue #8540550: Screenshots should never have transparency" into jb-mr2-dev 2013-04-18 02:00:46 +00:00
Benoit Goby
aa31394875 am d02b00dd: Merge "Fix UsbDebuggingActivity not shown in adb tcpip mode" into jb-mr2-dev 
* commit 'd02b00dd6efd3841708cd72ae08e5d548b8cd07b':
  Fix UsbDebuggingActivity not shown in adb tcpip mode
 2013-04-17 18:56:10 -07:00
Benoit Goby
d02b00dd6e Merge "Fix UsbDebuggingActivity not shown in adb tcpip mode" into jb-mr2-dev 2013-04-18 01:52:55 +00:00
Jeff Brown
3b90af2343 am ab15e6ab: Merge "Add a config resource to force HDMI rotation on some devices." into jb-mr2-dev 
* commit 'ab15e6ab37cb29e6f3653cc5fa1872523946c50e':
  Add a config resource to force HDMI rotation on some devices.
 2013-04-17 18:44:26 -07:00
Jeff Brown
ab15e6ab37 Merge "Add a config resource to force HDMI rotation on some devices." into jb-mr2-dev 2013-04-18 01:42:01 +00:00
Mathias Agopian
740cf4ec31 am bb7b315c: Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev 
* commit 'bb7b315cdd48fdcffc07d0e98557cb88b9f58006':
  add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()
 2013-04-17 18:32:24 -07:00
Mathias Agopian
bb7b315cdd Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev 2013-04-18 01:29:07 +00:00
Dianne Hackborn
ca46b87118 Fix issue #8540550: Screenshots should never have transparency 
Make sure the thumbnail bitmap is initialized with a black
background.

Change-Id: I87c00d309b7d30b6085a751aa4ae22cf146c74f5
 2013-04-17 18:06:22 -07:00
Michael Wright
f9c2ada62f Standardize gamepad layouts on existing controllers 
Bug: 8292749
Change-Id: I24bae8c9229125fcdd583d74b29f4334ddff782e
 2013-04-17 18:00:06 -07:00
Chris Craik
9b9fe68ea3 am 18455c30: Merge "Add input/output JSON data for baseline comparison" into jb-mr2-dev 
* commit '18455c307d8ea439dbf78aa3789380259ddd8572':
  Add input/output JSON data for baseline comparison
 2013-04-17 17:34:46 -07:00
Benoit Goby
29a4b7277e Fix UsbDebuggingActivity not shown in adb tcpip mode 
Bug: 8646772
Change-Id: If34c756bece903a0a452070bbc94ebc71d325bf6
 2013-04-17 17:34:30 -07:00
Chris Craik
18455c307d Merge "Add input/output JSON data for baseline comparison" into jb-mr2-dev 2013-04-18 00:32:08 +00:00
Jeff Brown
c82c89edc7 Add a config resource to force HDMI rotation on some devices. 
If the hardware composer HAL does not provide full support for
multiple displays, it may be necessary to force the HDMI rotation
when not docked.  (When docked, we can use the dock's orientation.)

This configuration is not expected to be used on newer devices
with the requisite HAL support and may be removed in the future.

Bug: 8511721
Change-Id: I1ff50f00ee7fe621aceff94bd938ecf6385c3f38
 2013-04-17 17:18:15 -07:00
Wink Saville
e3a9cbc052 Add CellInfoWcdma and related classes. 
Update javadoc's to define invalid values are Integer.MAX_VALUE.

Bug: 8622081
Change-Id: I513a67d4b46b72f03e0c3360abcc0ad5222c1c13
 2013-04-17 16:40:17 -07:00
Jim Miller
6825c47830 am 9bf7be93: Merge "Add permission check for owner-info related LockSettings." into jb-mr2-dev 
* commit '9bf7be933d039ef227ca54f917c1ff6a00a2f833':
  Add permission check for owner-info related LockSettings.
 2013-04-17 15:49:23 -07:00
Chet Haase
78296cb760 am bc09a364: Merge "Fixes for setClipBounds()" into jb-mr2-dev 
* commit 'bc09a364c3fd49470b936e7bc2521f6de9ba07b4':
  Fixes for setClipBounds()
 2013-04-17 15:49:17 -07:00
Jim Miller
9bf7be933d Merge "Add permission check for owner-info related LockSettings." into jb-mr2-dev 2013-04-17 22:47:06 +00:00
Jim Miller
158fe19ff8 Add permission check for owner-info related LockSettings. 
Fixes bug 8512972

Change-Id: I372ef892000e5de9075783f06b722e2911cfc90d
 2013-04-17 15:26:10 -07:00
Jeff Tinker
e1c76bebef Make MediaDrm APIs public 
bug: 8603279

Change-Id: I9fab2673867ad413a084933cee7239d13e8b7893
 2013-04-17 15:24:48 -07:00
Chet Haase
bc09a364c3 Merge "Fixes for setClipBounds()" into jb-mr2-dev 2013-04-17 22:13:50 +00:00
Mathias Agopian
9ddf32aa8a add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}() 
Bug: 8593591
Change-Id: I152281ddca8716aee97147cb1b3fb483ed46b053
 2013-04-17 15:04:47 -07:00
Jean-Michel Trivi
aa4e246271 am e1546df2: Merge "Fix message handling in RemoteControlClient" into jb-mr2-dev 
* commit 'e1546df25a7de17195f5b38ca90cad8447c288d0':
  Fix message handling in RemoteControlClient
 2013-04-17 14:15:36 -07:00
Jean-Michel Trivi
e1546df25a Merge "Fix message handling in RemoteControlClient" into jb-mr2-dev 2013-04-17 21:09:44 +00:00
Adam Cohen
f4865efe60 am be8bc839: Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 
* commit 'be8bc8392e203a661242b0637ce25bd05c292306':
  DO NOT MERGE Stripping some new widget API that is yet unused
 2013-04-17 14:06:33 -07:00
Adam Cohen
be8bc8392e Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 2013-04-17 21:03:43 +00:00
Adam Cohen
33f3aab220 DO NOT MERGE Stripping some new widget API that is yet unused 
Change-Id: I7a7156f30aa9105461908f66426950d13eb01408
 2013-04-17 13:48:45 -07:00
Jim Miller
2f6a2526db am b1e5137a: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 
* commit 'b1e5137a807d19a9cbc241c0ba84c3c49b32fceb':
  Move owner info from Settings.Secure to LockSettings
 2013-04-17 13:44:23 -07:00
Jim Miller
b1e5137a80 Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 2013-04-17 20:39:58 +00:00