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

91913 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
49c762f79a am 547c20df: am 48f6b7e2: am 59cb2cf1: Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev 
* commit '547c20dfc88c7981449fcfdecf7deaa17d6fedc2':
  Revert fix to issue #6880627: PendingIntent.getService() returns...
 2012-10-12 17:50:32 -07:00
Dianne Hackborn
547c20dfc8 am 48f6b7e2: am 59cb2cf1: Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev 
* commit '48f6b7e228f4b18181756b7c97df094b86a550aa':
  Revert fix to issue #6880627: PendingIntent.getService() returns...
 2012-10-12 17:48:12 -07:00
Dianne Hackborn
48f6b7e228 am 59cb2cf1: Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev 
* commit '59cb2cf15c912280b32292c79c2c0e5bfea49b68':
  Revert fix to issue #6880627: PendingIntent.getService() returns...
 2012-10-12 17:46:39 -07:00
Dianne Hackborn
59cb2cf15c Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev 2012-10-12 17:43:46 -07:00
Michael Jurka
f72118446b am 734a68fb: am 3b61f479: am f15005ee: Merge "Use black bg in recents if using live wallpaper" into jb-mr1-dev 
* commit '734a68fb20e2f10cb013066e745151e05d0ce5c2':
  Use black bg in recents if using live wallpaper
 2012-10-12 16:48:21 -07:00
Michael Jurka
734a68fb20 am 3b61f479: am f15005ee: Merge "Use black bg in recents if using live wallpaper" into jb-mr1-dev 
* commit '3b61f479cdc6efc0a181103f14e59ec520f08713':
  Use black bg in recents if using live wallpaper
 2012-10-12 16:45:58 -07:00
Michael Jurka
3b61f479cd am f15005ee: Merge "Use black bg in recents if using live wallpaper" into jb-mr1-dev 
* commit 'f15005ee3926302588d19f1be6ad4a62b3e691b4':
  Use black bg in recents if using live wallpaper
 2012-10-12 16:43:42 -07:00
Michael Jurka
f15005ee39 Merge "Use black bg in recents if using live wallpaper" into jb-mr1-dev 2012-10-12 16:41:48 -07:00
Guang Zhu
8a8881916e am a1672140: am d3036f7e: am d4805af6: Merge "use BufferedInputStream in readTextFile" into jb-mr1-dev 
* commit 'a16721402b20dd0c53e54aa2fe274a283e9d7dbd':
  use BufferedInputStream in readTextFile
 2012-10-12 16:35:16 -07:00
Guang Zhu
a16721402b am d3036f7e: am d4805af6: Merge "use BufferedInputStream in readTextFile" into jb-mr1-dev 
* commit 'd3036f7e89747d7347eb8b94c5517162cc71b5af':
  use BufferedInputStream in readTextFile
 2012-10-12 16:33:57 -07:00
Guang Zhu
d3036f7e89 am d4805af6: Merge "use BufferedInputStream in readTextFile" into jb-mr1-dev 
* commit 'd4805af6163b6873abbf628f6672a2188e24ef3c':
  use BufferedInputStream in readTextFile
 2012-10-12 16:32:47 -07:00
Guang Zhu
d4805af616 Merge "use BufferedInputStream in readTextFile" into jb-mr1-dev 2012-10-12 16:30:34 -07:00
Michael Jurka
071316e561 Use black bg in recents if using live wallpaper 
Bug: 7282784

Change-Id: I686f8f0e36e3414ad30d23de80cbbfb2868069d4
 2012-10-13 01:02:09 +02:00
Guang Zhu
90619816d9 use BufferedInputStream in readTextFile 
With FileInputStream, using assumption of bytes read (as
returned by read function) not matching buffer size as EOF is
not correct, we hit this when reading from /proc in some cases.

BufferedInputStream's behavior matches that assumption due to
its implementation.

Bug: 7342759
Change-Id: Ibb06dbe1fbe33f6f880524f7555ff5542889ea50
 2012-10-12 15:50:44 -07:00
John Spurlock
f608a93aaf am 2f9f47c9: am c19c475c: am 0c63d78a: Merge "Keep QS brightness slider icon in sync." into jb-mr1-dev 
* commit '2f9f47c984a0f6dee5a6c06d7ab3b292838fb493':
  Keep QS brightness slider icon in sync.
 2012-10-12 15:37:10 -07:00
John Spurlock
2f9f47c984 am c19c475c: am 0c63d78a: Merge "Keep QS brightness slider icon in sync." into jb-mr1-dev 
* commit 'c19c475cd969fd4d5ae181b97984124a4cd1211b':
  Keep QS brightness slider icon in sync.
 2012-10-12 15:34:41 -07:00
