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

60000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JP Abgrall
1896ed2c86 am d329a390: am 20e93c05: dumpstate: collect /proc/net/dev and /proc/net/xt_qtaguid/iface_stat_all 
* commit 'd329a39092edff9c43ef137d1306825dbe90d982':
  dumpstate: collect /proc/net/dev and /proc/net/xt_qtaguid/iface_stat_all
 2011-09-20 16:23:50 -07:00
Mathias Agopian
d279c7b1f8 am eee6d2f3: Merge "Make sure Region handles invalid rectangles" 
* commit 'eee6d2f3b10e1c242185c417bab4561fd60b74fe':
  Make sure Region handles invalid rectangles
 2011-09-20 16:23:20 -07:00
Mathias Agopian
62cd6a5d63 am 44bfbbe5: Merge "fix the float Rect in OpenGLRenderer to handle NANs" 
* commit '44bfbbe501880f42105c49d479d4c109af420dbf':
  fix the float Rect in OpenGLRenderer to handle NANs
 2011-09-20 16:23:18 -07:00
Jason Simmons
8d3538d016 resolved conflicts for merge of 0799e951 to ics-aah 
Change-Id: I4f968fa84aa395c63c28053ef0f489161530bf86
 2011-09-20 14:36:22 -07:00
Eric Fischer
850733190b am afe9461b: Merge "Import revised translations." 
* commit 'afe9461b520a74c15ec4703759fa78ed3d4460c8':
  Import revised translations.
 2011-09-20 14:15:39 -07:00
Ben Murdoch
5f9a717a88 am f9580d59: Merge "Cleanup for bug 5278763" 
* commit 'f9580d594a489aab2a3bbaf8ffc1bdbbe3aaf8b6':
  Cleanup for bug 5278763
 2011-09-20 14:15:37 -07:00
Justin Ho
f282d3b529 am c70f6af3: Merge "Reversal of indeterminate progressbar" 
* commit 'c70f6af3a9359622ecf523ea2429e2a71553b7a2':
  Reversal of indeterminate progressbar
 2011-09-20 14:15:22 -07:00
Chih-Chung Chang
59ec02e87f am ed4cfe70: Merge "Fix 5224359: Add width and height to media store." 
* commit 'ed4cfe70ca165b6469d2c9fb1b5296afdff1faae':
  Fix 5224359: Add width and height to media store.
 2011-09-20 14:15:03 -07:00
Daniel Sandler
2f8cca24ff am 291c6d78: Merge "Fix disappearing nav icons." 
* commit '291c6d789dac8f85c50163e9a9ef24ef31183b93':
  Fix disappearing nav icons.
 2011-09-20 14:14:50 -07:00
Daniel Sandler
79497f51b2 am 0559e613: Merge "Stop clobbering the systemUiVisibility on navbar touch." 
* commit '0559e6138f6b08c536cb2925d4f72d594b89f758':
  Stop clobbering the systemUiVisibility on navbar touch.
 2011-09-20 14:14:48 -07:00
The Android Open Source Project
e4260a6878 am 3617cb65: Reconcile with ics-factoryrom-release 
* commit '3617cb652158c136b4b79f0e69d905794fc12843':
  Add QVGA resolution to CamcorderProfile
  Add PROPERTY_IMS_REG_REQUIRED.
 2011-09-20 14:14:41 -07:00
Jeff Sharkey
082da23600 am 7c349b1d: am 88b18eb8: Merge "Upload correct txPackets count." into ics-factoryrom 
* commit '7c349b1d97d3d657cdf556619d942b4bf6ece365':
  Upload correct txPackets count.
 2011-09-20 14:14:04 -07:00
James Dong
0dcba02ecc am 3907c79a: am 92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom 
* commit '3907c79aebf8621a5a4880c9e66db3c49a44f359':
  Add QVGA resolution to CamcorderProfile
 2011-09-20 14:13:50 -07:00
JP Abgrall
d329a39092 am 20e93c05: dumpstate: collect /proc/net/dev and /proc/net/xt_qtaguid/iface_stat_all 
* commit '20e93c0507b66e697d23c58c138484d652a1b810':
  dumpstate: collect /proc/net/dev and /proc/net/xt_qtaguid/iface_stat_all
 2011-09-20 14:13:36 -07:00
