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

58983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
f865f16b6d am d908b40d: (-s ours) Merge "Import revised translations." into ics-factoryrom 
* commit 'd908b40d0b0ed1e7e0b0f41e5060a26465b5cb99':
  Import revised translations.
 2011-09-28 17:39:35 -07:00
Eric Fischer
d908b40d0b Merge "Import revised translations." into ics-factoryrom 2011-09-28 17:35:18 -07:00
Mathias Agopian
3c19901674 Merge "may fix the build" 2011-09-28 17:34:12 -07:00
Mathias Agopian
acde31e124 may fix the build 
Change-Id: I065b1e6652f0e800ba5674a6d9aa954c3ac6c790
 2011-09-28 17:33:11 -07:00
Eric Fischer
9e2e026ff2 Import revised translations. 
Bug 5384730

Change-Id: I796fdb4e953595d8dc6a8577f4a633b5d4ff91ca
 2011-09-28 17:29:42 -07:00
Eric Fischer
4f217d5ace am a94489b4: Merge "Don\'t lose product variant strings that also vary between locales." into ics-factoryrom 
* commit 'a94489b4394350b1727437818cd4f6d845e97dc0':
  Don't lose product variant strings that also vary between locales.
 2011-09-28 17:03:07 -07:00
Eric Fischer
a94489b439 Merge "Don't lose product variant strings that also vary between locales." into ics-factoryrom 2011-09-28 17:01:39 -07:00
Eric Fischer
2a9e1a2812 am 5c12c039: (-s ours) Merge "Import revised translations. DO NOT MERGE." into ics-factoryrom 
* commit '5c12c039310ddde6dcea6694a9d3d8c5904aadc2':
  Import revised translations.  DO NOT MERGE.
 2011-09-28 16:59:02 -07:00
Eric Fischer
5c12c03931 Merge "Import revised translations. DO NOT MERGE." into ics-factoryrom 2011-09-28 16:55:33 -07:00
Justin Ho
eec55f0f9f Merge "Updated lockscreen assets Bug: 5380966" 2011-09-28 16:33:20 -07:00
Eric Fischer
6cbc7d6ad9 Import revised translations. DO NOT MERGE. 
Change-Id: Ic1c1290adfac7dd0eabba74e8d290bcc8567d91e
 2011-09-28 16:32:06 -07:00
Justin Ho
940a725424 Updated lockscreen assets 
Bug: 5380966

Change-Id: I5a74e33a75abfbc921f1fd37f1423f5449fbec03
 2011-09-28 16:31:06 -07:00
Brian Colonna
d90172e05f Merge "Pulled out part of onScreenTurnedOn() into show() function" 2011-09-28 16:29:48 -07:00
Andreas Huber
0044a15eb9 Merge "Support multiple NAL fragments per .mkv payload" 2011-09-28 16:08:59 -07:00
Roman Nurik
cbbecdfdad Merge "Update Widget Design guidelines for ICS" 2011-09-28 16:04:30 -07:00
Adam Powell
8917838b53 Merge "Fix bug 5386180 - Wire up action bar home/up for dialogs" 2011-09-28 16:02:13 -07:00
Adam Powell
915ce0d917 Fix bug 5386180 - Wire up action bar home/up for dialogs 
Action bars in dialogs are largely an undocumented "feature" but they
do work - with the exception of this since it previously relied on the
host being an Activity. Make it work.

Change-Id: I52ae24c3bfdd9766e4c0f035183e7f148a4e0162
 2011-09-28 15:53:55 -07:00
Roman Nurik
2b15c001fa Update Widget Design guidelines for ICS 
Change-Id: I1b7b8f9c091d38ec1400ce3d8b06e644803544de
 2011-09-28 15:49:09 -07:00
Justin Ho
edb8b62707 am 24664c00: Merge "Updated menu icon Bug: 5388009" into ics-factoryrom 
* commit '24664c0003f964ffe9f4fc98d69c802cddd0d7b0':
  Updated menu icon Bug: 5388009
 2011-09-28 15:25:49 -07:00
Justin Ho
68e07840c0 am 3b5a379d: Merge "Updated overflow menu icon Bug: 5388009" into ics-factoryrom 
* commit '3b5a379dda952faa6266c8fa794c6f0d3a192c13':
  Updated overflow menu icon Bug: 5388009
 2011-09-28 15:25:48 -07:00
Justin Ho
24664c0003 Merge "Updated menu icon Bug: 5388009" into ics-factoryrom 2011-09-28 15:24:09 -07:00
Justin Ho
3b5a379dda Merge "Updated overflow menu icon Bug: 5388009" into ics-factoryrom 2011-09-28 15:23:57 -07:00
Justin Ho
5132fa6933 Merge "Downscaling circular assets with bilinear to fix jagged edges" 2011-09-28 15:08:24 -07:00
Andreas Huber
2378341174 Support multiple NAL fragments per .mkv payload 
Apparently the payload for an h.264 track in an .mkv file can contain multiple
NAL fragments, we used to discard everything after the first one before, now
we preserve them all.

Change-Id: Ic7187365309f3880a3256982879a45df50db697d
related-to-bug: 5337218
 2011-09-28 15:06:46 -07:00
Justin Ho
5fba7e525e Updated menu icon 
Bug: 5388009

Change-Id: I3bc43a707f4fdb38021cf0cf9f76784f5e1192d9
 2011-09-28 14:56:47 -07:00
Justin Ho
55cea04465 Updated overflow menu icon 
Bug: 5388009

Change-Id: I667d6ecf0e897c073c669b2b88ffe06a71ca704d
 2011-09-28 14:55:01 -07:00
