67645 Commits

Author SHA1 Message Date
Marco Nelissen
da6e6b50c3 am 2e0f6715: Merge "Further optimize media scanner."
* commit '2e0f67159afa03133772d89f2d346b69a352a6eb':
  Further optimize media scanner.
2012-02-13 15:50:25 -08:00
Marco Nelissen
2e0f67159a Merge "Further optimize media scanner." 2012-02-13 15:47:58 -08:00
Marco Nelissen
d121cfcbb4 Further optimize media scanner.
Inserts of directories can be done in bulk as long as they're inserted before
the files contained within. Extend MediaInserter to accommodate giving priority
treatment to directories.
Bulk deleting of entries can be further sped up (by a factor of ~3 in my tests)
by deleting entries in database order. Switch the file cache to use
LinkedHashMap instead of HashMap to allow iterating over the cache in database
order. Also use bindArgs to allow for better caching of sql statements.

Change-Id: Ieb9ffc4e866c6cd505bf795eb80ff5d03ffc56bd
2012-02-13 15:39:15 -08:00
Makoto Onuki
d2feb4add2 am 75400e77: Merge "Fix the 3-parameter formatNumber to correctly handle IDDs."
* commit '75400e775e7f291720aa43fbe6bf2b4ab41265b1':
  Fix the 3-parameter formatNumber to correctly handle IDDs.
2012-02-13 15:22:02 -08:00
Ramanan Rajeswaran
68de7f5439 DO NOT MERGE
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.

Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
2012-02-13 15:21:04 -08:00
Makoto Onuki
75400e775e Merge "Fix the 3-parameter formatNumber to correctly handle IDDs." 2012-02-13 15:20:40 -08:00
Jeff Brown
c7c243afc7 am dc38fd4c: Merge "Don\'t serialize motion events."
* commit 'dc38fd4c736b2beebfe5a77c79d2088ad3816a4d':
  Don't serialize motion events.
2012-02-13 15:06:47 -08:00
Jeff Brown
dc38fd4c73 Merge "Don't serialize motion events." 2012-02-13 15:04:33 -08:00
Fabrice Di Meglio
46e8861364 am f53b451c: Merge "Update BiDiTest app for GridLayout RTL tests"
* commit 'f53b451c4c60ddccb99624d5fd40733715e7a7fa':
  Update BiDiTest app for GridLayout RTL tests
2012-02-13 15:01:22 -08:00
Fabrice Di Meglio
f53b451c4c Merge "Update BiDiTest app for GridLayout RTL tests" 2012-02-13 14:58:53 -08:00
Tsu Chiang Chuang
9d82346e81 am 42a3e79d: am 8885596a: am 3ded587c: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '42a3e79d5ab5fb9d52b2bd3ea7d016d4b76e23e1':
2012-02-13 14:45:23 -08:00
Dianne Hackborn
5f94ac7951 am d2a4c2fa: am 84affb8a: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
* commit 'd2a4c2fa8fdaeb6bc4a51cb26b3419c5e5e1c083':
  Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
2012-02-13 14:45:21 -08:00
Fabrice Di Meglio
0d2bda319d Update BiDiTest app for GridLayout RTL tests
- add unit tests for GridLayout in RTL mode

Change-Id: Icc983a6e2cc75b30e457fd822d81ef5630de0f10
2012-02-13 14:44:22 -08:00
Tsu Chiang Chuang
42a3e79d5a am 8885596a: am 3ded587c: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '8885596a9109794ebd61e6a91e5199aa1750ed8c':
2012-02-13 14:42:42 -08:00
Dianne Hackborn
d2a4c2fa8f am 84affb8a: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
* commit '84affb8ae6477c46c75f834b73daa13b2a751c21':
  Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
2012-02-13 14:42:40 -08:00
Tsu Chiang Chuang
8885596a91 am 3ded587c: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '3ded587cc199d4ba592e675dc47fb80a28d1dacd':
2012-02-13 14:39:48 -08:00
Dianne Hackborn
84affb8ae6 Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
2012-02-13 14:39:45 -08:00
Dianne Hackborn
41bcf9fb10 am 07f941f0: Merge "Move BroadcastQueue out of the ActivityManager class."
* commit '07f941f026ed2aef8945d0d44134162b3db50eb5':
  Move BroadcastQueue out of the ActivityManager class.
2012-02-13 14:36:26 -08:00
Dianne Hackborn
07f941f026 Merge "Move BroadcastQueue out of the ActivityManager class." 2012-02-13 14:34:26 -08:00
Jean-Baptiste Queru
472512f697 Merge "Fix incorrect prototype for JNI call" 2012-02-13 14:32:33 -08:00
Ramanan Rajeswaran
350308b2c0 am 95d4c993: am 352b8d03: (-s ours) am 8046e294: Merge "DO NOT MERGE" into ics-scoop
* commit '95d4c9934f27b2c7276005b0235e0da44a89aea8':
  DO NOT MERGE
2012-02-13 14:29:54 -08:00
Ramanan Rajeswaran
95d4c9934f am 352b8d03: (-s ours) am 8046e294: Merge "DO NOT MERGE" into ics-scoop
* commit '352b8d03c63585f4eaec09d2e39a4d173be83164':
  DO NOT MERGE
2012-02-13 14:27:40 -08:00
Eric Fischer
2606dac235 am 5c6dfc37: Merge "Import translations."
* commit '5c6dfc374ad57175556ad4369edf0397cb91d57e':
  Import translations.
2012-02-13 14:27:39 -08:00
Eric Fischer
5c6dfc374a Merge "Import translations." 2012-02-13 14:26:03 -08:00
Eric Fischer
180d8abc9e Merge "Import translations. DO NOT MERGE" into graphics-dev 2012-02-13 14:24:59 -08:00
Ramanan Rajeswaran
352b8d03c6 am 8046e294: Merge "DO NOT MERGE" into ics-scoop
* commit '8046e294c545b8e3712bff7925b024639936d5bf':
  DO NOT MERGE
