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

94971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
311ef539cf am f0bf29df: am 1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen" 
# By Anju Mathapati
# Via Android Git Automerger (1) and others
* commit 'f0bf29df0cff4b7e370b7c329de92e90a4bab194':
  frameworks: Display missing text on SimUnlockScreen
 2013-01-23 17:37:28 -08:00
Wink Saville
f0bf29df0c am 1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen" 
# By Anju Mathapati
# Via Anju Mathapati (1) and Gerrit Code Review (1)
* commit '1842f2ed745af0d0f8cc457d448ba552e40a6b34':
  frameworks: Display missing text on SimUnlockScreen
 2013-01-23 17:32:38 -08:00
Wink Saville
1842f2ed74 Merge "frameworks: Display missing text on SimUnlockScreen" 2013-01-24 00:39:38 +00:00
The Android Automerger
78675d743f merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-23 16:28:55 -08:00
Adam Powell
a41f9cfbbd am 53d49f17: am 17f05497: am c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev 
# Via Android Git Automerger (2) and others
* commit '53d49f1702df41a4ca342a1df6e720b16e094797':
  Touch action bar title text: you will go to space today!
 2013-01-23 15:48:52 -08:00
Adam Powell
53d49f1702 am 17f05497: am c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev 
# Via Adam Powell (1) and others
* commit '17f05497be90004c0263c6de173af8c19ece07b0':
  Touch action bar title text: you will go to space today!
 2013-01-23 15:46:20 -08:00
Adam Powell
17f05497be am c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev 
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit 'c246950043c4c48beb51d5b56d94473e77c5fad2':
  Touch action bar title text: you will go to space today!
 2013-01-23 15:44:47 -08:00
Adam Powell
c246950043 Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev 2013-01-23 23:42:36 +00:00
Adam Powell
ae041ce83d am ce2f911d: am 65083049: am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev 
# Via Android Git Automerger (2) and others
* commit 'ce2f911d87927850337dcedda39364d59bd4a7ff':
  Prevent simultaneous interaction with action bar and content
 2013-01-23 15:29:02 -08:00
Adam Powell
ce2f911d87 am 65083049: am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev 
# Via Adam Powell (1) and others
* commit '650830491868b961e98c1837fb4b4ce7917783b5':
  Prevent simultaneous interaction with action bar and content
 2013-01-23 15:25:50 -08:00
Adam Powell
6508304918 am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev 
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '5a32ec323784ad7926bb9dc3b3678c9b60d3a4ba':
  Prevent simultaneous interaction with action bar and content
 2013-01-23 15:24:18 -08:00
Adam Powell
5a32ec3237 Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev 2013-01-23 23:20:57 +00:00
Adam Powell
27cba38952 Touch action bar title text: you will go to space today! 
Title/subtitle text in an action bar is now a full alias for home/up.

Add some prototype ActionBar functionality around titles for future
API consideration.

Bug 7966136

Change-Id: I14377121dcb976d0a5f1e1862f35c3d267eb5458
 2013-01-23 15:14:31 -08:00
Adam Powell
d28f30a9e0 Prevent simultaneous interaction with action bar and content 
Bug 8034744

Change-Id: I72cf4f5d2443e1cd6e40785b4d06d9bd363ab3e4
 2013-01-23 14:23:06 -08:00
Wink Saville
24dbdc7d0e am 23d85a91: am d84d289f: Merge "Telephony: Consider EVDO ecio zero value as valid." 
* commit '23d85a911e46ac00ecaf146ca729aa3a46d17f59':
  Telephony: Consider EVDO ecio zero value as valid.
 2013-01-23 09:42:03 -08:00
Wink Saville
23d85a911e am d84d289f: Merge "Telephony: Consider EVDO ecio zero value as valid." 
* commit 'd84d289f443f5799fb1a81432428703dadb026dd':
  Telephony: Consider EVDO ecio zero value as valid.
 2013-01-23 09:38:19 -08:00