Michael Chan
d4ad7b4984 Merge "Changed translation for the day of the week zh-rTW" 2011-09-28 14:44:39 -07:00
Michael Chan
cbd7ec7aeb Changed translation for the day of the week zh-rTW 
Specifically replace 周 with 週

BUG: 5383038
Change-Id: If3589d0390f04d391487f545b79d4d7bfd567e97
 2011-09-28 14:31:54 -07:00
Jesse Wilson
2ff591ffb6 Merge "Format NaN and Infinity as Doclava expects." 2011-09-28 14:19:02 -07:00
Jesse Wilson
9c5cacc71a Format NaN and Infinity as Doclava expects. 
Change-Id: I500e049132b3254e3b78e08c1875e0dc451b70b6
 2011-09-28 17:04:52 -04:00
James Dong
5e28463dc4 Merge "Flush resets the count of played audio frames" 2011-09-28 13:46:49 -07:00
Andreas Huber
781ae92f11 Merge "Support AMR, G.711 and vorbis audio in ACodec and friends." 2011-09-28 13:13:33 -07:00
Xia Wang
0a6cd02b48 am b2d17234: Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom 
* commit 'b2d17234b77cda555905e0da997f543708374246':
  Reorganize media framework functional tests. Group tests into sub-packages
 2011-09-28 12:40:07 -07:00
Xia Wang
b2d17234b7 Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom 2011-09-28 12:38:15 -07:00
Andreas Huber
3e408f39ef Support AMR, G.711 and vorbis audio in ACodec and friends. 
Change-Id: I08c03219bf2d60fc5c6e89957bd4b4c615570983
 2011-09-28 12:37:36 -07:00
Fred Quintana
40047fa14d am 272101b3: Merge "Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen." into ics-factoryrom 
* commit '272101b308c7eb0a4639bed0106830a8d6b0f2a1':
  Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen.
 2011-09-28 11:47:46 -07:00
Fred Quintana
272101b308 Merge "Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen." into ics-factoryrom 2011-09-28 11:45:52 -07:00
John Reck
55b039f1b7 Merge "Support for correctly scaling text selection handles" 2011-09-28 11:11:57 -07:00
Steve Block
0a20d6a4c3 Merge "Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set" 2011-09-28 10:11:55 -07:00
Elliott Hughes
87e12b05f1 Merge "Add ICS-specific notes to the JNI tips documentation." 2011-09-28 09:56:11 -07:00
Marco Nelissen
8df38890d4 Merge "Log a warning when a MediaPlayer is finalized without having being released. b/5382634" 2011-09-28 09:41:12 -07:00
Marco Nelissen
8dc208476f Log a warning when a MediaPlayer is finalized without having being released. 
b/5382634

Change-Id: I756d09d16a92ab8ce736c16a24e319a87be6c8de
 2011-09-28 09:21:11 -07:00
Brian Colonna
4284e9d19a Pulled out part of onScreenTurnedOn() into show() function 
The onScreenTurnedOn() function in LockPatternKeyguardView was
actually being called in two cases - when the screen was turned on,
AND when the show() function was called in KeyguardViewManager, which
actually happens just before the screen is turned off.  Face Unlock
functionality was added to the onScreenTurnedOn() function, not
expecting that the function was also being called just before the
screen turns off.  This causes Face Unlock to run when the screen is
turned off, preventing it from running when the screen is turned on.
This was not obvious during testing because it's not a problem when
testing from the lock screen.  To reproduce the problem you must log
in successfully, then turn the screen off, wait, and turn it back on.

The solution was to pull the non-face unlock functionality from
onScreenTurnedOn() into its own function called show(), which is
called from the KeyguardViewManager show() function and also called
from onScreenTurnedOn().  In this way, the onScreenTurnedOn()
functionality is not changed, but the show() function can be used
for the onScreenTurnedOn() functionality minus the Face Unlock stuff.

One exception to note - I left setting mScreenOn inside of
onScreenTurnedOn() and didn't pull it into show()...that seems like
the correct thing to do.

Change-Id: I9dcc144c7842112c4d35eb3f8b4ab1cd42c05675
 2011-09-28 12:08:58 -04:00
Brian Colonna
9a3d51ed10 Merge "Added landscape views for Face Unlock" 2011-09-28 06:13:53 -07:00
Brian Colonna
0c66f05267 Merge "Fix 5323545 - FaceLock no longer appears when taking a call" 2011-09-28 06:13:44 -07:00
Chih-Chung Chang
d83baa4ef3 Merge "Fix 5158468: Update floating window size when the anchor view size changes." 2011-09-28 04:48:06 -07:00
Flavio Lerda
d0bc6afbbd Merge "Do not format numbers starting with hash or star." 2011-09-28 04:38:00 -07:00
Chih-Chung Chang
85d4ea6fe4 Fix 5158468: Update floating window size when the anchor view size changes. 
Originally when surfaceChanged() happens, we remove the old window and
create a new window. This causes flickering. Now we just update the window
layout according to the size of the anchor view.

Change-Id: Id741dac07872e473f2c9829b626c5c9568e7e22d
 2011-09-28 18:00:29 +08:00
Steve Block
aae19fb90c Merge "Hook up WebView.clearSslPreferences() for the Chromium HTTP stack" 2011-09-28 02:45:28 -07:00
Steve Block
a0d767c822 Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set 
This makes sure that the page's SSL certificate is cleared when the page load
starts.

Follows on from https://android-git.corp.google.com/g/#/c/138147.

Bug: 5287216
Change-Id: I40f74a72dc495c48d7167b7b70a845a8481feb85
 2011-09-28 10:44:11 +01:00