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

104428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
35587a0c47 Merge "Don't set ADDR_COMPAT_LAYOUT on the emulator" 2013-04-23 23:33:52 +00:00
Philip Milne
6edbfb9cdc am a6d5109d: Merge "Fix for bug 8578258." into jb-mr2-dev 
* commit 'a6d5109dd69791ba51e469c30d522dc27ab2c69c':
  Fix for bug 8578258.
 2013-04-23 16:13:18 -07:00
Philip Milne
a6d5109dd6 Merge "Fix for bug 8578258." into jb-mr2-dev 2013-04-23 23:11:06 +00:00
Michael Wright
fb8df2356a Fix keylayouts to use BACK instead of incorrect BUTTON_BACK. 
Fix duplicate keys in a couple of the onza controllers.  Also, add them to the
Makefile so they actually get included in the build.

Bug: 8292749
Change-Id: I8246155f84d0c3c75b21e37fb579227fda76e197
 2013-04-23 15:54:21 -07:00
Matthew Xie
2e0a94d22b am b442d074: Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-dev 
* commit 'b442d07469aebc07d1d13b5b64b40aa152022e13':
  Add hardware feature android.hardware.bluetooth.le
 2013-04-23 15:52:53 -07:00
Matthew Xie
b442d07469 Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-dev 2013-04-23 22:47:52 +00:00
Nick Kralevich
fc17dc2548 Don't set ADDR_COMPAT_LAYOUT on the emulator 
Don't work around third party app bugs on the emulator.

Change-Id: I4440fcd56b72e3a74881ddec2a469f037a060525
 2013-04-23 15:40:03 -07:00
Philip Milne
3c647d23e5 Fix for bug 8578258. 
The fix in:

https://googleplex-android-review.googlesource.com/#/c/300346/

worked but the constant used had an extra trailing zero - which was confusing
and put a 1 in the 'flag' space of the measurement spec.

The intended number was:

0x00800000

Unfortunately, this intended constant doesn't fix this bug.

The constant submitted in this fix is:

0x00010000

which is outside the 'flag' space of measurement specs and appears to steer clear of overflow
problems in the scenario of this bug.

As suggested in the submission above, it would be preferable to rework of the RTL code to avoid
the use of such a constant as it seems very unlikely indeed that any choice of integer can
avoid problems in all cases.

Change-Id: I0c6744257ef2aebe8dbc8c041a447f9b90ee4b84
 2013-04-23 15:28:18 -07:00
Irfan Sheriff
ef8dc882ec am 0aea616a: Merge "Keep device state always updated" into jb-mr2-dev 
* commit '0aea616acdb228b7a8c061977c0445174f60a1e1':
  Keep device state always updated
 2013-04-23 14:59:58 -07:00
Irfan Sheriff
0aea616acd Merge "Keep device state always updated" into jb-mr2-dev 2013-04-23 21:57:53 +00:00
Wink Saville
51f456f553 Support WiFi only device at runtime. 
To date WiFi only devices were defined by the list of networkAttributes
in config.xml overriden in on a per-device basis. This change is the
simplest change needed to determine this at runtime and therefore allowing
a single build to support the two different configurations.

Bug: 8562845
Change-Id: I34de5c6accc718b199c13815537de1debfe3dc91
 2013-04-23 14:26:51 -07:00
Raph Levien
fdd408233d am 22a3344c: Merge "Fix for bug 8695466 GPOS combining mark positioning broken before space" into jb-mr2-dev 
* commit '22a3344cda1a3dcf4f719e0685c5d06155922c29':
  Fix for bug 8695466 GPOS combining mark positioning broken before space
 2013-04-23 14:21:44 -07:00
Raph Levien
22a3344cda Merge "Fix for bug 8695466 GPOS combining mark positioning broken before space" into jb-mr2-dev 2013-04-23 21:19:20 +00:00
Irfan Sheriff
e68d858b0f Keep device state always updated 
Tasker app showed up a bug where we can be out of sync with screen state
if we only received broadcasts when wifi is toggled on. Always receive
updates.

Bug: 8689583
Change-Id: Iad457c9768ed421765adb6a15d5f42ecf682da38
 2013-04-23 13:43:43 -07:00
Raph Levien
9d47db23ff Fix for bug 8695466 GPOS combining mark positioning broken before space 
This patch makes segmentation into script runs behave the same in RTL
as in LTR modes - so that inherited script characters are always
associated with the preceding run. Otherwise, for a sequence such as
u+0631 u+064d u+0020, it would get split after the first character,
which would lose the ability to correctly position the u+064d mark.

Change-Id: I3c12ba1b77d18334f55e707f518be1046e6b339b
 2013-04-23 12:51:27 -07:00
Scott Main
4d4eb732ec am 89a60814: am 2dd874ac: am e0445881: am 51a452a9: am 4af72165: am 7653fbee: make Google IO image clickable 
* commit '89a6081447fc5c454aad3aea02190a576d92ca1b':
  make Google IO image clickable
 2013-04-23 12:43:57 -07:00