Wink Saville
d84d289f44 Merge "Telephony: Consider EVDO ecio zero value as valid." 2013-01-23 17:15:59 +00:00
Christopher Tate
e93ca308c8 am 0e95685f: am b5a72043: Merge "Fix array index oob in Matrix3f.loadRotate()." 
* commit '0e95685ff49c4d189464170cc03d2d74f23da475':
  Fix array index oob in Matrix3f.loadRotate().
 2013-01-22 18:42:40 -08:00
Christopher Tate
0e95685ff4 am b5a72043: Merge "Fix array index oob in Matrix3f.loadRotate()." 
* commit 'b5a7204313447101ad80c0c6015e930f1e6b1013':
  Fix array index oob in Matrix3f.loadRotate().
 2013-01-22 18:39:55 -08:00
Stephen Hines
3983754bbb One more fix for incorrect indices. 
Change-Id: I283f2f09cd0a17eefed4a763b08df856bbae76b3
 2013-01-22 18:29:41 -08:00
Christopher Tate
b5a7204313 Merge "Fix array index oob in Matrix3f.loadRotate()." 2013-01-23 01:49:59 +00:00
Elliott Hughes
ef5d1d6355 am 6bcecb20: am b63e39a0: Merge "fix typo for symbol" 
* commit '6bcecb20005bf397169a120e9dc3c91d30dba154':
  fix typo for symbol
 2013-01-22 16:21:03 -08:00
Elliott Hughes
6bcecb2000 am b63e39a0: Merge "fix typo for symbol" 
* commit 'b63e39a076c0643680f501a1c646bca088b4bbfc':
  fix typo for symbol
 2013-01-22 16:18:58 -08:00
Stephen Hines
0ce7cdaffd Fix array index oob in Matrix3f.loadRotate(). 
https://code.google.com/p/android/issues/detail?id=42860

Change-Id: Idbf18576da3ad5b84b4209147dad34cc2f9044d2
 2013-01-22 16:01:44 -08:00
Amith Yamasani
05f1f0ece8 am 555b07df: am 2c64b539: am 596532d9: Properly initialize recognition service if the recognizer component changed. 
* commit '555b07df08dd4c2472374d0767926ebab928dede':
  Properly initialize recognition service if the recognizer component changed.
 2013-01-22 15:48:10 -08:00
Amith Yamasani
555b07df08 am 2c64b539: am 596532d9: Properly initialize recognition service if the recognizer component changed. 
* commit '2c64b53976a99f28bc7c0612648581f9b93bf8b0':
  Properly initialize recognition service if the recognizer component changed.
 2013-01-22 15:46:25 -08:00
Amith Yamasani
2c64b53976 am 596532d9: Properly initialize recognition service if the recognizer component changed. 
* commit '596532d9dbea3460dbc989b0316c721ca69f4915':
  Properly initialize recognition service if the recognizer component changed.
 2013-01-22 15:43:53 -08:00
Amith Yamasani
596532d9db Properly initialize recognition service if the recognizer component changed. 
The getServiceInfo() call directly to IPackageManager does not throw an exception.
The return value needed to be checked for null.

Bug: 8031032
Change-Id: I701b9e8cf3b2406a3b35a486183330489b3d46f5
 2013-01-22 15:35:49 -08:00
Kenny Root
cc1fc6b6ad Track libcore changes for OpenSSLKey 
Change-Id: I39f60c34daa9ccc633efb02988ea238a84e6bbf1
 2013-01-22 15:22:56 -08:00
Elliott Hughes
b63e39a076 Merge "fix typo for symbol" 2013-01-22 23:19:20 +00:00
HeyRatFans
4037ce3c01 frameworks/base: Added English UK keyboard layout for physical keyboards 
Change-Id: Id6feb128964c76ebd74b3e0d67d8f90fedb91dda
 2013-01-22 22:22:54 +00:00
John Reck
58fb00025d am ecd3c76f: am 6458d9b1: Merge "Fix for truncated sentence in "Find on Page" field" 
* commit 'ecd3c76f6275d0ffb0b36100936cf284ab00bee2':
  Fix for truncated sentence in "Find on Page" field
 2013-01-22 13:57:51 -08:00
John Reck
ecd3c76f62 am 6458d9b1: Merge "Fix for truncated sentence in "Find on Page" field" 
* commit '6458d9b1b283590b5ced3c8982c4ea2e2a39cf2e':
  Fix for truncated sentence in "Find on Page" field
 2013-01-22 13:54:50 -08:00