Peter Ng
7d7c068471 am cb611877: Merge "Keyguard padding fixes" 
* commit 'cb61187783b2a995cfb56ea6c4a396ebff13ff0f':
  Keyguard padding fixes
 2011-09-20 14:13:31 -07:00
Irfan Sheriff
5f1684d401 am 284ccdcd: am 3b6377b1: Merge "Add supplication shut down recovery" into ics-factoryrom 
* commit '284ccdcdc12779d295726940d68857487a48ee14':
  Add supplication shut down recovery
 2011-09-20 14:13:29 -07:00
Mathias Agopian
eee6d2f3b1 Merge "Make sure Region handles invalid rectangles" 2011-09-20 14:02:53 -07:00
Mathias Agopian
44bfbbe501 Merge "fix the float Rect in OpenGLRenderer to handle NANs" 2011-09-20 14:02:44 -07:00
Dianne Hackborn
0799e951a6 Merge "Fix issue #5312624: Lock screen very flickery" 2011-09-20 12:37:10 -07:00
Dianne Hackborn
bc1aa7bbc7 Fix issue #5312624: Lock screen very flickery 
The key thing was to fix isVisibleOrBehindKeyguardLw() so that it
wouldn't count a window as not visible if it was just currently
in the process of drawing due to an orientation change.

Also improve logic in deciding when to turn screen on to better ensure
the screen is in a stable state, in particular treating screen off
as a frozen screen and not allowing it to turn on until the
update of the screen due to any config change is done.

Change-Id: If82199f3773270b2d07f9c7de9da2dad8c7b28d7
 2011-09-20 11:20:31 -07:00
Eric Fischer
afe9461b52 Merge "Import revised translations." 2011-09-20 10:54:52 -07:00
Ben Murdoch
f9580d594a Merge "Cleanup for bug 5278763" 2011-09-20 10:32:28 -07:00
Eric Fischer
50c83888a6 Import revised translations. 
Change-Id: I5e375bebc8f74d9108a929246f16608427ce9317
 2011-09-20 10:21:56 -07:00
Justin Ho
c70f6af3a9 Merge "Reversal of indeterminate progressbar" 2011-09-20 09:57:48 -07:00
Chih-Chung Chang
ed4cfe70ca Merge "Fix 5224359: Add width and height to media store." 2011-09-20 09:23:34 -07:00
Daniel Sandler
291c6d789d Merge "Fix disappearing nav icons." 2011-09-20 07:47:45 -07:00
Daniel Sandler
0559e6138f Merge "Stop clobbering the systemUiVisibility on navbar touch." 2011-09-20 07:47:40 -07:00
Daniel Sandler
f0e8daa405 Fix disappearing nav icons. 
Bug: 5328284
Change-Id: Iaa20454cff9f5a340da7b0c71190796445e8a205
 2011-09-20 10:46:26 -04:00
The Android Open Source Project
3617cb6521 Reconcile with ics-factoryrom-release 
Change-Id: I8bb64c1b31c7158d931fd9f7be8a9e5b317c5252
 2011-09-20 07:43:10 -07:00
The Android Automerger
4dde85babe merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-20 06:28:15 -07:00
Chih-Chung Chang
e1bf8efaff Fix 5224359: Add width and height to media store. 
Change-Id: I27376285a551e648eb0ea010dfdf6b8ed873cdd8
 2011-09-20 20:41:44 +08:00
JP Abgrall
20e93c0507 dumpstate: collect /proc/net/dev and /proc/net/xt_qtaguid/iface_stat_all 
Add extra network interface statistics.

Bug:5322407
Change-Id: I9441b2ca2517d8380b2c9f5bb5bd077a48438d04
Signed-off-by: JP Abgrall <jpa@google.com>
 2011-09-19 22:29:26 -07:00
James Dong
e676b37c63 Add QVGA resolution to CamcorderProfile 
Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b
related-to-bug: 5145483
 2011-09-19 21:54:30 -07:00