Scott Main
89a6081447 am 2dd874ac: am e0445881: am 51a452a9: am 4af72165: am 7653fbee: make Google IO image clickable 
* commit '2dd874ace63566892a58f43bcf15399ae66c8d4b':
  make Google IO image clickable
 2013-04-23 12:41:40 -07:00
Scott Main
2dd874ace6 am e0445881: am 51a452a9: am 4af72165: am 7653fbee: make Google IO image clickable 
* commit 'e04458816b296ea76fc16cf8a820969cf363051d':
  make Google IO image clickable
 2013-04-23 12:39:18 -07:00
Scott Main
e04458816b am 51a452a9: am 4af72165: am 7653fbee: make Google IO image clickable 
* commit '51a452a93bb170a65921aae9ae6bddbf8ce12bff':
  make Google IO image clickable
 2013-04-23 12:37:35 -07:00
Scott Main
51a452a93b am 4af72165: am 7653fbee: make Google IO image clickable 
* commit '4af72165092fb965ec9a97599f25538aa70242b1':
  make Google IO image clickable
 2013-04-23 12:36:26 -07:00
Scott Main
4af7216509 am 7653fbee: make Google IO image clickable 
* commit '7653fbee7e4eb5d25a5b561b8142bd1af8c2cd58':
  make Google IO image clickable
 2013-04-23 12:34:30 -07:00
Scott Main
7653fbee7e make Google IO image clickable 
Change-Id: I8638012fa6be1f104f20cf2f4dcea59787fdfd08
 2013-04-23 12:32:24 -07:00
Selim Gurun
cf633a4c45 am 6981f11f: am 2253105c: am cab09cfc: am dc9efbbb: am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge 
* commit '6981f11f3080eaa4a6590005ad464474b0fc1a18':
  DO NOT MERGE Fix issues during backport
 2013-04-23 12:31:20 -07:00
Selim Gurun
6981f11f30 am 2253105c: am cab09cfc: am dc9efbbb: am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge 
* commit '2253105c1ad6c93880b3ce1651cf54269711cff7':
  DO NOT MERGE Fix issues during backport
 2013-04-23 12:27:03 -07:00
Selim Gurun
2253105c1a am cab09cfc: am dc9efbbb: am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge 
* commit 'cab09cfc7afb7e19698bed3d61fe0b200dad3e4a':
  DO NOT MERGE Fix issues during backport
 2013-04-23 12:24:37 -07:00
Selim Gurun
cab09cfc7a am dc9efbbb: am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge 
* commit 'dc9efbbb61a3e8da86c3e28f05d625a721a957fc':
  DO NOT MERGE Fix issues during backport
 2013-04-23 12:23:14 -07:00
Selim Gurun
dc9efbbb61 am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge 
* commit 'a5f4e79fad39b4a0f91673c5813b1740e82144f4':
  DO NOT MERGE Fix issues during backport
 2013-04-23 12:21:49 -07:00
Selim Gurun
a5f4e79fad am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge 
* commit '22a946d36af4ea69956531c89f0d0852497c3892':
  DO NOT MERGE Fix issues during backport
 2013-04-23 12:20:53 -07:00
Selim Gurun
22a946d36a am 006119bf: Merge commit \'8237dd82\' into manualmerge 
* commit '006119bf2cd0b7f0ea3d1b6b0bbbfd413262504a':
  DO NOT MERGE Fix issues during backport
 2013-04-23 12:18:47 -07:00
Ian Rogers
4d355c39a7 am 282a7e1b: Adding matching @deprecated. 
* commit '282a7e1b1db121c910f25b13081242a8c7611708':
  Adding matching @deprecated.
 2013-04-23 12:04:25 -07:00
Matthew Xie
a722772b28 Add hardware feature android.hardware.bluetooth.le 
The feature is used to differ platforms that support bluetooth low
engery radio
bug 8369273

Change-Id: Ibe23da73f7ecfa854bdb8b8bfc1a32b8e3aeee56
 2013-04-23 11:53:41 -07:00
Ian Rogers
282a7e1b1d Adding matching @deprecated. 
Bug: 8657266

(Cherry-pick of c2a3adbd56e763ef0ad045fd8c58a54e41d1639d)

Change-Id: Idbd22dc647f11441d15da12eb23723539768cf4c
 2013-04-23 11:36:28 -07:00
Selim Gurun
006119bf2c Merge commit '8237dd82' into manualmerge 
Bug: 6923539

Skipping the change. We already fixed this in master and jb-mr2-dev
in sha: 2905e18b03c6ce34739bed9c06b865b29087deea. A compatible change
was submitted to jb-dev (and so automerged to jb-mr1-dev). see sha
7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6. The conflict occurs while
merging 8237dd82bf151cb102a69243f91832be1c1294e4 which I thought was
DO NOT MERGE anyway.

Change-Id: If96e368d2e2cec98bc18069151a2ff861b53608f
 2013-04-23 11:19:12 -07:00
