Scott Main
fb4d6af6ac
am 4f784509: am d4ff8249: Merge "docs: update sdk install to handle both 32 and 64-bit bundles" into jb-mr1-dev
...
* commit '4f784509f75383c90a91148640cb156bc61e57ee':
docs: update sdk install to handle both 32 and 64-bit bundles
2012-11-15 15:25:13 -08:00
Wink Saville
559bdc3283
Merge "Revert "Separate voice and data radio technology/network type & registration state.""
2012-11-15 15:22:37 -08:00
Scott Main
4f784509f7
am d4ff8249: Merge "docs: update sdk install to handle both 32 and 64-bit bundles" into jb-mr1-dev
...
* commit 'd4ff824915e1c9ea1c3122b5745973f681915279':
docs: update sdk install to handle both 32 and 64-bit bundles
2012-11-15 15:22:31 -08:00
Scott Main
d4ff824915
Merge "docs: update sdk install to handle both 32 and 64-bit bundles" into jb-mr1-dev
2012-11-15 15:19:11 -08:00
Wink Saville
69e25226a3
Revert "Separate voice and data radio technology/network type & registration state."
...
This reverts commit b690ac3b27d9b782a23a5f9a82bb3421e88716e3
Change-Id: I006ab1fb9c7fb8da64e2c481a2b6f0cb137deba4
2012-11-15 15:16:45 -08:00
Adam Cohen
a2d250791d
am 5a0f5ba2: am 6189888a: Merge "Making sure launcher doesn\'t show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev
...
* commit '5a0f5ba269c12889246acbbe546ef75285231430':
Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
2012-11-15 15:02:16 -08:00
Adam Cohen
5a0f5ba269
am 6189888a: Merge "Making sure launcher doesn\'t show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev
...
* commit '6189888a2565b6362b0dd022850b748f628500d0':
Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
2012-11-15 14:59:33 -08:00
Scott Main
49ba8eb06b
docs: update sdk install to handle both 32 and 64-bit bundles
...
Change-Id: I171f28a332c4d31600865f6ad8f6a95fb4f0c3aa
2012-11-15 14:56:52 -08:00
Adam Cohen
6189888a25
Merge "Making sure launcher doesn't show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev
2012-11-15 14:56:19 -08:00
Glenn Kasten
fd1e3dfde2
Use size_t for frame count
...
Change-Id: Idd364443715a920ece2cc54acc95b395b6ed2c6c
2012-11-15 14:55:43 -08:00
Adam Cohen
3fcc6b26c3
Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
...
Change-Id: I5d0675f0c03677e06371a6730209c3466c6b0f15
2012-11-15 14:53:31 -08:00
Amith Yamasani
bc9625059b
Make sure that the owner user is marked initialized.
...
This is required for upgrades from previous versions of JB.
Bug: 7547639
Change-Id: I21de14a70d6ba2ab21437b5f0721321df45226d2
2012-11-15 14:43:13 -08:00
Wink Saville
fe090b3041
Merge "Separate voice and data radio technology/network type & registration state."
2012-11-15 14:27:54 -08:00
Craig Mautner
a7233fe31a
Fix math errors causing black screen.
...
Turning off animations in the Developer options creates a ValueAnimator
duration scale of 0. This is used as the denominator in RampAnimator
which, if the numerator is also 0, sets mAnimatedValue to NaN. Rounding
NaN to the nearest int produces 0 which is then assigned to
mScreenBrightness in DisplayPowerState.
A copy mistake which assigned mTransitionAnimationScale as the default
value for mAnimatorDurationScale in WindowManagerService is also
fixed here.
Bug 7515609 fixed.
Change-Id: I39f8d0a7abdd5a1fe70d757fe95fbddaf7a0ed51
2012-11-15 14:25:14 -08:00
Adam Cohen
af958dce34
am b82ee0c7: am b02eb4bb: Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev
...
* commit 'b82ee0c7bb7fc3ef61e0c31193641e87aecddfe6':
Pushing state persistence to a background thread
2012-11-15 13:59:25 -08:00
Adam Cohen
b82ee0c7bb
am b02eb4bb: Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev
...
* commit 'b02eb4bb7d09a19aedb9dbc08b0f731af05a8579':
Pushing state persistence to a background thread
2012-11-15 13:55:45 -08:00
Adam Cohen
b02eb4bb7d
Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev
2012-11-15 13:53:53 -08:00
Adam Cohen
a1a2f967e2
Pushing state persistence to a background thread
...
Change-Id: If776bc22c48525ba91dc7e4dd0e27de92612f2f5
2012-11-15 13:44:34 -08:00
Fabrice Di Meglio
e054ab8538
am 348cf60d: am 674a131c: Merge "Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev
...
* commit '348cf60dbb1de980aa97e551817765e7b3fa0221':
Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR
2012-11-15 12:27:03 -08:00
Fabrice Di Meglio
348cf60dbb
am 674a131c: Merge "Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev
...
* commit '674a131cb625a7aae0c6e50a24a968200c71b566':
Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR
2012-11-15 12:23:53 -08:00
Fabrice Di Meglio
674a131cb6
Merge "Fix bug #6638582 Password fields appears RTL in Arabic locale , it should be LTR" into jb-mr1.1-dev
2012-11-15 12:21:00 -08:00
Jeff Sharkey
9634e97067
am bfea4f04: am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev
...
* commit 'bfea4f04f226f1adf374412628d5945c380382a7':
Useful annotations for code documentation.
2012-11-15 11:56:19 -08:00
Jeff Sharkey
9f43afad9d
am 68363456: am 7420ab68: Merge "Utility to format human-friendly durations." into jb-mr1.1-dev
...
* commit '68363456c1f360c0f1afe637a1f3028519e059ed':
Utility to format human-friendly durations.
2012-11-15 11:54:43 -08:00
Jeff Sharkey
91b5729323
am 64f369a5: am a319d655: Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev
...
* commit '64f369a542952a8ac0d22d7d6c4c793a29ebfc52':
Avoid runtime restart after vold reconnects.
2012-11-15 11:54:38 -08:00
Jeff Sharkey
bfea4f04f2
am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev
...
* commit 'f5377a7242d71e221807150f0778a0521e1270b6':
Useful annotations for code documentation.
2012-11-15 11:53:19 -08:00
Jeff Sharkey
9077ca586e
am dcb72dbb: am 445767c1: Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev
...
* commit 'dcb72dbb39227674e4a54167efabcdc8add4548a':
Watch for leaked ParcelFileDescriptors.
2012-11-15 11:51:49 -08:00
Jeff Sharkey
f838eb40e8
am fa0fb7c5: am f6ba84b4: Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev
...
* commit 'fa0fb7c508dfa4275389a52b7c7907d2032f4aaa':
Reduce verbosity of service event logging.
2012-11-15 11:51:45 -08:00
Jeff Sharkey
68363456c1
am 7420ab68: Merge "Utility to format human-friendly durations." into jb-mr1.1-dev
...
* commit '7420ab681eaad22f4b8f884e12d3b2ce82cd203a':
Utility to format human-friendly durations.
2012-11-15 11:51:38 -08:00
Jeff Sharkey
64f369a542
am a319d655: Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev
...
* commit 'a319d655e336ffb0fcbee65b77926a32660c7f3f':
Avoid runtime restart after vold reconnects.
2012-11-15 11:51:33 -08:00
Jeff Sharkey
f5377a7242
Merge "Useful annotations for code documentation." into jb-mr1.1-dev
2012-11-15 11:48:38 -08:00
Jeff Sharkey
dcb72dbb39
am 445767c1: Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev
...
* commit '445767c14ceb51d2839a7bc818c68c81ee7d80a7':
Watch for leaked ParcelFileDescriptors.
2012-11-15 11:47:43 -08:00
Jeff Sharkey
fa0fb7c508
am f6ba84b4: Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev
...
* commit 'f6ba84b4242419f4765e0efcb5df82e37ad03faa':
Reduce verbosity of service event logging.
2012-11-15 11:47:40 -08:00
Jeff Sharkey
7420ab681e
Merge "Utility to format human-friendly durations." into jb-mr1.1-dev
2012-11-15 11:47:36 -08:00
Jeff Sharkey
a319d655e3
Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev
2012-11-15 11:46:19 -08:00
Jeff Sharkey
445767c14c
Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev
2012-11-15 11:45:23 -08:00
Jeff Sharkey
f6ba84b424
Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev
2012-11-15 11:44:13 -08:00
Scott Main
f4868068f8
am 8361b846: am 1f4c9d3e: am 7425bf86: Merge "docs: fix ndk tos layout for small screens" into jb-mr1-dev
...
* commit '8361b846d10d7d434332c1b46d70e0356a710fc1':
docs: fix ndk tos layout for small screens
2012-11-15 11:14:27 -08:00
Scott Main
8361b846d1
am 1f4c9d3e: am 7425bf86: Merge "docs: fix ndk tos layout for small screens" into jb-mr1-dev
...
* commit '1f4c9d3e90d13ef166d28a689221df6ffe21c238':
docs: fix ndk tos layout for small screens
2012-11-15 11:10:46 -08:00
Scott Main
1f4c9d3e90
am 7425bf86: Merge "docs: fix ndk tos layout for small screens" into jb-mr1-dev
...
* commit '7425bf864e0dcefe238daa4c4bf7745095f262d2':
docs: fix ndk tos layout for small screens
2012-11-15 11:08:28 -08:00
Scott Main
7425bf864e
Merge "docs: fix ndk tos layout for small screens" into jb-mr1-dev
2012-11-15 11:04:38 -08:00
Scott Main
9886540d88
docs: fix ndk tos layout for small screens
...
Change-Id: I95e11481cdfe759416b4a661580ee9e6b0dd24d2
2012-11-15 11:03:46 -08:00
Martin Kosiba
59f46b5b90
Merge "Update WebViewClient.shouldInterceptRequest JavaDoc."
2012-11-15 10:50:13 -08:00
Martin Kosiba
ad57766a1c
Merge "Update WebViewClient.shouldOverrideUrlLoading JavaDoc."
2012-11-15 10:46:39 -08:00
Scott Main
1d9ccfd400
am db86f5d2: am 988571a8: am bce26803: docs: fix broken youtube playlists
...
* commit 'db86f5d28254068f470736f094fab7700f07fafe':
docs: fix broken youtube playlists
2012-11-15 10:38:59 -08:00
Scott Main
db86f5d282
am 988571a8: am bce26803: docs: fix broken youtube playlists
...
* commit '988571a811ed6da6a379402813febc118f3f4e78':
docs: fix broken youtube playlists
2012-11-15 10:35:53 -08:00
Scott Main
988571a811
am bce26803: docs: fix broken youtube playlists
...
* commit 'bce268034e4e881704c4263822315bc9a4f9aa43':
docs: fix broken youtube playlists
2012-11-15 10:32:39 -08:00
Scott Main
bce268034e
docs: fix broken youtube playlists
...
Change-Id: I07a1e9af2c8104a56c9a5e6d1060de7578cbd1ae
2012-11-15 10:26:40 -08:00
kmccormick@google.com
9fd5f0940b
am afbf515b: am 47972cea: am 480ac7fc: am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
...
* commit 'afbf515be3ed51cf7db228b52fcc15440310877e':
Doc Update: Fixing images
2012-11-15 10:00:12 -08:00
kmccormick@google.com
afbf515be3
am 47972cea: am 480ac7fc: am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
...
* commit '47972cea307f64334eff79bd6184992364f43179':
Doc Update: Fixing images
2012-11-15 09:56:38 -08:00
kmccormick@google.com
47972cea30
am 480ac7fc: am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
...
* commit '480ac7fca61a29a7a1ca150ea0a583901971f137':
Doc Update: Fixing images
2012-11-15 09:54:41 -08:00
