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

69824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
26e35fca60 Fix LayerDrawable#mutate 
Change-Id: I985b80141ffc96db969eaf36538df938cb093661
 2012-03-21 14:53:39 -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
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
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
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
Glenn Kasten
25f1bc43f8 AudioMixer can be configured for fewer max tracks 
Change-Id: I371b17cef071d083eecf35cd3627a3adff907a33
 2012-03-20 17:27:10 -07:00
Craig Mautner
2fb98b147b Minor refactoring prior to major refactoring. 
Removal of blur layer.
Deferral of Surface actions in BlackFrame from ctor to first use.
Combine common test into single method okToDisplay().
Remove redundant logic in DimAnimator.

Change-Id: I43af0415794a8f142803ce94d7e17539aafac67d
 2012-03-20 17:24:00 -07:00
Jim Miller
df331873c8 Fix 5960562: Show emergency button on PukUnlock screen 
This fixes an issue where the device doesn't show the emergency button
on the SIM PUK unlock screen. The problem was introduced in I3127bfd5
where we allowed the button to be conditionally shown.

Change-Id: I3e2aae2bce89399a2564c3f8a726a8db99cdec86
 2012-03-20 17:15:22 -07:00
Glenn Kasten
e9b2b3be13 Clean up Track constructor 
The 'thread' parameter can never be NULL.
Use constructor initialization list when possible.
Make more members const.
Only put the relevant code under "if (mCblk != NULL)".
Add comment about track name leak.

Change-Id: Ib963390a69bed1999638cc982a759edd1d5f4712
 2012-03-20 17:15:12 -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
Jim Miller
a612fad1f1 am 890266fa: am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen 
* commit '890266fa5702292517774ca2aa56a410df535b28':
 2012-03-20 16:46:06 -07:00
Jim Miller
d5b5db73fc am b7a6f5d7: am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen 
* commit 'b7a6f5d7e87eb4fba6d6868e73a9c06d73789517':
  Fix 5960562: Show emergency button on PukUnlock screen
 2012-03-20 16:44:43 -07:00
Jim Miller
890266fa57 am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen 
* commit '928d34704b96db9133e28dc77b716518d335b356':
  Fix 5960562: Show emergency button on PukUnlock screen
 2012-03-20 16:42:20 -07:00
Jim Miller
b7a6f5d7e8 am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen 
* commit '928d34704b96db9133e28dc77b716518d335b356':
  Fix 5960562: Show emergency button on PukUnlock screen
 2012-03-20 16:41:56 -07:00