Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,840 Commits 3 Branches 0 Tags
8564be6d8419f6b609e2d6c8daeec2d7b8594a0b
Commit Graph

69840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Sakhartchouk
8564be6d84 Merge "Breaking up rs headers by logical components." 2012-03-21 14:05:35 -07:00
Eric Fischer
88796897d3 Restore deleted string still referenced from public.xml. 
Change-Id: I738c1ef185b306f5a25afc6ed4b0f46a14e3c6a7
 2012-03-21 13:38:55 -07:00
Eric Fischer
93efd599f8 Merge "Import translations. DO NOT MERGE" 2012-03-21 13:19:12 -07:00
Eric Fischer
71747d1007 Merge "Import translations. DO NOT MERGE" 2012-03-21 13:19:01 -07:00
Eric Fischer
7bf371e200 Import translations. DO NOT MERGE 
Change-Id: Ie99a723075c6e17d413dc055bc52feb81b1db73f
 2012-03-21 12:49:52 -07:00
Eric Fischer
6e05e37a58 Import translations. DO NOT MERGE 
Change-Id: I4c22ac70a03bfc348fc201415c5a4e432d1add53
 2012-03-21 12:38:30 -07:00
Craig Mautner
d5c88b51f7 Merge "Continue animations started from AppWindowToken." 2012-03-21 12:13:24 -07:00
Romain Guy
4d6e0788a8 Merge "Plug memory leak. Bug #6196903" 2012-03-21 11:59:48 -07:00
Romain Guy
b0317984d3 Plug memory leak. 
Bug #6196903

Whenever a memory flush happens, the GL renderer discards some or all of its
font caches. Each font cache holds an array of vertex indices that was
initially designed to have the same life cycle as the process. This changed
when memory flushes were introduced but this array was never taken care of
in the destructor.

Change-Id: Ief124f609ea55b671c0a9b43637d9e013629ebaa
 2012-03-21 11:52:52 -07:00
Craig Mautner
03273d00ce Continue animations started from AppWindowToken. 
Animations that were started from AppWindowToken.showAllWindowsLocked
were not setting mInnerFields.mAnimating and hence the animations were
not progressing. This resulted in popups such as menus and time/date
settings not showing up.

Fixes bug 6205076.

Change-Id: I4daae5895e64182328671e282331f14dd5561d5e
 2012-03-21 11:52:40 -07:00
Chet Haase
b6f90cf846 Merge "Fix Animation bugs from DisplayList properties integration" 2012-03-21 11:34:16 -07:00
Chet Haase
89b7f2e3be Fix Animation bugs from DisplayList properties integration 
The new DisplayList properties functionality does not currently handle Animation
(android.view.animation) functionality, so we fall back to the previous approach
of redrawing the DisplayList when an Animation changes alpha/transform data for
a View. The DL code was not, however, correctly using that logic, so that
the Animation transform information was being ignored, or at least not set
correctly on the DisplayList during redraws.

This fix accounts for Animation changes and sets up the DisplayList correctly.

Change-Id: I9f6e0382b05d0627f4779f30e74641dedcc77f82
 2012-03-21 11:32:02 -07:00
Wink Saville
a4368604d0 Merge "Telephony: Remove coupling between phone and IccRecords" 2012-03-21 11:31:12 -07:00
Craig Mautner
4de35e1402 Merge "Override not drawing to screen when screen is off." 2012-03-21 11:07:43 -07:00
Craig Mautner
006f0e41ab Override not drawing to screen when screen is off. 
A new test had been added to performDraw to provide an early return if
the screen was off. Drawing should have proceeded however if
mReportNextDraw is set. Otherwise views that turn on the screen (such
as the alarm) are not shown.

Fixes bug 6168158.

Change-Id: If9013d9dbd39d60ee1de8aeb3e0c1facbc5a7db5
 2012-03-21 11:00:32 -07:00
George Mount
8dc8a435a1 Fix merge error 
Change-Id: Ia48e1f064b697fa328e5d582862dbe723f7ffd5d
 2012-03-21 10:52:56 -07:00
George Mount
f3616da6a8 Merge "Make paste window and caret handle show up at the right time." 2012-03-21 10:29:08 -07:00
Marco Nelissen
ceb0909bc2 Merge "Parse gapless info from mp4 files" 2012-03-21 10:16:55 -07:00
Alex Sakhartchouk
79c23f0f88 Breaking up rs headers by logical components. 
Change-Id: I2d23eec0277b1136852b8a7acb61aecf6f699a7d
 2012-03-21 09:58:15 -07:00
Marco Nelissen
eb473f3627 Parse gapless info from mp4 files 
Change-Id: I4c83d4e12e996dc29708268e68a4bb74b368c6f3
 2012-03-21 09:50:53 -07:00