Jeff Sharkey
7c349b1d97 am 88b18eb8: Merge "Upload correct txPackets count." into ics-factoryrom 
* commit '88b18eb8c2034e9de35482cc737ef8d608d55867':
  Upload correct txPackets count.
 2011-09-19 21:44:00 -07:00
Jeff Sharkey
88b18eb8c2 Merge "Upload correct txPackets count." into ics-factoryrom 2011-09-19 21:42:13 -07:00
Peter Ng
5d7508374c Reversal of indeterminate progressbar 
-it now goes the other way

Change-Id: Ib069fe2bd430237ac4c14aa7f2cf188fbb14ea36
 2011-09-19 20:52:20 -07:00
James Dong
3907c79aeb am 92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom 
* commit '92d0a64b909cd95e8f4ce587438b0cc6d2daeaa0':
  Add QVGA resolution to CamcorderProfile
 2011-09-19 20:09:00 -07:00
James Dong
92d0a64b90 Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom 2011-09-19 20:06:52 -07:00
James Dong
07b9ae3312 Add QVGA resolution to CamcorderProfile 
Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b
related-to-bug: 5145483
 2011-09-19 19:32:26 -07:00
Peter Ng
cb61187783 Merge "Keyguard padding fixes" 2011-09-19 19:01:58 -07:00
Irfan Sheriff
284ccdcdc1 am 3b6377b1: Merge "Add supplication shut down recovery" into ics-factoryrom 
* commit '3b6377b120bb507f93a8f1e7e25bc026de764dd6':
  Add supplication shut down recovery
 2011-09-19 19:01:17 -07:00
Irfan Sheriff
3b6377b120 Merge "Add supplication shut down recovery" into ics-factoryrom 2011-09-19 18:58:58 -07:00
Jeff Sharkey
92cefaeb31 Upload correct txPackets count. 
Bug: 5321340
Change-Id: Ie4dc7a91bf1cdc4d64c75ff09ae0cdd0fb141b5d
 2011-09-19 18:37:11 -07:00
Justin Ho
a0570496b4 am f2ff20e0: Merge "Tuning Overscroller\'s scroll curve Softer end + rounder curve with less contrast Bug: 5200575" 
* commit 'f2ff20e05baec2d9849c7456e8455a2671820f2a':
  Tuning Overscroller's scroll curve Softer end + rounder curve with less contrast Bug: 5200575
 2011-09-19 18:07:29 -07:00
Justin Ho
f2ff20e05b Merge "Tuning Overscroller's scroll curve Softer end + rounder curve with less contrast Bug: 5200575" 2011-09-19 18:06:13 -07:00
Justin Ho
323594ea98 am 719797b9: am 54ecf3c6: Merge "Updated Status bar icons Bug: 5297795" into ics-factoryrom 
* commit '719797b9a61c4c31afcf71ebbfef797adab4be43':
  Updated Status bar icons Bug: 5297795
 2011-09-19 17:53:12 -07:00
Justin Ho
a181bb4b8c Tuning Overscroller's scroll curve 
Softer end + rounder curve with less contrast
Bug: 5200575

Change-Id: Icff6ba3cf7ae052c80b2e80e2d2b07085fcb40ce
 2011-09-19 17:52:06 -07:00
Justin Ho
719797b9a6 am 54ecf3c6: Merge "Updated Status bar icons Bug: 5297795" into ics-factoryrom 
* commit '54ecf3c636dda257cbfd22b3bc86afff8c910372':
  Updated Status bar icons Bug: 5297795
 2011-09-19 17:51:38 -07:00
Justin Ho
54ecf3c636 Merge "Updated Status bar icons Bug: 5297795" into ics-factoryrom 2011-09-19 17:49:53 -07:00
Fred Quintana
9c50bbcf34 am 029749e2: am acfd5ebb: Merge "An extra is being written as one type and read as the wrong type." into ics-factoryrom 
* commit '029749e2ad4f9554f009ab36ddd91a388a5f8b80':
  An extra is being written as one type and read as the wrong type.
 2011-09-19 17:35:31 -07:00