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

96175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kmccormick@google.com
214d618d95 am 9fd5f094: am afbf515b: am 47972cea: am 480ac7fc: am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs 
* commit '9fd5f0940b7d69ab82332389042b94cb25d9f924':
  Doc Update: Fixing images
 2012-11-16 10:37:17 -08:00
Baligh Uddin
15fb33165a am e872b738: (-s ours) am a3a2c6a9: am ecc2bcb5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'e872b738e823fb91e3010b65976e8deab5bb1ea1':
  Import translations. DO NOT MERGE
 2012-11-16 10:37:02 -08:00
Baligh Uddin
e45edaffa1 am a0bee9f0: (-s ours) am 2028f8e0: am 38939259: am c3b6ee60: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'a0bee9f097da3f9441a0db70fac441e29bafa273':
  Import translations. DO NOT MERGE
 2012-11-16 10:36:58 -08:00
Baligh Uddin
8b7887b19b am 31431cd5: (-s ours) am 5a1b49b1: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '31431cd558faba5b42ba05604307678761eddf13':
  Import translations. DO NOT MERGE
 2012-11-16 10:36:47 -08:00
Baligh Uddin
1d0d666905 am d1846e02: (-s ours) am 59ae7069: am 8264bd80: am 36c7d313: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'd1846e021f952d0be9681677d9d00b2ad1ea2073':
  Import translations. DO NOT MERGE
 2012-11-16 10:36:43 -08:00
Baligh Uddin
2d5e545371 am 8ce25752: (-s ours) am defe7615: am aaf3fbc6: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '8ce25752f78245c513a055378804f1e16f71d831':
  Import translations. DO NOT MERGE
 2012-11-16 10:36:39 -08:00
Baligh Uddin
498cd4f4fe am 9d6cf4e1: (-s ours) am f118bcc5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '9d6cf4e1c3de8415c3c466ac940cafe0d867a4f3':
  Import translations. DO NOT MERGE
 2012-11-16 10:36:35 -08:00
Daniel Sandler
3639beff7a am 8ff32d81: am 00679b5b: am 020d6529: Merge "Do not vibe when the default notification sound is Silent." into jb-mr1.1-dev 
* commit '8ff32d81134cc6a73b9c58e720e8d2ad79a9c119':
  Do not vibe when the default notification sound is Silent.
 2012-11-16 10:36:23 -08:00
Daniel Sandler
c89da9e28a am 1812b345: am 2bb5dc6a: am 83b25961: Merge "Notification vibration improvements:" into jb-mr1.1-dev 
* commit '1812b3450389b37bc069061cc69cb20754816f62':
  Notification vibration improvements:
 2012-11-16 10:36:19 -08:00
Scott Main
51691e4365 am b80d578c: am 2da041f0: am 0622ed7f: am 0034beab: resolved conflicts for merge of 783e115b to jb-mr1-dev 
* commit 'b80d578c8f66302584969aadbac3e723e1717f81':
  implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
 2012-11-16 10:36:02 -08:00
Wink Saville
b8a3f5550a Merge "Separate voice and data radio technology/network type & registration state." 2012-11-16 08:19:34 -08:00
Glenn Kasten
856a48a011 Merge "Use size_t for frame count" 2012-11-16 08:13:10 -08:00
Wink Saville
0dde2c20a0 Separate voice and data radio technology/network type & registration state. 
Change-Id: Ic9622e3fd637751b427c1627bbdf4d142acbc66e
 2012-11-16 08:12:11 -08:00
Przemyslaw Szczepaniak
c3c427d2e3 Revert "Make TTS input string limit public and documented" 
This reverts commit f288a64f5bed290d162c1a6fd54bea7c0ba14042

Change-Id: I6f3e2a6a6a131b0422cfcdb2bda23f8ae245d774
 2012-11-16 05:11:23 -08:00
Przemyslaw Szczepaniak
f288a64f5b Make TTS input string limit public and documented 
Bug: 7456118
Change-Id: Iced44eb349e1abb551f991c2b9357a03bab3bb3d
 2012-11-16 03:14:22 -08:00
Craig Mautner
923584df77 Merge "Fix math errors causing black screen." 2012-11-15 16:30:47 -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
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
Glenn Kasten
fd1e3dfde2 Use size_t for frame count 
Change-Id: Idd364443715a920ece2cc54acc95b395b6ed2c6c
 2012-11-15 14:55:43 -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
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
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
kmccormick@google.com
480ac7fca6 am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs 
* commit '596d0e3881782096f7a6ea9959e8dc5f07004623':
  Doc Update: Fixing images
 2012-11-15 09:51:56 -08:00