Craig Mautner
6d332c5148 Merge "Minor refactoring prior to major refactoring." 2012-03-21 09:21:39 -07:00
The Android Open Source Project
ad32461ec1 am fcf2f4b1: am 98e1b541: Reconcile with ics-mr1-release 
* commit 'fcf2f4b17338501d8498a2a16eb832445b293e8f':
 2012-03-21 09:09:04 -07:00
The Android Open Source Project
fcf2f4b173 am 98e1b541: Reconcile with ics-mr1-release 
* commit '98e1b541f271e92b9dc25d54e275c28102746b04':
 2012-03-21 09:06:34 -07:00
The Android Open Source Project
98e1b541f2 Reconcile with ics-mr1-release 
Change-Id: Id19190393a665dd1b07c073970925758aa383691
 2012-03-21 09:00:43 -07:00
The Android Open Source Project
959fd880ea am a4a09465: am 35a8f94d: Reconcile with ics-mr1-release 
* commit 'a4a09465569d0f4cce36f089fa02d5ef9b95db81':
  Fix 5960562: Show emergency button on PukUnlock screen
 2012-03-21 08:29:33 -07:00
Glenn Kasten
4351d4aa8e Merge "Clean up Track constructor" 2012-03-21 08:29:18 -07:00
The Android Open Source Project
a4a0946556 am 35a8f94d: Reconcile with ics-mr1-release 
* commit '35a8f94da6a8a3a6757e5663bfcbcd044f72a92a':
  Fix 5960562: Show emergency button on PukUnlock screen
 2012-03-21 08:26:56 -07:00
The Android Open Source Project
35a8f94da6 Reconcile with ics-mr1-release 
Change-Id: I10d78e60e39606f85cfa6fc7e9a7da14db0eeb0a
 2012-03-21 08:23:03 -07:00
Glenn Kasten
004f9bac41 Merge "AudioMixer can be configured for fewer max tracks" 2012-03-21 08:19:04 -07:00
Glenn Kasten
652e18d896 Merge "Update comments" 2012-03-21 07:24:21 -07:00
Glenn Kasten
32d72b2f53 Merge "Whitespace" 2012-03-21 07:22:40 -07:00
Glenn Kasten
85b51b8ae3 Merge "new doesn't fail on Android" 2012-03-21 07:21:21 -07:00
Alex Yakavenka
80198f2235 Telephony: Remove coupling between phone and IccRecords 
Change-Id: I7af0f0f37c59b7554fa329a5b00ff28cb149b4d9
 2012-03-21 04:00:13 -07:00
Jonathan Dixon
a6c4d8e018 Rename getWebView() to getWebViewClassic 
Interdepends on https://android-git.corp.google.com/g/170037
Tidys up a TODO from my webview proxy patch.
This allows me to re-introduce getWebView(), but now returning the
actual WebView instance which is needed by my upcoming change to WebKit
linked above.
Also moves sendPluginDrawMsg() to WebViewCore for convenience in the
MediaTexture code that calls this.

Change-Id: I57b72504a792de58d15f386abf4a9d821449ab0a
 2012-03-21 07:59:58 +00:00
Jim Miller
cdbf566770 am a612fad1: am 890266fa: am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen 
* commit 'a612fad1f18fb9f4f8f5258faa0ccfc4d9ec1788':
 2012-03-20 19:36:35 -07:00
Jim Miller
d16a4f2967 am d5b5db73: am b7a6f5d7: am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen 
* commit 'd5b5db73fcb49a4ca04e9cefc5f5293faba5895e':
  Fix 5960562: Show emergency button on PukUnlock screen
 2012-03-20 19:36:33 -07:00
Eric Laurent
56b21c6ccd am d58b6cd1: am cbc90453: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 
* commit 'd58b6cd1e3fdf3deb5147daec556fe424a568732':
 2012-03-20 19:35:56 -07:00
Eric Laurent
c485824804 am a48285c4: am 165ee4c5: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 
* commit 'a48285c4f22ffc43f1771ebd1ff35dcec48db2c7':
  audioflinger: fix issue with camcorder and A2DP
 2012-03-20 19:35:53 -07:00
Joe Fernandez
7740348a20 am c2c444f5: am f9737a89: am dbab18f6: Merge "docs: Android SDK r17 (RC6) Release Notes" into ics-mr1 
* commit 'c2c444f5a8e9d483c7a413d4050b305154690de6':
 2012-03-20 19:35:52 -07:00
Joe Fernandez
88b7849293 am 58a0ea9c: am 9018447a: am dbab18f6: Merge "docs: Android SDK r17 (RC6) Release Notes" into ics-mr1 
* commit '58a0ea9c2d5042e5b94cbc5416d08f1e8a75a94d':
  docs: Android SDK r17 (RC6) Release Notes
 2012-03-20 19:35:49 -07:00
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