47569 Commits

Author SHA1 Message Date
Justin Ho
73394399d8 am 201bc41e: am 750a4a26: am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
* commit '201bc41e0cbb07dba5365f33ba9885c02977ed6a':
  Fix expander list group indicator Bug: #6699FF
2011-03-15 23:50:37 -07:00
Stephen Hines
49959d46c5 am 89254a11: am e01675cd: am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1
* commit '89254a114bac016bbc9974c392d40804da0eb174':
  2X2 matrix needs 4 float elements.
2011-03-15 23:50:34 -07:00
Justin Ho
201bc41e0c am 750a4a26: am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
* commit '750a4a2623f8bb5167c87b1f5d3bcce12695a13d':
  Fix expander list group indicator Bug: #6699FF
2011-03-15 23:47:17 -07:00
Stephen Hines
89254a114b am e01675cd: am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1
* commit 'e01675cdbe083331607a01e38fa71caed2d48f71':
  2X2 matrix needs 4 float elements.
2011-03-15 23:47:14 -07:00
Justin Ho
750a4a2623 am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
* commit '141505a9769099ac38eacb62409a75ff891860a1':
  Fix expander list group indicator Bug: #6699FF
2011-03-15 23:44:08 -07:00
Stephen Hines
e01675cdbe am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1
* commit '2d5cbc92add5065a62acdd38cd254eebb1ee2f94':
  2X2 matrix needs 4 float elements.
2011-03-15 23:43:55 -07:00
Eric Fischer
a142f4b25b am 0dd0a805: (-s ours) am a78327da: am acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '0dd0a80503f6f4d80eda1f0a964ddb29bd50b9dd':
  Import revised translations.  DO NOT MERGE
2011-03-15 23:34:05 -07:00
Eric Fischer
0dd0a80503 am a78327da: am acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'a78327da4588c60b44163d169f9f973edbdde69f':
  Import revised translations.  DO NOT MERGE
2011-03-15 23:31:55 -07:00
Eric Fischer
a78327da45 am acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'acca16004fd58c2b8c489f031281b58551551dc8':
  Import revised translations.  DO NOT MERGE
2011-03-15 23:29:10 -07:00
Kenny Root
a270125bb1 am d57440c1: (-s ours) am 29d30cdc: Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
* commit 'd57440c18ef8d5ae9c04f4a03737e2d6ec8a29e8':
  Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
2011-03-15 23:26:50 -07:00
Kenny Root
d57440c18e am 29d30cdc: Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
* commit '29d30cdc641fd4ee55434aa487c07b2d4434a7ac':
  Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
2011-03-15 23:23:52 -07:00
satok
35267f178c Merge "Add CorrectionSpan and APIs to pass a secure CorrectionSpan to TextView" 2011-03-15 23:13:56 -07:00
Kenny Root
29d30cdc64 Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1 2011-03-15 23:09:13 -07:00
satok
adb435835f Add CorrectionSpan and APIs to pass a secure CorrectionSpan to TextView
- CorrectionSpan is a span which has suggestions made by IME.
This has a function to change the current IME to other IME specified
in this span. For security reasons, only the current IME
is allowed to use this function through InputConnection.
(IME token is used for checking the validity of it.).

- CorrectionSpan stores following information:

flags, subtype Id, InputMethodInfo Id, suggests, locale, original string

Change-Id: Id3abc9ea4d11753cdc4f483a2bb3128f49ba198a
2011-03-16 14:44:37 +09:00
Justin Ho
d71792e17d am cb2d1be9: am a1e4b659: am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1
* commit 'cb2d1be93d51c90152eaa453028c7be97a3d58e5':
  Updated notification asset for DND mode
2011-03-15 21:44:17 -07:00
Justin Ho
cb2d1be93d am a1e4b659: am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1
* commit 'a1e4b659ebeb44e21de7c7cd8f772d218e7553ec':
  Updated notification asset for DND mode
2011-03-15 21:42:10 -07:00
Justin Ho
a1e4b659eb am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1
* commit '9b183a72bcaab75897d1571d55ecbaf228ed4abd':
  Updated notification asset for DND mode
2011-03-15 21:37:27 -07:00
Jeff Brown
843e29d375 Merge "Improve VelocityTracker numerical stability." 2011-03-15 20:01:16 -07:00
Jeff Brown
2ed2462aa2 Improve VelocityTracker numerical stability.
Replaced VelocityTracker with a faster and more accurate
native implementation.  This avoids the duplicate maintenance
overhead of having two implementations.

The new algorithm requires that the sample duration be at least
10ms in order to contribute to the velocity calculation.  This
ensures that the velocity is not severely overestimated when
samples arrive in bursts.

The new algorithm computes the exponentially weighted moving
average using weights based on the relative duration of successive
sample periods.

The new algorithm is also more careful about how it handles
individual pointers going down or up and their effects on the
collected movement traces.  The intent is to preserve the last
known velocity of pointers as they go up while also ensuring
that other motion samples do not count twice in that case.

Bug: 4086785
Change-Id: I2632321232c64d6b8faacdb929e33f60e64dcdd3
2011-03-15 19:59:47 -07:00
Dianne Hackborn
437c2c1620 Merge "Add new PreferenceActivity API for settings." 2011-03-15 16:52:40 -07:00
Justin Ho
141505a976 Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1 2011-03-15 16:47:27 -07:00
Justin Ho
a5c064e0d9 Fix expander list group indicator
Bug: #6699FF

Change-Id: I48f2ecb2246ad5d5e11d7e9122b6ef90c764b571
2011-03-15 16:38:58 -07:00
Dianne Hackborn
b1a6e439f6 Add new PreferenceActivity API for settings.
Need to redirect to a different activity when on non-xlarge screens.