2012-02-13 14:24:38 -08:00
Jean-Michel Trivi
047bb5eeda am fbd2e643: Merge "Playback rate on MediaPlayer"
* commit 'fbd2e64346c3b86f62fdf2c94f0e3c558e029a6d':
  Playback rate on MediaPlayer
2012-02-13 14:23:13 -08:00
Ramanan Rajeswaran
8046e294c5 Merge "DO NOT MERGE" into ics-scoop 2012-02-13 14:22:44 -08:00
Jean-Michel Trivi
fbd2e64346 Merge "Playback rate on MediaPlayer" 2012-02-13 14:21:36 -08:00
Ramanan Rajeswaran
9d29031417 DO NOT MERGE
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.

Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
2012-02-13 14:17:06 -08:00
Jeff Brown
6b31449e5d am a17032ee: Merge "Accurately track the sequence numbers of batched events."
* commit 'a17032eeb91f709360b6271b71b85e67f729bcc1':
  Accurately track the sequence numbers of batched events.
2012-02-13 14:05:29 -08:00
Jeff Brown
0952c30ac2 Don't serialize motion events.
On reflection, only key events need to be serialized.

This is part of a series of changes to improve input system pipelining.

Bug: 5963420
Change-Id: I028b4eac97497d012036cb60ffbac4cb22d3966c
2012-02-13 14:04:24 -08:00
Fabrice Di Meglio
8e987bb6ee am 7a29d84f: Merge "Fix bug #5904777 GridLayout should be RTL aware"
* commit '7a29d84f0150b49215726d08a69d343df74e02bc':
  Fix bug #5904777 GridLayout should be RTL aware
2012-02-13 14:02:57 -08:00
Jeff Brown
a17032eeb9 Merge "Accurately track the sequence numbers of batched events." 2012-02-13 14:02:51 -08:00
Fabrice Di Meglio
7a29d84f01 Merge "Fix bug #5904777 GridLayout should be RTL aware" 2012-02-13 14:01:28 -08:00
Jeff Brown
2d34e0cfe7 Accurately track the sequence numbers of batched events.
Instead of sending finished signals immediately when appending to
a batch, record the chain of sequence numbers that were part of
the batch and then send finished signals all at once when done.
This change helps the dispatcher keep track of the true state
of the application and can improve ANR detection slightly.

This is part of a series of changes to improve input system pipelining.

Bug: 5963420
Change-Id: I463c2221e2aa8fdf1c3d670c18e39e59ab69b0db
2012-02-13 13:59:32 -08:00
Jeff Brown
11ffe521b5 am 27b51987: Merge "Enable deferred input messages to be batched."
* commit '27b51987dd3fa7e18703aab45fa10625a56d8c98':
  Enable deferred input messages to be batched.
2012-02-13 13:58:34 -08:00
Jeff Brown
27b51987dd Merge "Enable deferred input messages to be batched." 2012-02-13 13:55:41 -08:00
Fabrice Di Meglio
47d248eb43 Fix bug #5904777 GridLayout should be RTL aware
- update also DEBUG mode for taking care about RTL
- one minor issue remaining: left alignment is not properly honored in RTL

Change-Id: I9a4c8413cb1189a032649472016994642418637b
2012-02-13 13:52:47 -08:00
Tsu Chiang Chuang
a85c4a8333 am 298b8004: am 5f5ea91f: am eb56ad18: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '298b8004ad1c2cff00676473c702bb4fc98a80a7':
  extending timeout to stabilize tests
2012-02-13 13:50:17 -08:00
Tsu Chiang Chuang
298b8004ad am 5f5ea91f: am eb56ad18: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '5f5ea91f60b4b7d2fcf3da3603cd745a53cba48f':
  extending timeout to stabilize tests
2012-02-13 13:47:45 -08:00
Tsu Chiang Chuang
5f5ea91f60 am eb56ad18: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit 'eb56ad183af8a9833ff22a22b97f174f05266c58':
  extending timeout to stabilize tests
2012-02-13 13:45:06 -08:00
Tsu Chiang Chuang
3ded587cc1 am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
  extending timeout to stabilize tests
2012-02-13 13:43:07 -08:00
Tsu Chiang Chuang
eb56ad183a am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
  extending timeout to stabilize tests
2012-02-13 13:42:45 -08:00
Tsu Chiang Chuang
08eb7dd630 Merge "extending timeout to stabilize tests" into ics-mr1 2012-02-13 13:41:37 -08:00
Eric Fischer
6cbc99f9f0 Import translations.
Change-Id: I5a3f1a37ae10c3fb6d264654f9b4cc7e945cd722
2012-02-13 13:38:44 -08:00
Dianne Hackborn
55ba110d2f am ec5b5156: Merge "Fix issue where screen rotations would stop animating."
* commit 'ec5b5156e7a6f46cb90f1b3e980b70a11384f43c':
  Fix issue where screen rotations would stop animating.
2012-02-13 13:32:52 -08:00
Dianne Hackborn
ec5b5156e7 Merge "Fix issue where screen rotations would stop animating." 2012-02-13 13:30:53 -08:00
Eric Fischer
5f304cedab Import translations. DO NOT MERGE
Change-Id: I75858b6768d71956797ca47c840182305ee42526
2012-02-13 13:28:11 -08:00
Dianne Hackborn
47960677c0 am 0bbd872e: am d1f88de2: am c1496d2d: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
* commit '0bbd872ea806470fd007b8ea35f953380a8b4162':
  Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
2012-02-13 12:44:54 -08:00