kmccormick@google.com
596d0e3881 am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs 
* commit 'f53c5f3683b71d232a78e04ea06649dd5e4bfee1':
  Doc Update: Fixing images
 2012-11-15 09:49:21 -08:00
kmccormick@google.com
f53c5f3683 am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs 
* commit 'd1ae2721fa7b350b979e75319812636ea31bb56b':
  Doc Update: Fixing images
 2012-11-15 09:45:46 -08:00
&& repo sync -j8
d1ae2721fa Merge "Doc Update: Fixing images" into jb-dev-docs 2012-11-15 09:43:18 -08:00
Jesse Hall
9a2609f76e Merge "Handle hotplug events as described instead of rescanning" 2012-11-15 09:33:40 -08:00
Baligh Uddin
b675e4ab8b Merge "Import translations. DO NOT MERGE" 2012-11-15 08:32:37 -08:00
Baligh Uddin
e872b738e8 am a3a2c6a9: am ecc2bcb5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'a3a2c6a9c9053ae52d7e977bba3ebffdf0a3d5aa':
  Import translations. DO NOT MERGE
 2012-11-15 08:22:43 -08:00
Baligh Uddin
a0bee9f097 am 2028f8e0: am 38939259: am c3b6ee60: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2028f8e0989c1ddcec885630c87a5f1e632a9bc4':
  Import translations. DO NOT MERGE
 2012-11-15 08:21:07 -08:00
Baligh Uddin
a3a2c6a9c9 am ecc2bcb5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'ecc2bcb5122179d5db79306e8d4f90db0b52c0d5':
  Import translations. DO NOT MERGE
 2012-11-15 08:20:17 -08:00
Baligh Uddin
2028f8e098 am 38939259: am c3b6ee60: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '389392590178fde1195c2c43f8c540eef5202779':
  Import translations. DO NOT MERGE
 2012-11-15 08:18:40 -08:00
Baligh Uddin
ecc2bcb512 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-15 08:17:16 -08:00
Baligh Uddin
3893925901 am c3b6ee60: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'c3b6ee6068f7970c2a7f9da6f784adc2e6b2bceb':
  Import translations. DO NOT MERGE
 2012-11-15 08:16:31 -08:00
Baligh Uddin
31431cd558 am 5a1b49b1: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '5a1b49b19b945acde07645a786fbd2dabf1802fa':
  Import translations. DO NOT MERGE
 2012-11-15 08:15:02 -08:00
Baligh Uddin
c3b6ee6068 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-15 08:13:48 -08:00
Baligh Uddin
5a1b49b19b Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-15 08:12:49 -08:00
Baligh Uddin
d1846e021f am 59ae7069: am 8264bd80: am 36c7d313: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '59ae7069c6051e65ffc777da65f459c050dedc5a':
  Import translations. DO NOT MERGE
 2012-11-15 08:12:19 -08:00
Baligh Uddin
8ce25752f7 am defe7615: am aaf3fbc6: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'defe761515cd291ab9d91a088cdeab9c5cd903fb':
  Import translations. DO NOT MERGE
 2012-11-15 08:09:34 -08:00
Baligh Uddin
59ae7069c6 am 8264bd80: am 36c7d313: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '8264bd80f2f3bcf684176b6945968f978b337680':
  Import translations. DO NOT MERGE
 2012-11-15 08:09:17 -08:00
Baligh Uddin
91ec43b699 Merge "Import translations. DO NOT MERGE" 2012-11-15 08:09:03 -08:00
Baligh Uddin
8264bd80f2 am 36c7d313: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '36c7d313af815c8842d7ca9002ff36bfe347716b':
  Import translations. DO NOT MERGE
 2012-11-15 08:06:37 -08:00
Baligh Uddin
defe761515 am aaf3fbc6: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'aaf3fbc665bf2252713afee7ef22536b590a71a2':
  Import translations. DO NOT MERGE
 2012-11-15 08:06:36 -08:00
Baligh Uddin
aaf3fbc665 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-15 08:03:08 -08:00
Baligh Uddin
36c7d313af Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-15 08:02:17 -08:00
Baligh Uddin
9d6cf4e1c3 am f118bcc5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'f118bcc5b276f54af9b9f2248867a7eff5bc92ad':
  Import translations. DO NOT MERGE
 2012-11-15 08:01:34 -08:00