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

80684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
203ad16d29 am 5158db8b: Reconcile with jb-release 
* commit '5158db8b07e9512788ecf1f887643e8bc25ce48f':
  Fix an NPE and possible unsynchronized call of Locked method.
  Fix 6665117: ACTION_ASSIST visual improvements
  Capture window manager's last ANR state in bug report.
  Capture input dispatcher's last ANR state in bug report.
  Fix issue #6636731: Mariner animation ring gets stuck
  Jelly Bean ringtone Bug: 6619980
  Remove Disco video from builds.
  Change snap behavior for lock screen
  Improve ANR diagnostics.
  Detect bad behavior earlier in Choreographer.
  Revert "Fix fake bold for fallback fonts in frameworks."
  Include important native processes in watchdog stacks.
  Fix issue #6641368: can't launch gallery
 2012-06-19 06:19:56 -07:00
The Android Open Source Project
5158db8b07 Reconcile with jb-release 
Change-Id: I451b63991c4550290f6e32f2f555f0412bf0b28c
 2012-06-19 06:13:23 -07:00
Adam Powell
e97d222110 am 29a2f84f: am 5bb835a9: Merge "MediaRouter bluetooth a2dp selection" into jb-dev 
* commit '29a2f84fbee96c1bbbcb50eceb17d9b726854146':
  MediaRouter bluetooth a2dp selection
 2012-06-18 21:43:46 -07:00
Adam Powell
29a2f84fbe am 5bb835a9: Merge "MediaRouter bluetooth a2dp selection" into jb-dev 
* commit '5bb835a95942b0b313b2fa4e3f05941e630f9be7':
  MediaRouter bluetooth a2dp selection
 2012-06-18 21:40:19 -07:00
Adam Powell
5bb835a959 Merge "MediaRouter bluetooth a2dp selection" into jb-dev 2012-06-18 21:36:23 -07:00
Adam Powell
dd0a19266d MediaRouter bluetooth a2dp selection 
Remove bluetooth permission check from internal AudioService method
setBluetoothA2dpOn

Manage BT A2DP state in MediaRouter. A2DP is only enabled or disabled
when either the system built-in audio route or the A2DP audio route is
selected; when selecting any other route the current state is left
alone.

Change-Id: Ib14274e206e79bd8762edca1205ecfa87b7a94cf
 2012-06-18 19:51:02 -07:00
Jeff Brown
4f8ecd8029 Move power manager to a new package. 
Change-Id: I5f5a6435e64354b7d6535e8e9a63934ba7a3f448
 2012-06-18 19:43:44 -07:00
Gilles Debunne
099adfba81 am 4c268a32: am badf5a94: Merge "Fixed text rendering issue with spans." into jb-dev 
* commit '4c268a32714fefe141d093abb59806a2d6f2991c':
  Fixed text rendering issue with spans.
 2012-06-18 18:59:25 -07:00
Gilles Debunne
4c268a3271 am badf5a94: Merge "Fixed text rendering issue with spans." into jb-dev 
* commit 'badf5a9442e639dc6ae2c4794c202143f6d2f16d':
  Fixed text rendering issue with spans.
 2012-06-18 18:56:12 -07:00
Gilles Debunne
badf5a9442 Merge "Fixed text rendering issue with spans." into jb-dev 2012-06-18 18:53:31 -07:00
Craig Mautner
ceeec4e6a6 am ae3e5bc9: am 89f5a462: Merge "More paths for turning on screen immediately." into jb-dev 
* commit 'ae3e5bc93f1077615b4ec8f6fbd06509241d25de':
  More paths for turning on screen immediately.
 2012-06-18 18:07:46 -07:00
Craig Mautner
ae3e5bc93f am 89f5a462: Merge "More paths for turning on screen immediately." into jb-dev 
* commit '89f5a4624bfa487cb5fb192d9c3c9b30937b3f26':
  More paths for turning on screen immediately.
 2012-06-18 18:04:42 -07:00
Craig Mautner
89f5a4624b Merge "More paths for turning on screen immediately." into jb-dev 2012-06-18 18:01:53 -07:00
Nicolas Falliere
4d2bef3f85 am 277c09f6: am 56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev 
* commit '277c09f6c16c4adfd50407e2fa4dbf61a0e06e55':
  Added or fixed doctrings for required permissions.
 2012-06-18 17:45:40 -07:00
Nicolas Falliere
277c09f6c1 am 56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev 
* commit '56bb344ccfd3d261cea9987c98a17d0820279b17':
  Added or fixed doctrings for required permissions.
 2012-06-18 17:42:57 -07:00