John Spurlock
c19c475cd9 am 0c63d78a: Merge "Keep QS brightness slider icon in sync." into jb-mr1-dev 
* commit '0c63d78a0ff3f577ec70e106c2326a3140f4b45a':
  Keep QS brightness slider icon in sync.
 2012-10-12 15:33:05 -07:00
John Spurlock
0c63d78a0f Merge "Keep QS brightness slider icon in sync." into jb-mr1-dev 2012-10-12 15:30:34 -07:00
Dianne Hackborn
861a3b2d4f Revert fix to issue #6880627: PendingIntent.getService() returns... 
...stale intent of force stopped app

Fixing this caused other problems elsewhere that we don't have time
to address at this point.

Fixes issue #7338275: Tapping clock home screen widget doesn't open
alarms anymore

Change-Id: Iedc1fae5f62b6ead28d1895d709591358e5d6634
 2012-10-12 15:25:20 -07:00
Adam Powell
282b530c63 am 1b22d8b8: am a1a51272: am 8dd3aadd: Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev 
* commit '1b22d8b8ff3b2d78eab69df12abfe8ea8bea662d':
  Align carrier info for glowpad keyguard screen
 2012-10-12 15:18:50 -07:00
Adam Powell
1b22d8b8ff am a1a51272: am 8dd3aadd: Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev 
* commit 'a1a51272eddc842277e4ec10bdd3fed9b16ce866':
  Align carrier info for glowpad keyguard screen
 2012-10-12 15:16:19 -07:00
Adam Powell
a1a51272ed am 8dd3aadd: Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev 
* commit '8dd3aaddba551eab19cf7ced07ab066575377c5e':
  Align carrier info for glowpad keyguard screen
 2012-10-12 15:14:29 -07:00
Adam Powell
8dd3aaddba Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev 2012-10-12 15:11:51 -07:00
Jeff Sharkey
c54f3eade9 am 9078e39b: am 92eed99c: am 95cccb9d: Merge "Make all lockscreen widgets follow haptic flag." into jb-mr1-dev 
* commit '9078e39b83b000e2508c855d60dfcf99469b3c6d':
  Make all lockscreen widgets follow haptic flag.
 2012-10-12 15:06:35 -07:00
Jeff Sharkey
9078e39b83 am 92eed99c: am 95cccb9d: Merge "Make all lockscreen widgets follow haptic flag." into jb-mr1-dev 
* commit '92eed99c09e7dead80377cff02b8a11e82049d09':
  Make all lockscreen widgets follow haptic flag.
 2012-10-12 15:03:48 -07:00
Jeff Sharkey
92eed99c09 am 95cccb9d: Merge "Make all lockscreen widgets follow haptic flag." into jb-mr1-dev 
* commit '95cccb9d6175cb80d9312fadbe40cf7c4ec9f949':
  Make all lockscreen widgets follow haptic flag.
 2012-10-12 15:02:17 -07:00
Jeff Sharkey
95cccb9d61 Merge "Make all lockscreen widgets follow haptic flag." into jb-mr1-dev 2012-10-12 14:59:30 -07:00
Adam Powell
ba48a39e17 Align carrier info for glowpad keyguard screen 
Bug 7317728

Change-Id: I0788c6555e2443026d0533e14b544a5daf810937
 2012-10-12 14:41:04 -07:00
Jeff Sharkey
723a725e79 Make all lockscreen widgets follow haptic flag. 
Bug: 7337006
Change-Id: I782e498b7528e612c4b06a75b77f5521c951cbd6
 2012-10-12 14:26:31 -07:00
Scott Main
cdfc1dad89 am 05dbd903: am 4975af77: am 6b77a76d: am 5dc7ac74: am a7b56a20: am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications 
* commit '05dbd903d0ee830140a0fb3290eaac47a505a760':
  small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
 2012-10-12 14:23:34 -07:00
Scott Main
05dbd903d0 am 4975af77: am 6b77a76d: am 5dc7ac74: am a7b56a20: am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications 
* commit '4975af772241b1aff7714f5da42381bd5aed998b':
  small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
 2012-10-12 14:21:59 -07:00
Scott Main
4975af7722 am 6b77a76d: am 5dc7ac74: am a7b56a20: am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications 
* commit '6b77a76d3f8f04a4faf53c95acdbaeccafe3cf72':
  small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
 2012-10-12 14:19:15 -07:00
Scott Main
6b77a76d3f am 5dc7ac74: am a7b56a20: am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications 
* commit '5dc7ac745300fb043267a0c9235244a115507c51':
  small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
 2012-10-12 14:17:03 -07:00
Scott Main
5dc7ac7453 am a7b56a20: am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications 
* commit 'a7b56a20ec80699371359cdd6f459a7eaec67185':
  small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
 2012-10-12 14:14:46 -07:00
Scott Main
a7b56a20ec am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications 
* commit 'e249763db18bb445e93f493046946c13185aa09d':
  small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
 2012-10-12 14:12:07 -07:00
