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

69770 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Ho
565cfb3c30 am 68f4ffb4: (-s ours) am 47ec443a: am 972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1 
* commit '68f4ffb4358842482e8b86b2afbbce4a4ed6135e':
 2012-03-20 19:35:47 -07:00
Justin Ho
48592a0bab am 8659e458: (-s ours) am 46a41ced: am 972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1 
* commit '8659e458d065d13800a63ab2804ff23c10819f6b':
  DO NOT MERGE Revert "Increase line limit for summary text"
 2012-03-20 19:35:45 -07:00
Eric Laurent
f63a38ea9d am 044e7503: am eaa08d35: am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 
* commit '044e7503ccdcd81adb69b5218b3b92ede47b005a':
 2012-03-20 19:35:41 -07:00
Eric Laurent
9d777e62ce resolved conflicts for merge of ec94ecad to master 
Change-Id: I13bc9671cc1ef02bede7e83253aa8a005367fa0c
 2012-03-20 19:24:33 -07:00
James Dong
abcc868f3a Merge "Handling end times of subtitles." 2012-03-20 18:53:29 -07:00
Insun Kang
56aeeb8d7a Handling end times of subtitles. 
Change-Id: Ic19ec8980d0a2bf9f265d375cd56e638a2460af8
 2012-03-21 10:44:04 +09:00
Eric Laurent
5217d2a8d3 am eb99cacc: am b388138f: resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp 
* commit 'eb99caccd7165385fc83b0175c6d176c990f179b':
 2012-03-20 18:20:33 -07:00
Eric Laurent
19b54cad22 am 04353390: resolved conflicts for merge of 393dd03e to ics-scoop-plus-aosp 
* commit '04353390722b9195434cc86af4414004eff058e8':
  AudioTrack: relax check on minimum buffer size
 2012-03-20 18:20:31 -07:00
Jeff Sharkey
e5b2b644b1 Merge "Remove unused android.net.Downloads." 2012-03-20 18:00:29 -07:00
Jeff Sharkey
948eef8254 Remove unused android.net.Downloads. 
It's another set of constants that can be confused with those in
android.provider.Downloads.

Change-Id: I78ac058fa264d59a81f7655ab101c3fb2c8c17ff
 2012-03-20 17:58:27 -07:00
Amith Yamasani
829aaeea91 am 634db582: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit '634db5823f7406102a599220bc8c808e8d18e136':
 2012-03-20 17:55:01 -07:00
Amith Yamasani
525a058c00 am 65e4b90d: am 31f7ef24: am 90e3bcae: Increase line limit for summary text 
* commit '65e4b90d6cc3673e70b6b94fa1566e31eb44ffc7':
  Increase line limit for summary text
 2012-03-20 17:54:57 -07:00
Jeff Sharkey
4259fc65da Merge "Avoid data usage notifications in airplane mode." 2012-03-20 17:49:52 -07:00
Jeff Sharkey
3a66cf3e86 Avoid data usage notifications in airplane mode. 
Only for mobile networks.

Bug: 5995839
Change-Id: I6a6dba8cfe98c8e72861f90665c3e41da6d9a474
 2012-03-20 17:45:23 -07:00
Steven Ross
848763daea Merge "Adding lock icon to FaceLockAreaView on lockscreen fixes 5394522" 2012-03-20 17:39:06 -07:00
John Reck
127d4deab1 Merge "Don't contentInvalidate when changing a WebView property" 2012-03-20 16:54:59 -07:00
Jeff Sharkey
481cb7ea38 Merge "Remember when NetworkPolicy was inferred." 2012-03-20 16:54:51 -07:00
Jeff Sharkey
837f9242ae Remember when NetworkPolicy was inferred. 
This helps future-proof NPMS if we need to correct default policies
after an upgrade.

Change-Id: I0ddfdeaf41757a46aeb867c91d495ccf981d544b
 2012-03-20 16:52:20 -07:00
Fred Quintana
f57bdf3a2b Merge "Fix an initialization ordering bug due to the userprofile changes." 2012-03-20 16:19:45 -07:00
John Reck
9a5f56563f Don't contentInvalidate when changing a WebView property 
Change-Id: I629671f1edffed945395eef182eeb6e8617e32de
 2012-03-20 16:01:26 -07:00
Gilles Debunne
a4a26053ea Disabled display lists in TextView 
Bug 6198276, bug 6193544, bug 6199959

The activation of display list properties on Monday 19th
broke the editable text behovior.

Disabling display lists to fix the blocking rendering
issues.

Change-Id: I5bd0584d1a34c6bb0af79ef45499154e9004eac1
 2012-03-20 15:52:57 -07:00
Chris Craik
3da5525558 Merge "Factor viewport scaling into coverage calculation" 2012-03-20 14:59:01 -07:00
Chris Craik
6f92c15180 Factor viewport scaling into coverage calculation 
Change-Id: I32114ead0ca42eaf2161d516a4281da216b61fa4
 2012-03-20 14:30:30 -07:00
Romain Guy
08cfd61d6e Merge "Put back invalidate optimization" 2012-03-20 14:24:17 -07:00
Romain Guy
e72cf7341a Put back invalidate optimization 
Change-Id: I6407e452deb44e50a50632961e960cf0bd39b09d
 2012-03-20 14:23:09 -07:00
Fred Quintana
70e6190858 Fix an initialization ordering bug due to the userprofile changes. 
Bug: 6194599
Change-Id: I6ebedec3b5f045374f216aa1419bfdb57141a80e
 2012-03-20 14:10:16 -07:00