John Reck
6458d9b1b2 Merge "Fix for truncated sentence in "Find on Page" field" 2013-01-22 21:12:49 +00:00
Masanori Ogino
f449c0c381 fix hover events consume issue 
View#onHoverEvent() would always consume hover events over the view
if an application window has the clickable view/widget on it.
That's happened even if accessibility/talkback is disabled.
So those events will not dispatch to activity#onGenericMotionEvent().

The onHoverEvent method should return a real consumed state.

Change-Id: I9cac13b82866e5cdda0b03befb0de752a0a2e741
 2013-01-22 18:10:52 +09:00
Robert Ly
4efe071ed6 docs: update auth doc to mention multiple scopes bug 7644251 
Change-Id: I7f0c2e822c306161ae02b11439e5e0095463bcff
 2013-01-18 13:33:25 -08:00
Dake Gu
85a06152ce am fe88f1be: Merge "Fix bug of SimulatedTrackball" into jb-mr1-aah-dev 
* commit 'fe88f1be3d197987a874f6c29fefdeb11db183f6':
  Fix bug of SimulatedTrackball
 2013-01-18 13:26:02 -08:00
Dake Gu
fe88f1be3d Merge "Fix bug of SimulatedTrackball" into jb-mr1-aah-dev 2013-01-18 21:22:45 +00:00
Alex Klyubin
4ef6c9b6a1 Add TLS Channel ID support to SSLCertificateSocketFactory. 
This adds a new method setChannelIdPrivateKey as a hidden API.

See http://tools.ietf.org/html/draft-balfanz-tls-channelid-00 for
more information about the TLS Channel ID extension.

Change-Id: I73c1905afdce01d4831de7faa55ea4496575b5a5
 2013-01-18 12:50:39 -08:00
The Android Automerger
125a812c4c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-18 12:20:10 -08:00
Victoria Lease
00ef2a3622 am c62eefa0: am 3599f0a0: (-s ours) am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev 
* commit 'c62eefa02aefb0bf3870e063aa47df6dccbf5862':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
 2013-01-18 10:53:48 -08:00
Victoria Lease
c62eefa02a am 3599f0a0: (-s ours) am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev 
* commit '3599f0a02129c238177806ce3d6db20853230d4d':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
 2013-01-18 10:51:25 -08:00
Victoria Lease
3599f0a021 am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev 
* commit '0cf97d32178b689184866e731c0a4105d8223d80':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
 2013-01-18 10:49:07 -08:00
Victoria Lease
0cf97d3217 Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care." into jb-mr1.1-dev 2013-01-18 18:43:11 +00:00
Robert Ly
dbdf8767e2 am 5287cd74: am 6d59e0ea: am a239b933: am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 
* commit '5287cd7476e0096f5f36866f81b47950343e4155':
  docs: Add PageTransformer to animations training class
 2013-01-18 10:34:11 -08:00
Robert Ly
5287cd7476 am 6d59e0ea: am a239b933: am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 
* commit '6d59e0ead242978eff8a64d314a1f8554694d8a6':
  docs: Add PageTransformer to animations training class
 2013-01-18 10:31:48 -08:00
Robert Ly
6d59e0ead2 am a239b933: am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 
* commit 'a239b933f7982ed069ccd284b4eab0fb5e4b6505':
  docs: Add PageTransformer to animations training class
 2013-01-18 10:28:41 -08:00
Robert Ly
a239b933f7 am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 
* commit '548e17dfdbd862cdfc663268a6d67b47f42b9544':
  docs: Add PageTransformer to animations training class
 2013-01-18 10:23:29 -08:00
Robert Ly
548e17dfdb Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 2013-01-18 18:20:40 +00:00
Dake Gu
f8739b992f Fix bug of SimulatedTrackball 
Simulated trackball should not generate KeyEvent if dispatchGenericMotionEvent
returns true

b/8022205

Change-Id: I1857e25407c508c98ef4db85fe146b1e25a0803e
 2013-01-17 18:15:44 -08:00