Nicolas Falliere
56bb344ccf Merge "Added or fixed doctrings for required permissions." into jb-dev 2012-06-18 17:39:48 -07:00
Jim Miller
3eda1903c7 am 60fd2b2d: am ddbc85cb: Merge "Fix 6683092: tune GlowPadView wave animation" into jb-dev 
* commit '60fd2b2de286f3543cf9db9550db9083211ca5ea':
  Fix 6683092: tune GlowPadView wave animation
 2012-06-18 17:25:37 -07:00
Jim Miller
60fd2b2de2 am ddbc85cb: Merge "Fix 6683092: tune GlowPadView wave animation" into jb-dev 
* commit 'ddbc85cbfdc8ac6ed02b104f0e9c46018a0e1c53':
  Fix 6683092: tune GlowPadView wave animation
 2012-06-18 17:23:28 -07:00
Nicolas Falliere
9530e3a22d Added or fixed doctrings for required permissions. 
Bug: 6591338
Change-Id: Ia2092f9994854701b5fa1425c371817367ae07ec
 2012-06-18 17:22:34 -07:00
Jim Miller
ddbc85cbfd Merge "Fix 6683092: tune GlowPadView wave animation" into jb-dev 2012-06-18 17:22:10 -07:00
Jim Miller
5892e2ec25 Fix 6683092: tune GlowPadView wave animation 
This adds some aesthetic changes to the wave animation for GlowPadView:
- wave shape is no longer symmetric
- disable expand in keyguard
- enable expand in SearchPanelView (when mAlwaysTrackFinger == true)
- if a current wave animation isn't finished yet, don't start a new one
- various timing changes

Change-Id: Ibce96f45eb6a94582c694108b99e243fd57b1955
 2012-06-18 17:04:58 -07:00
Amith Yamasani
dcf0cc679b am 39758edb: am 386ce58a: Merge "Don\'t backup or delete the backup file, if it\'s in the backup path." into jb-dev 
* commit '39758edbed0be8f3d75427f750db6e9d005cd16a':
  Don't backup or delete the backup file, if it's in the backup path.
 2012-06-18 16:53:39 -07:00
Craig Mautner
75fc9de258 More paths for turning on screen immediately. 
This fix forces the path through the updateLightsLocked method to turn
the screen on immediately if mWaitingForFirstLightSensor is true. Also
do not clear mWaitingForFirstLightSensor if mPreparingForScreenOn
is true. Wait until it turns false.

Fixes bug 6612418.

Change-Id: I03407e748cce4906a73de1f15df1654649b133c4
 2012-06-18 16:53:27 -07:00
Amith Yamasani
39758edbed am 386ce58a: Merge "Don\'t backup or delete the backup file, if it\'s in the backup path." into jb-dev 
* commit '386ce58a21b81390d2831b0f1107d03773af687a':
  Don't backup or delete the backup file, if it's in the backup path.
 2012-06-18 16:51:41 -07:00
Amith Yamasani
386ce58a21 Merge "Don't backup or delete the backup file, if it's in the backup path." into jb-dev 2012-06-18 16:49:28 -07:00
Dianne Hackborn
04919812d6 am 56b3a321: am 1991850d: Merge "Implement issue #6680894: Provide a way to configure app defaults..." into jb-dev 
* commit '56b3a321e7c6f03d1bc0c5c0915d56bc46b7a33e':
  Implement issue #6680894: Provide a way to configure app defaults...
 2012-06-18 16:24:03 -07:00
Dianne Hackborn
56b3a321e7 am 1991850d: Merge "Implement issue #6680894: Provide a way to configure app defaults..." into jb-dev 
* commit '1991850de7bbcc534c2cb457f33055c533542136':
  Implement issue #6680894: Provide a way to configure app defaults...
 2012-06-18 16:21:43 -07:00
Dianne Hackborn
1991850de7 Merge "Implement issue #6680894: Provide a way to configure app defaults..." into jb-dev 2012-06-18 16:19:56 -07:00
Christopher Tate
f8fd7ef978 Merge "Fail immediately if bindService() is passed a null ServiceConnection" 2012-06-18 16:00:19 -07:00
Christopher Tate
79b3317b77 Fail immediately if bindService() is passed a null ServiceConnection 
Or if unbindService() is passed one, naturally.

Change-Id: Ib7f1f0b5e12c04e3affbcc9008612801081819d5
 2012-06-18 15:56:33 -07:00
Jeff Brown
cf327449f4 Fix an NPE and possible unsynchronized call of Locked method. 
Bug: 6680398
Change-Id: Id5ef4fa82b2a5ef5e9c3934ca95156143f91e5e2
 2012-06-18 15:53:54 -07:00