Ian Rogers
896ee5b6f8 am be4536d2: Merge "Adding matching @deprecated." 
* commit 'be4536d214eedc3d12b50f0f30b47bba773b8dbc':
  Adding matching @deprecated.
 2013-04-23 09:15:58 -07:00
Ian Rogers
be4536d214 Merge "Adding matching @deprecated." 2013-04-23 15:13:05 +00:00
Chet Haase
393abb1c54 am 5e650cef: Merge "Expand invalidation rectangle when clipChildren == false" into jb-mr2-dev 
* commit '5e650cef53cf1eb33f9c8b2f8e5c8b1bb24b32d9':
  Expand invalidation rectangle when clipChildren == false
 2013-04-23 03:52:28 -07:00
Jean-Michel Trivi
448c6ca481 am ea236f19: Merge "Identify in logs launch of voice search from key events" into jb-mr2-dev 
* commit 'ea236f19e652942a7af384566c70cdd0c7f88c58':
  Identify in logs launch of voice search from key events
 2013-04-23 03:52:12 -07:00
Daniel Sandler
2fd0ba8e95 am f78ff07f: Merge "Fix concurrency issues when parceling StatusBarNotifications." into jb-mr2-dev 
* commit 'f78ff07f6e688d11881658f743ef63076fcc550c':
  Fix concurrency issues when parceling StatusBarNotifications.
 2013-04-23 03:52:06 -07:00
Amith Yamasani
b2daf811cb am d52f2b14: Merge "Listen for brightness dialog broadcasts from all users" into jb-mr2-dev 
* commit 'd52f2b14852c057fd8d94cebb7ddf8900ba1d232':
  Listen for brightness dialog broadcasts from all users
 2013-04-23 03:52:04 -07:00
Dirk Dougherty
5fbf40b128 am 94aa1167: am 80177e0c: am c2340c4d: am ecf55180: am 04f3b81a: am c7523804: am 00cfba95: Doc change: update support urls. 
* commit '94aa1167a20560d455cf9458349c081c45531393':
  Doc change: update support urls.
 2013-04-23 03:51:58 -07:00
Nick Pelly
09e9e1a5e7 am edced26f: Merge "Add ContentValues & CursorWindow to framework.aidl" into jb-mr2-dev 
* commit 'edced26f162b0232338064e569fe651b8c805f93':
  Add ContentValues & CursorWindow to framework.aidl
 2013-04-23 03:51:56 -07:00
Michael Wright
585000515f am 5fe6e4c4: Merge "Rewrite input handling for native applications" into jb-mr2-dev 
* commit '5fe6e4c4c9de523fa9e74902473996ce5ee8b298':
  Rewrite input handling for native applications
 2013-04-23 03:51:53 -07:00
Svetoslav
7bf02d1255 am a61464d7: Merge "Making new node id APIs return strings." into jb-mr2-dev 
* commit 'a61464d7adc26c291a5f9de48c9aff8b76a56b1f':
  Making new node id APIs return strings.
 2013-04-23 03:51:50 -07:00
Jean-Michel Trivi
cb315af34b am fb0b6a81: Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" into jb-mr2-dev 
* commit 'fb0b6a817903b42dfc192dc8fa71f5dede024379':
  Opt-in mechanism for RemoteControlClient position anti-drift check
 2013-04-23 03:51:42 -07:00
Dianne Hackborn
8c3cb8111a am a4629b0b: Merge "JB MR2 == API 18." into jb-mr2-dev 
* commit 'a4629b0b833f78481ca51baa44b0303ebe647a7c':
  JB MR2 == API 18.
 2013-04-23 03:51:40 -07:00
Philip Milne
089a75be5e am a7b2625d: Merge "Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev 
* commit 'a7b2625d43a8e83e3fb47ca261efad6e3f6fcde9':
  Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets
 2013-04-23 03:51:29 -07:00
Chris Craik
4837ea99c4 am 8d3f3c06: Merge "Expand hardware accel doc" into jb-mr2-dev 
* commit '8d3f3c061709eefe202e0ff7a612fcdf8cfeeb63':
  Expand hardware accel doc
 2013-04-23 03:51:18 -07:00
Robert Greenwalt
f12afa9913 am d0202945: Merge "Listen for network disconnect." into jb-mr2-dev 
* commit 'd020294572f591007de1fe0aa9e4927dae72c0c9':
  Listen for network disconnect.
 2013-04-23 03:51:08 -07:00
Dirk Dougherty
afd80ab6a6 am 3acb320f: am ab3b13eb: am e5d47b39: am cdfeb09d: am 10fc5e05: am cca23552: am 974af93d: Doc change: update payment detail for merch account. 
* commit '3acb320fcb6ee03aec64220b09283a3c4efa4bb5':
  Doc change: update payment detail for merch account.
 2013-04-23 03:51:05 -07:00
Christopher Tate
4c6f2a5410 am 7a4ddbaa: Merge "Don\'t attempt native crash reporting for persistent apps" into jb-mr2-dev 
* commit '7a4ddbaafa9e11e190764ca0314f56651dfcb0d9':
  Don't attempt native crash reporting for persistent apps
 2013-04-23 03:50:46 -07:00