Charles Chen
3184787c2d am 935db6c5: am e228b5b9: am 4c38e24a: Merge "Don\'t alter accessibility JS APIs unless a page is about to load." into jb-mr1-dev 
* commit '935db6c5616d1bc67c3b077ba7ad8f64173792df':
  Don't alter accessibility JS APIs unless a page is about to load.
 2012-10-12 13:55:21 -07:00
Charles Chen
935db6c561 am e228b5b9: am 4c38e24a: Merge "Don\'t alter accessibility JS APIs unless a page is about to load." into jb-mr1-dev 
* commit 'e228b5b920233a151964019fb6c52412cc36425a':
  Don't alter accessibility JS APIs unless a page is about to load.
 2012-10-12 13:52:46 -07:00
Charles Chen
e228b5b920 am 4c38e24a: Merge "Don\'t alter accessibility JS APIs unless a page is about to load." into jb-mr1-dev 
* commit '4c38e24afb0fe68d6e9f6e924e6426808be2611a':
  Don't alter accessibility JS APIs unless a page is about to load.
 2012-10-12 13:49:39 -07:00
Keun young Park
7a6dca427b am 09ff8a6f: am 27665148: am c378656d: Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev 
* commit '09ff8a6f43dad1e27524e41622392fe040b7bdab':
  fix wrong read size in ToColor_S4444_Opaque
 2012-10-12 13:48:22 -07:00
Charles Chen
4c38e24afb Merge "Don't alter accessibility JS APIs unless a page is about to load." into jb-mr1-dev 2012-10-12 13:46:09 -07:00
Keun young Park
09ff8a6f43 am 27665148: am c378656d: Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev 
* commit '27665148cb72cbc7d4d5941f97ae54a73fa58d3c':
  fix wrong read size in ToColor_S4444_Opaque
 2012-10-12 13:45:46 -07:00
Keun young Park
27665148cb am c378656d: Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev 
* commit 'c378656d5e0e686d806661bc271de3c7b1726430':
  fix wrong read size in ToColor_S4444_Opaque
 2012-10-12 13:44:08 -07:00
Keun young Park
c378656d5e Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev 2012-10-12 13:41:19 -07:00
Danielle Millett
0ce397624b am 204eadc6: am 4ec2381b: am 8ec3ff8d: Merge "Suppressing Face Unlock during phone call - fix b/7339069" into jb-mr1-dev 
* commit '204eadc687280d558dd99b7c37c32f988c1cc229':
  Suppressing Face Unlock during phone call - fix b/7339069
 2012-10-12 13:26:41 -07:00
Scott Main
d75456efee am c7d25978: am f94e1296: am 67747a68: Merge "update info about usb debugging for mr1 changes bug: 7333465 bug: 7318666" into jb-mr1-dev 
* commit 'c7d259785e4b03670fa3bc6aa10a744002a70482':
  update info about usb debugging for mr1 changes bug: 7333465 bug: 7318666
 2012-10-12 13:26:38 -07:00
Amith Yamasani
79335b4365 am 80ef0935: am bede7587: am fe49af26: Merge "Temporarily disable multiuser for specific builds" into jb-mr1-dev 
* commit '80ef0935cf31f534badc73104db801dbe89911e4':
  Temporarily disable multiuser for specific builds
 2012-10-12 13:24:53 -07:00
Danielle Millett
204eadc687 am 4ec2381b: am 8ec3ff8d: Merge "Suppressing Face Unlock during phone call - fix b/7339069" into jb-mr1-dev 
* commit '4ec2381b589fa6627fc824fd4094455432f0055f':
  Suppressing Face Unlock during phone call - fix b/7339069
 2012-10-12 13:22:15 -07:00
Danielle Millett
4ec2381b58 am 8ec3ff8d: Merge "Suppressing Face Unlock during phone call - fix b/7339069" into jb-mr1-dev 
* commit '8ec3ff8dcc68d246fcaafb98050ec9be4f7ec34a':
  Suppressing Face Unlock during phone call - fix b/7339069
 2012-10-12 13:19:35 -07:00
Scott Main
c7d259785e am f94e1296: am 67747a68: Merge "update info about usb debugging for mr1 changes bug: 7333465 bug: 7318666" into jb-mr1-dev 
* commit 'f94e1296a321dc89295849d65b70285a32bf58c4':
  update info about usb debugging for mr1 changes bug: 7333465 bug: 7318666
 2012-10-12 13:19:29 -07:00
Amith Yamasani
80ef0935cf am bede7587: am fe49af26: Merge "Temporarily disable multiuser for specific builds" into jb-mr1-dev 
* commit 'bede7587df180cc0a7335bac03e789249601db9a':
  Temporarily disable multiuser for specific builds
 2012-10-12 13:17:43 -07:00