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

77569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
465de2ddf4 am a11b24ef: am 01119de9: Merge "Fix 6485058: remove OnTriggerListeners from Wave*Methods in cleanup" into jb-dev 
* commit 'a11b24ef12ace6b5923997566a434a4fd8041ecb':
  Fix 6485058: remove OnTriggerListeners from Wave*Methods in cleanup
 2012-05-14 08:37:52 -07:00
Jean-Michel Trivi
d8be1b9e67 am 3d486406: am 2d97a70f: Merge "Start voice-based interactions from headsethook key" into jb-dev 
* commit '3d486406ab510dfab0e4b6913de90be9486074ad':
  Start voice-based interactions from headsethook key
 2012-05-14 08:37:47 -07:00
Pin Ting
f579c86ae4 am 4de3c27c: am 59e2a1ea: Merge "Fix typo in javadoc." into jb-dev 
* commit '4de3c27cc702c019e7a9304d9e548fc81340ad7e':
  Fix typo in javadoc.
 2012-05-14 08:37:44 -07:00
Jeff Brown
1243d62c29 am a1f13767: am 11cfd0d4: Merge "Tell power HAL when user activity occurs." into jb-dev 
* commit 'a1f13767b37fe723895f1f09a907b739885483d7':
  Tell power HAL when user activity occurs.
 2012-05-14 08:37:30 -07:00
Jeff Brown
ac592fb3b6 am a4881637: am 58770232: Merge "Move power HAL interactions to PowerManagerService." into jb-dev 
* commit 'a48816375f68a8b4a945efcb68e405308a50adc9':
  Move power HAL interactions to PowerManagerService.
 2012-05-14 08:37:26 -07:00
Jeff Brown
93a076819e am 1f85b46b: am dca5fb9e: Merge "Enable SQLite configuration to be set with system properties." into jb-dev 
* commit '1f85b46b3f4764f13c79203564ccb56be7cdf603':
  Enable SQLite configuration to be set with system properties.
 2012-05-14 08:37:13 -07:00
Jamie Gennis
ba6f4ee86d am 131006b8: am d83fdd03: Merge "Trace: add a tracing tag for video" into jb-dev 
* commit '131006b810121c50425f727a5d879428f1709420':
  Trace: add a tracing tag for video
 2012-05-14 08:37:02 -07:00
Jamie Gennis
671543f762 am 592cbb83: am c9e27d4b: Merge "Surface: replace active rect with window crop" into jb-dev 
* commit '592cbb835aa5ed104badf7de6c144a7b90300620':
  Surface: replace active rect with window crop
 2012-05-14 08:36:58 -07:00
Amith Yamasani
6f0d0e3ff3 am 0df55728: am 775da5fa: Merge "Update assets that didn\'t scale nicely from hdpi to tvdpi." into jb-dev 
* commit '0df557289b98702ab3c903eadcb051ce5dc7dbee':
  Update assets that didn't scale nicely from hdpi to tvdpi.
 2012-05-14 08:36:47 -07:00
Victoria Lease
74023bfbb5 am a54e9953: am f1b0c4e5: Merge "Add fallback fonts for Malayalam, Kannada, and Telugu scripts" into jb-dev 
* commit 'a54e995377d4ebb0a3633fdb82badb9536931a94':
  Add fallback fonts for Malayalam, Kannada, and Telugu scripts
 2012-05-14 08:36:31 -07:00
James Dong
16ff4fbab7 am f4513bb9: am 909c4b85: Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into jb-dev 
* commit 'f4513bb95b6c8b831b747bf08accd74f96ce712b':
  Improve notifying TimedText by reducing marshall/unmarshalling.
 2012-05-14 08:36:21 -07:00
Adam Powell
e60a635919 am e48c70e4: am 7fc4fbcc: Merge "Automatic persistent text selection for ListViews" into jb-dev 
* commit 'e48c70e4d9302795d5f02d352c7907302ca5c8b6':
  Automatic persistent text selection for ListViews
 2012-05-14 08:36:17 -07:00
Gilles Debunne
579cc204a2 am b00ceecb: am 0ae107ff: Merge "Cut long text into multiple DL at start" into jb-dev 
* commit 'b00ceecb96063a30bb73b13e156a6da00e3900e7':
  Cut long text into multiple DL at start
 2012-05-14 08:36:08 -07:00
Craig Mautner
cf462d65d2 am ba523324: am ab1c5456: Merge "Keep launcher screen from flashing over lockscreen" into jb-dev 
* commit 'ba523324f32ca55221e07e31b2d0699826daa2fe':
  Keep launcher screen from flashing over lockscreen
 2012-05-14 08:36:05 -07:00
Fabrice Di Meglio
96469491b7 am 791044c2: am 6788e028: Merge "Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly" into jb-dev 
* commit '791044c2bf80d53ac2e1c2af153fb9d857374259':
  Fix bug #6480486 Zero width non-joiner and zero width joiner rendered weirdly
 2012-05-14 08:35:59 -07:00