Jim Miller
e792d52ace Fix 6665117: ACTION_ASSIST visual improvements 
- add generic icon for search providers that don't supply one
- change alpha weighting factor for glow
- don't show ring background

Change-Id: I86c86dc2d623c25ec7b91e206fac8ad9cd60faac
 2012-06-18 15:53:53 -07:00
Dianne Hackborn
fc8b7fe026 Implement issue #6680894: Provide a way to configure app defaults... 
...for a smoother OOB experience

Way provided.

Put your defaults in system/etc/preferred-apps/*.xml.

Figure out what to put there with "adb shell dumpsys package preferred-xml".

Bug: 6680894
Change-Id: Ia06bb0061876274a5f80bf06d1ba5ad155edc323
 2012-06-18 15:38:12 -07:00
Jeff Brown
40af9c04c5 am 81c61fda: am c4b0d098: Merge "Fix an NPE and possible unsynchronized call of Locked method." into jb-dev 
* commit '81c61fda9a1b45db4c06d2db2cf24b42045d4f76':
  Fix an NPE and possible unsynchronized call of Locked method.
 2012-06-18 14:20:27 -07:00
Jeff Brown
81c61fda9a am c4b0d098: Merge "Fix an NPE and possible unsynchronized call of Locked method." into jb-dev 
* commit 'c4b0d098d60ad532cebb3c043f3a1cdb39033f1f':
  Fix an NPE and possible unsynchronized call of Locked method.
 2012-06-18 14:17:53 -07:00
Jeff Brown
c4b0d098d6 Merge "Fix an NPE and possible unsynchronized call of Locked method." into jb-dev 2012-06-18 14:14:55 -07:00
Craig Mautner
aa9c9efa8f Merge "More steps to isolate animation." 2012-06-18 13:56:32 -07:00
Jim Miller
048311ca37 am a10b1a73: am 12da2c5e: Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev 
* commit 'a10b1a738dfa8fcf094fec555e7d85dba179f5fc':
  Fix 6665117: ACTION_ASSIST visual improvements
 2012-06-18 13:34:59 -07:00
Jim Miller
a10b1a738d am 12da2c5e: Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev 
* commit '12da2c5eeeadd6c23da5d3003d0da3b6b73d5052':
  Fix 6665117: ACTION_ASSIST visual improvements
 2012-06-18 13:32:05 -07:00
Jim Miller
12da2c5eee Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev 2012-06-18 13:29:49 -07:00
Amith Yamasani
0ba48a5402 Don't backup or delete the backup file, if it's in the backup path. 
Change-Id: Ie77782722a271e09f8cbde7fb5393e8127d4334d
 2012-06-18 13:04:27 -07:00
Ying Wang
d0aebd9009 am a5bcf814: (-s ours) am c4947277: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'a5bcf814166b68ac0cec0d76acb61d49c2e03dc2':
  Import translations. DO NOT MERGE
 2012-06-18 13:01:45 -07:00
Jeff Brown
ee17241487 Fix an NPE and possible unsynchronized call of Locked method. 
Bug: 6680398
Change-Id: Id5ef4fa82b2a5ef5e9c3934ca95156143f91e5e2
 2012-06-18 12:59:13 -07:00
Ying Wang
a5bcf81416 am c4947277: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'c4947277e821153fc01256a425e4cbbe34a06eda':
  Import translations. DO NOT MERGE
 2012-06-18 12:58:59 -07:00
Scott Anderson
fce27d8edd Merge "Clean up IntToStrings for window TYPE_*" 2012-06-18 12:57:05 -07:00
Ying Wang
c4947277e8 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-18 12:57:03 -07:00
Ying Wang
601a0b9d5f Merge "Import translations. DO NOT MERGE" 2012-06-18 12:56:44 -07:00
Ying Wang
9ff1f941be Import translations. DO NOT MERGE 
Change-Id: I4da9224e3ede617f1680165966a16e43febc1b8a
 2012-06-18 12:44:17 -07:00
Ying Wang
e3efec74b3 Import translations. DO NOT MERGE 
Change-Id: I0108055d8a3aa31fb8157b43e0f2224fab488642
 2012-06-18 12:36:51 -07:00
Adam Powell
987f4a504a am 12c2fbd3: am eb2c1b21: Merge "Restrict MediaRouter selection" into jb-dev 
* commit '12c2fbd3b7e98132fe1388b065a5dd09c20ef390':
  Restrict MediaRouter selection
 2012-06-18 12:13:57 -07:00