Change-Id: I8cf4793b117325604d29ecc4478dbf10322a4689
2011-03-15 16:23:01 -07:00
Stephen Hines
2d5cbc92ad Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1 2011-03-15 16:22:19 -07:00
Dianne Hackborn
fd865d0fb5 am 9b7c1274: am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread
* commit '9b7c1274ddba8db2842431649d46c4cef510131f':
  Improve error reporting for issue #3183612
2011-03-15 15:47:32 -07:00
Mike Lockwood
05672d59a7 am a32b5978: (-s ours) am 3c9aa1aa: (-s ours) am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
* commit 'a32b5978b700abf02e9fe6ae4eb95dfd4c158e4f':
  DO NOT MERGE: Backport more USB accessory changes from honeycomb
2011-03-15 15:47:29 -07:00
Dianne Hackborn
9b7c1274dd am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread
* commit 'e2e8da7c734b71c4b6b81e51e16ce3f4061f0f07':
  Improve error reporting for issue #3183612
2011-03-15 15:44:18 -07:00
Mike Lockwood
a32b5978b7 am 3c9aa1aa: (-s ours) am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
* commit '3c9aa1aa093ff8acc5ec71190a35b9ab04d64fda':
  DO NOT MERGE: Backport more USB accessory changes from honeycomb
2011-03-15 15:44:13 -07:00
Eric Fischer
acca16004f Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-15 14:59:33 -07:00
Dianne Hackborn
e2e8da7c73 am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread
* commit '7c2e76f0a4daa7e4316e7a85d41d3c391319d955':
  Improve error reporting for issue #3183612
2011-03-15 14:49:45 -07:00
Mike Lockwood
3c9aa1aa09 am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
* commit 'b09763209980ff9210cc353f2410598220ec0480':
  DO NOT MERGE: Backport more USB accessory changes from honeycomb
2011-03-15 14:49:37 -07:00
Kenny Root
d022c23aed Merge "Revise free space checks for package installs" 2011-03-15 14:48:56 -07:00
Stephen Hines
ef65bb30ed 2X2 matrix needs 4 float elements.
BUG=4104094

Change-Id: I175bde5839d6f1c56b2fd7499853be723e85120f
2011-03-15 14:47:31 -07:00
Justin Ho
9b183a72bc Merge "Updated notification asset for DND mode" into honeycomb-mr1 2011-03-15 14:41:30 -07:00
Dianne Hackborn
7c2e76f0a4 Merge "Improve error reporting for issue #3183612" into gingerbread 2011-03-15 14:40:56 -07:00
Eric Fischer
4670b4d95c Import revised translations. DO NOT MERGE
Change-Id: Ief48781413cadb2a9bd786974e4688ac222d7b36
2011-03-15 14:40:53 -07:00
Dianne Hackborn
1ab43775d8 Improve error reporting for issue #3183612
java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.

Change-Id: I465972ab91b007e04b2ac62550f78583956a4048
2011-03-15 14:38:02 -07:00
Gloria Wang
0e5e2e2b2b Merge "Bug fixes of DRM framework." 2011-03-15 14:10:30 -07:00
Kenny Root
d4a9bb569e am b3150784: (-s ours) am 7ddd62b5: (-s ours) Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
* commit 'b3150784487e7578a004c14da5c00d9bc6eb2fc9':
  Add byte limit in addition to ratio for installs DO NOT MERGE
2011-03-15 14:09:54 -07:00
Mike Lockwood
b097632099 Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread 2011-03-15 14:04:54 -07:00
Kenny Root
b315078448 am 7ddd62b5: (-s ours) Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
* commit '7ddd62b5bedf9065bba00e25aa62f2eae14cf92e':
  Add byte limit in addition to ratio for installs DO NOT MERGE
2011-03-15 14:03:50 -07:00
Kenny Root
7ddd62b5be Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1 2011-03-15 14:01:39 -07:00
Glenn Kasten
e5eb43b5d9 am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
* commit '7d7dcb5ea891ad4c3252ed832ebd06accc96153d':
  Bug 4016329 do full string comparisons
2011-03-15 13:51:17 -07:00
Mike Lockwood
638d7cb3ee DO NOT MERGE: Backport more USB accessory changes from honeycomb
Change-Id: I8459c5ab9fbf0b3cad752041484a5de44ca9badd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-15 16:50:18 -04:00
Mike Lockwood
7896f1bd55 am c9b82ebb: am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1
* commit 'c9b82ebb97411cf4a8494dc83f57039bb77937c5':
  USB Manager string clean up:
2011-03-15 13:49:14 -07:00
Svetoslav Ganov
e822af2f7b am 3b901c4b: am bdabdda8: Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1
* commit '3b901c4b89b2f42c4a212d3f176272f911386e64':
  CheckBoxPreferences do not fire accessibility events
2011-03-15 13:49:12 -07:00
Mike Lockwood
aa155b4bee am 6a20784e: am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1
* commit '6a20784e461b0c0b24ccd04acf9509565aec3e70':
  SqliteDatabase: Fix local reference leak in custom_function_callback()
2011-03-15 13:49:09 -07:00
Glenn Kasten
7d7dcb5ea8 am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
* commit '4528a7db389b4da73207d00ca15b306a111650cc':
  Bug 4016329 do full string comparisons
2011-03-15 13:46:27 -07:00
Glenn Kasten
4528a7db38 Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1 2011-03-15 13:44:58 -07:00
Mike Lockwood
c9b82ebb97 am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1
* commit '3b7871c242bea5834c657c25fbb89c382566f66f':
  USB Manager string clean up:
2011-03-15 13:42:44 -07:00