Kenny Root
0a0e3468aa am 0058ae9d: am c559e3b7: Merge "Add in constant for WPA supplication settings" into jb-dev 
* commit '0058ae9d7bdcb5d677d1aad44079155b6e99b188':
  Add in constant for WPA supplication settings
 2012-05-14 08:35:48 -07:00
Jeff Sharkey
d640d0641a am f2fe4cb1: am cd586258: Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev 
* commit 'f2fe4cb11b2b93acf1a983e856efe26b6bb79683':
  Enforce READ_EXTERNAL through Settings.Secure.
 2012-05-14 08:35:42 -07:00
Jim Miller
dc3ee963bf am 07827454: am 2b5cebeb: Merge "Fix 6040870: Update MultiWaveView for new device" into jb-dev 
* commit '07827454efef7f46d46e923a5091d8cf1e5d0d8c':
  Fix 6040870: Update MultiWaveView for new device
 2012-05-14 08:35:24 -07:00
Eric Fischer
694ddb6dee am 9f382b09: (-s ours) am 42097f5c: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '9f382b093feb76a9f7f7fc68cf5b131d59c658fe':
  Import translations. DO NOT MERGE
 2012-05-14 08:35:16 -07:00
Eric Fischer
4f6831c51d am a7faeb0c: (-s ours) am 3fd57b57: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'a7faeb0c6b97c8a43339e45e3f37056c30e4c685':
  Import translations. DO NOT MERGE
 2012-05-14 07:49:28 -07:00
Irfan Sheriff
8c898e1e43 am aa7b072d: am ba1db8a5: Merge "Fix wifi direct issues" into jb-dev 
* commit 'aa7b072dffa8ba12e74f770cafe0b7acb5b81e02':
  Fix wifi direct issues
 2012-05-14 07:49:15 -07:00
Stephen Hines
4106d56b6e am 8470381b: am dcc1996b: Merge "Test clamp (full and relaxed precision)." into jb-dev 
* commit '8470381b0c6866a0d2fabda2ff02ae550ca60715':
  Test clamp (full and relaxed precision).
 2012-05-14 07:48:56 -07:00
John Reck
e6d1d4d4bb am 51688c51: am dee9d9ab: Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev 
* commit '51688c51c14e7e92bc6d6139a099cf701b1608b0':
  Prevent updateStateTrackers from being affected by preventDefault()
 2012-05-14 07:48:44 -07:00
Jeff Brown
d4bef4b786 am 47272c93: am b12b6b51: Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev 
* commit '47272c932ab6157022aaefd015e5d1df9dc5bd2f':
  Minor refactoring before starting on velocity tracker changes.
 2012-05-14 07:48:31 -07:00
Teng-Hui Zhu
e947752c0f am 08df9eac: am ef279363: Merge "Fix a crash." into jb-dev 
* commit '08df9eac6e7ef246afb5ccd9d7cccadcb131e7b2':
  Fix a crash.
 2012-05-14 07:48:21 -07:00
Chet Haase
7008d7b7f3 am fd086b95: am 76f08218: Merge "Fix quickReject logic for transformed views" into jb-dev 
* commit 'fd086b95103e8c7fbe853f5702aaa7d04f2141f0':
  Fix quickReject logic for transformed views
 2012-05-14 07:47:59 -07:00
Jeff Brown
179817387b am f4df93ce: am 2f095760: Rename kcm attribute to keyboardLayout. 
* commit 'f4df93cec62861e3f185979612360c27dd80e043':
  Rename kcm attribute to keyboardLayout.
 2012-05-14 07:47:52 -07:00
Raph Levien
641f1c917e am 7dbf4ee4: (-s ours) am 3816174b: Add explicit id for fontFamily attribute. 
* commit '7dbf4ee416172f44df227e550e6fc1babecd5061':
  Add explicit id for fontFamily attribute.
 2012-05-14 07:47:42 -07:00
Chet Haase
ad4fc6f764 am 4a70bc72: am 26511012: Merge "Clear animations in DisplayLists when done" into jb-dev 
* commit '4a70bc72a87427115d9d64516145283dc96745f2':
  Clear animations in DisplayLists when done
 2012-05-14 07:26:23 -07:00
Romain Guy
d6a98aafab am 30b013bf: am d303dd3d: Merge "Prevent NPE in TextureView.getBitmap()" into jb-dev 
* commit '30b013bfbad60e20b7f812d0c5e41893fb7503fa':
  Prevent NPE in TextureView.getBitmap()
 2012-05-12 16:46:55 -07:00
Teng-Hui Zhu
cffefb7062 am 9895881b: am 9ac32040: Merge "Keep the controller when video ended." into jb-dev 
* commit '9895881b2ca944e57b625368df18f40d3feeeba8':
  Keep the controller when video ended.
 2012-05-12 16:46:44 -07:00
Teng-Hui Zhu
87084281ca am b5005a54: am 6df5ca08: Merge "Avoid inline->fullscreen reload for html5 video." into jb-dev 
* commit 'b5005a544f779a7df9bfe960003ac135257487ef':
  Avoid inline->fullscreen reload for html5 video.
 2012-05-12 16:46:40 -07:00