Glenn Kasten
d046324582 Merge "Add libmedia_native" 2012-03-20 14:01:39 -07:00
Romain Guy
e3aad16ec0 Merge "Code cleanup" 2012-03-20 13:52:35 -07:00
Romain Guy
e979e62ac7 Code cleanup 
Change-Id: I390e92b4a778bd9dcde6535178c1a6b204b29fe4
 2012-03-20 13:50:27 -07:00
Eric Fischer
635f3a3db1 Merge "Import translations. DO NOT MERGE" 2012-03-20 13:19:50 -07:00
Craig Mautner
d3ae220286 Merge "Fix flickering when starting and ending apps." 2012-03-20 12:46:48 -07:00
Daniel Sandler
0b83efb64a Merge "Make navbar deadzone silent in touch exploration." 2012-03-20 12:37:05 -07:00
Steven Ross
ec5501acd8 Adding lock icon to FaceLockAreaView on lockscreen fixes 5394522 
This makes the transition from the backup to Face Unlock invisible to the user,
using three layers:
the base background layer (also used in Face Unlock)
the spotlight mask layer (black alpha = .8), representing a size-0 spotlight
The cancel button, which would incorrectly resize to full-screen if a View with
a background were used instead of the current ImageView

Change-Id: Ieb433baf171088e0af06f183fcdb5ddda6001f01
 2012-03-20 15:19:58 -04:00
Svetoslav Ganov
eb0b1da78f Merge "Revamp of the NumberPicker widget." 2012-03-20 12:14:37 -07:00
Svetoslav Ganov
d11e6151fe Revamp of the NumberPicker widget. 
1. The number picker no longer shows up and down arrows, it
   has only three touch targets which are the currently selected number
   in the middle with a lesser one above and greater below, now what
   you touch is what you get, flingability and long press are still
   supported.

2. Removed the restriction for a View with an AccessibilityNodeProvider
   to not have any concrete children. If the View has a provider, then
   this provider is responsible for creating the AccessibilityNodeInfos
   for all its descendants, concrete and virtual. The number picker is
   a good example for such a case - it has a concrete input view and
   two virtual buttons as its children. This is a safe change since
   this behavior has not been released.

3. This patch also fixes bug where the number picker is stretched too
   much in the Theme theme.

bug:6177794
bug:5728294

Change-Id: I5fb370fe0b864a156f5f2aaf2de5f55f6b6d4e84
 2012-03-20 12:13:06 -07:00
Eric Fischer
413c4c71ed Import translations. DO NOT MERGE 
Change-Id: Ia1039610eecfe92fe348056b774b0d8f16cea898
 2012-03-20 11:59:58 -07:00
Fabrice Di Meglio
6077fc9b7f Merge "Reduce memory footprint for View" 2012-03-20 11:48:50 -07:00
Fabrice Di Meglio
edc1e59b34 Reduce memory footprint for View 
- make layout direction use private bit fields
- fix also some Javadoc issues

Change-Id: I977a328d671b91aa82cb275767e3575f78695508
 2012-03-20 11:45:36 -07:00
Craig Mautner
22ce1414a0 Fix flickering when starting and ending apps. 
Surfaces were displaying animations in their entirety for a single
frame before the animation kicked in. This caused a flash on the
screen. By setting the animation to invisible (alpha=0) at their
start it makes no difference if they are displayed.

Fixed bug 6176540.

Removed redundant mDimAnimator.show call.

Change-Id: I47c1b0d38273b011d9115822a8476671d6a050fc
 2012-03-20 10:16:26 -07:00
Katie McCormick
8fca15f1f2 am f518e0e8: am 2f8b35dd: am 2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1 
* commit 'f518e0e82be346d3ee424dd865c1af60a9ed96e4':
 2012-03-20 10:16:26 -07:00
Katie McCormick
579e7cc02e am 86d5301b: am 45660f46: am 2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1 
* commit '86d5301b0d66ccd91632b5a78a1d67e86efcad12':
  Doc update: DDMS Network Traffic tool.
 2012-03-20 10:16:20 -07:00
Dianne Hackborn
25d22f4ae9 am 8b28ebd5: am df3228e5: am ce06c000: Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1 
* commit '8b28ebd5f2dd258191a17da6660c1bdc535dd97e':
 2012-03-20 10:16:11 -07:00
Marco Nelissen
dd5bd2981d Merge "Move COM tag parsing to constructor" 2012-03-20 10:08:52 -07:00
John Reck
3a382b58c8 Merge "Pipe down isHardwareAccelerated" 2012-03-20 10:01:55 -07:00
John Reck
1467868004 Merge "Include MotionEvent on ACTION_MOVE's TouchEventData" 2012-03-20 09:57:49 -07:00
Marco Nelissen
7306a388cb Move COM tag parsing to constructor 
Change-Id: Icfcf05655ca98ccccad4f94834770c2f4098a764
 2012-03-20 09:48:02 -07:00
Marco Nelissen
54fa725483 Merge "Parse mp3 encoder padding/delay" 2012-03-20 09:15:05 -07:00
Marco Nelissen
2ed77701f9 Parse mp3 encoder padding/delay 
Get the mp3 encoder padding and delay from a XING frame or iTunSMPB tag.

Change-Id: Icde598c8857d7e7c187a718f478ee9799d6a1b8a
 2012-03-20 08:46:11 -07:00
David Hu
b2e822fc2a Remove unused BandwidthTestRunner 
Change-Id: I5d77682cf662cc88e3d182501c78bb77805e74d1
 2012-03-19 21:03:35 -07:00
David Hu
60c116e2a6 Merge "BandwidthTestCase" 2012-03-19 20:19:34 -07:00