Raph Levien
faed6dbec4 am 641ce591: am c9c275fe: Merge "Add RobotoCondensed family and optimized Roboto Light." into jb-dev 
* commit '641ce591a697eae74a75b7766e091691942f77e5':
  Add RobotoCondensed family and optimized Roboto Light.
 2012-05-12 16:46:32 -07:00
Jim Miller
a11b24ef12 am 01119de9: Merge "Fix 6485058: remove OnTriggerListeners from Wave*Methods in cleanup" into jb-dev 
* commit '01119de91d28d6e053ba2365ae6b1b03276446f0':
  Fix 6485058: remove OnTriggerListeners from Wave*Methods in cleanup
 2012-05-12 13:34:05 -07:00
Jim Miller
01119de91d Merge "Fix 6485058: remove OnTriggerListeners from Wave*Methods in cleanup" into jb-dev 2012-05-12 13:31:41 -07:00
Jean-Michel Trivi
3d486406ab am 2d97a70f: Merge "Start voice-based interactions from headsethook key" into jb-dev 
* commit '2d97a70ff8bbac5ea807003d65b64e3b255e82bc':
  Start voice-based interactions from headsethook key
 2012-05-12 08:08:28 -07:00
Jean-Michel Trivi
2d97a70ff8 Merge "Start voice-based interactions from headsethook key" into jb-dev 2012-05-12 08:06:28 -07:00
Pin Ting
4de3c27cc7 am 59e2a1ea: Merge "Fix typo in javadoc." into jb-dev 
* commit '59e2a1ea01dc646ca68c6039b39eb809fe1a7a8e':
  Fix typo in javadoc.
 2012-05-12 06:57:53 -07:00
Pin Ting
59e2a1ea01 Merge "Fix typo in javadoc." into jb-dev 2012-05-12 06:56:04 -07:00
Jeff Brown
a1f13767b3 am 11cfd0d4: Merge "Tell power HAL when user activity occurs." into jb-dev 
* commit '11cfd0d41f3c848ffd54ba650aa921d5224e7917':
  Tell power HAL when user activity occurs.
 2012-05-11 19:35:26 -07:00
Jeff Brown
a48816375f am 58770232: Merge "Move power HAL interactions to PowerManagerService." into jb-dev 
* commit '58770232216cd735afdfd3dd53151070e06de5ce':
  Move power HAL interactions to PowerManagerService.
 2012-05-11 19:35:23 -07:00
Jeff Brown
11cfd0d41f Merge "Tell power HAL when user activity occurs." into jb-dev 2012-05-11 19:33:17 -07:00
Jeff Brown
5877023221 Merge "Move power HAL interactions to PowerManagerService." into jb-dev 2012-05-11 19:32:56 -07:00
Jeff Brown
30e5eb4826 Tell power HAL when user activity occurs. 
Bug: 6435382
Change-Id: I78754158b057851fcba807ebbda143899da387ec
 2012-05-11 19:18:56 -07:00
Jeff Brown
7304c34382 Move power HAL interactions to PowerManagerService. 
This refactoring sets the stage for a follow-on change that
will make use additional functions of the power HAL.

Moved functionality from android.os.Power into PowerManagerService.
None of these functions make sense being called outside of the
system server.  Moving them to the PowerManagerService makes it
easier to ensure that the power HAL is initialized exactly once.

Similarly, moved ShutdownThread out of the policy package and into
the services package where it can tie into the PowerManagerService
as needed.

Bug: 6435382
Change-Id: I958241bb124fb4410d96f5d5eb00ed68d60b29e5
 2012-05-11 18:42:42 -07:00
Jeff Brown
1f85b46b3f am dca5fb9e: Merge "Enable SQLite configuration to be set with system properties." into jb-dev 
* commit 'dca5fb9e7e193d6aed233e0650691675a56022a3':
  Enable SQLite configuration to be set with system properties.
 2012-05-11 18:22:12 -07:00
Jeff Brown
dca5fb9e7e Merge "Enable SQLite configuration to be set with system properties." into jb-dev 2012-05-11 18:19:39 -07:00
Jamie Gennis
131006b810 am d83fdd03: Merge "Trace: add a tracing tag for video" into jb-dev 
* commit 'd83fdd03a1daaf577d80c8abda86c7c01bf6d3bb':
  Trace: add a tracing tag for video
 2012-05-11 17:19:53 -07:00
Jamie Gennis
592cbb835a am c9e27d4b: Merge "Surface: replace active rect with window crop" into jb-dev 
* commit 'c9e27d4ba1f46eb29aa8a794685ecb7c492d5d83':
  Surface: replace active rect with window crop
 2012-05-11 17:19:50 -07:00
Jamie Gennis
d83fdd03a1 Merge "Trace: add a tracing tag for video" into jb-dev 2012-05-11 17:17:47 -07:00