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

61800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
c350f1604f Instrumentation sendStringSync(String) may try to inject obsolete events. 
KeyEvents returned by KeyCharacterMap.getEvents() have the same time stamp
and the system rejects too old events. Hence, it is possible for an event
to become stale before it is injected if it takes too long to inject the
preceding ones. Now the time of the event is set just before injecting it.

Change-Id: I72b60d261f8bda857b331d0f1b1bd97f9f15def3
 2011-11-11 10:43:13 -08:00
James Dong
03466e35f2 Merge "Adds handler type 'sbtl' to support subtitles in various containers." 2011-11-10 16:14:56 -08:00
Stephen Hines
0906005662 Merge "Fix setTimeZone() and use it properly in RSTest/rstime." 2011-11-10 16:09:29 -08:00
Stephen Hines
d2f561d183 Fix setTimeZone() and use it properly in RSTest/rstime. 
BUG=5470134

The original implementation for rsi_ScriptSetTimeZone() never actually did
anything with the bytes received. This change allows it to safely update the
timezone. RSTest is also updated to call setTimeZone(), so that users in
different timezones can accurately get test results.

Change-Id: I6cb1b3a0c3a417749ba39e0fe09cc9c7ab65c2e7
 2011-11-10 15:44:25 -08:00
Glenn Kasten
06d04f22c0 Merge "Fix log message" 2011-11-10 15:14:12 -08:00
Romain Guy
07c0fe4c4f am f1062114: am a3cc20ff: Merge "Initialize egl_cache with an app writeable file" into ics-mr1 
* commit 'f1062114874f1cf46de479031d9ad3ad3cae1131':
  Initialize egl_cache with an app writeable file
 2011-11-10 23:06:29 +00:00
Romain Guy
f106211487 am a3cc20ff: Merge "Initialize egl_cache with an app writeable file" into ics-mr1 
* commit 'a3cc20fff073bd3ca588f1e61f0f7034aecf3ebb':
  Initialize egl_cache with an app writeable file
 2011-11-10 23:03:45 +00:00
Romain Guy
a3cc20fff0 Merge "Initialize egl_cache with an app writeable file" into ics-mr1 2011-11-10 15:02:07 -08:00
Glenn Kasten
91225183d6 Fix log message 
Log did not have a tag, and was wrong level

Change-Id: I8d12895c80483e1e39f117a393b8be2f4bdd3e1d
 2011-11-10 14:58:44 -08:00
The Android Open Source Project
6260103c03 Reconcile with ics-mr1-release 
Change-Id: I86cac837a23dff6367af0e69d07ad3983845ff1e
 2011-11-10 14:53:51 -08:00
Jeff Brown
5a8ce7b2bf am 71ed608e: am 88089ccc: Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1 
* commit '71ed608ea7cfb349bba06c5f6bb17b525a4fd964':
  Wake on volume key when in dock. Bug: 5580373
 2011-11-10 22:50:19 +00:00
Peter Ng
56f73a149b am f52df796: am 15843aa5: Merge "lock pattern width spec set to max" into ics-mr1 
* commit 'f52df7961f29a2f508fb7421f8cd9c95b9b409aa':
  lock pattern width spec set to max
 2011-11-10 22:50:16 +00:00
Jeff Brown
71ed608ea7 am 88089ccc: Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1 
* commit '88089ccc79ee7ba5f48ade9bb73a99cf05f6ec62':
  Wake on volume key when in dock. Bug: 5580373
 2011-11-10 22:42:49 +00:00
Jeff Brown
88089ccc79 Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1 2011-11-10 14:40:48 -08:00
The Android Open Source Project
7b7cd88a29 Reconcile with ics-mr0-release 
Change-Id: I16a4177148eb8ce12f14af9628c9f5143ba0b836
 2011-11-10 14:35:36 -08:00
Jeff Brown
43150bfa93 Wake on volume key when in dock. 
Bug: 5580373

Change-Id: I847fb10b48c2e5e26cabefea1d630793efc32131
 2011-11-10 14:33:59 -08:00
Peter Ng
f52df7961f am 15843aa5: Merge "lock pattern width spec set to max" into ics-mr1 
* commit '15843aa5f66fee8eee5e634508dbf83a4e5ab55d':
  lock pattern width spec set to max
 2011-11-10 22:32:53 +00:00
Peter Ng
15843aa5f6 Merge "lock pattern width spec set to max" into ics-mr1 2011-11-10 14:31:09 -08:00
Peter Ng
628709f031 am 08158c55: am bce7812b: Merge "Cleaning up tablet assets by deleting drawable-xlarge and large folders" into ics-mr1 
* commit '08158c5526ded5599b183e5d8380809571e5c56a':
  Cleaning up tablet assets by deleting drawable-xlarge and large folders
 2011-11-10 22:30:51 +00:00
Peter Ng
08158c5526 am bce7812b: Merge "Cleaning up tablet assets by deleting drawable-xlarge and large folders" into ics-mr1 
* commit 'bce7812baba05e969406f8644595ef6237e16a41':
  Cleaning up tablet assets by deleting drawable-xlarge and large folders
 2011-11-10 22:28:33 +00:00
Peter Ng
bce7812bab Merge "Cleaning up tablet assets by deleting drawable-xlarge and large folders" into ics-mr1 2011-11-10 14:26:57 -08:00
Katie McCormick
7675b4cae1 am e36263be: am 49654c72: am 921afe39: Doc change: new Calendar content provider doc 
* commit 'e36263be662d8ebac260e81f1fbac356a8362691':
  Doc change: new Calendar content provider doc
 2011-11-10 22:25:37 +00:00
Katie McCormick
e36263be66 am 49654c72: am 921afe39: Doc change: new Calendar content provider doc 
* commit '49654c72344610032bbff4405024fad2b30e1100':
  Doc change: new Calendar content provider doc
 2011-11-10 22:23:25 +00:00
Peter Ng
37ae1fe005 Cleaning up tablet assets by deleting drawable-xlarge and large folders 
-keeping default wallpaper in xlarge-nodpi

Bug:5596158

Change-Id: I18ec8b0aa648fa95a1f6ebb4380c630f05e24ecb
 2011-11-10 14:22:05 -08:00
Adam Powell
9e71bb0b2f am aa771ceb: am 71282a47: Merge "Fix access modifiers on ImageView overrides" into ics-mr1 
* commit 'aa771ceb0919f2a66ba9c927e5617d15471d70e2':
  Fix access modifiers on ImageView overrides
 2011-11-10 22:20:48 +00:00
Katie McCormick
49654c7234 am 921afe39: Doc change: new Calendar content provider doc 
* commit '921afe39d6041b06c6a002b08f9dcd1561a9ae99':
  Doc change: new Calendar content provider doc
 2011-11-10 22:20:37 +00:00
Romain Guy
a958265827 Initialize egl_cache with an app writeable file 
Change-Id: I5dda234feab0fedd6e4179a80715ae20dee1c833
 2011-11-10 14:20:10 -08:00
Adam Powell
aa771ceb09 am 71282a47: Merge "Fix access modifiers on ImageView overrides" into ics-mr1 
* commit '71282a476ad57ec398f0a8d33cf67bfd469c8c55':
  Fix access modifiers on ImageView overrides
 2011-11-10 22:18:55 +00:00
Dianne Hackborn
f16cb9e510 am 8eac3b2f: am 0f70e482: Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1 
* commit '8eac3b2f1ae4b155bd159317e9f221223189ba26':
  Fix issue #5470311: Activity with android:configChanges defined...
 2011-11-10 22:17:08 +00:00
Adam Powell
71282a476a Merge "Fix access modifiers on ImageView overrides" into ics-mr1 2011-11-10 14:16:45 -08:00
Dianne Hackborn
8eac3b2f1a am 0f70e482: Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1 
* commit '0f70e482c8aa7ce9c5676b1226ff98b63fb991e7':
  Fix issue #5470311: Activity with android:configChanges defined...
 2011-11-10 22:14:33 +00:00
Dianne Hackborn
0f70e482c8 Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1 2011-11-10 14:12:25 -08:00
Adam Powell
6a939ae6fd Fix access modifiers on ImageView overrides 
Change-Id: I64cc10c877ac4adc4b79abcd7c7617480bd82906
 2011-11-10 14:11:51 -08:00
Eric Fischer
c926911386 Merge "Import revised translations." 2011-11-10 14:06:21 -08:00
Adam Powell
5d35fd79a7 am ba44080d: am 67121fd7: Merge "Fix bug 5581874 - Animated drawables don\'t start as expected" into ics-mr1 
* commit 'ba44080d834d23d0bc7d118a4950f837eeaca96a':
  Fix bug 5581874 - Animated drawables don't start as expected
 2011-11-10 22:01:58 +00:00
Adam Powell
ba44080d83 am 67121fd7: Merge "Fix bug 5581874 - Animated drawables don\'t start as expected" into ics-mr1 
* commit '67121fd7b241ceafe7339f5f154781572819f87b':
  Fix bug 5581874 - Animated drawables don't start as expected
 2011-11-10 21:58:30 +00:00
Adam Powell
67121fd7b2 Merge "Fix bug 5581874 - Animated drawables don't start as expected" into ics-mr1 2011-11-10 13:57:24 -08:00
Martijn Coenen
5a81e795cf am 7ee88289: (-s ours) am c5f3fd6e: Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API\'s." (DO NOT MERGE)." into ics-mr1 
* commit '7ee88289091f8bc81dabeff62f215ba21baa8c0b':
  Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE).
 2011-11-10 21:53:49 +00:00
Martijn Coenen
7ee8828909 am c5f3fd6e: Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API\'s." (DO NOT MERGE)." into ics-mr1 
* commit 'c5f3fd6ef160c0f6072b14b97aa5c1d9759c682e':
  Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE).
 2011-11-10 21:50:21 +00:00
Chet Haase
f458b3d39a am 68a15583: am 41ffab86: Merge "increase the rate at which we dispatch events." into ics-mr1 
* commit '68a15583f7438c687e3b029f83cf80ca7827ff31':
  increase the rate at which we dispatch events.
 2011-11-10 21:49:30 +00:00
Martijn Coenen
c5f3fd6ef1 Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE)." into ics-mr1 2011-11-10 13:48:02 -08:00
Chet Haase
68a15583f7 am 41ffab86: Merge "increase the rate at which we dispatch events." into ics-mr1 
* commit '41ffab86d92622679d4d2ad8307806e8099f8170':
  increase the rate at which we dispatch events.
 2011-11-10 21:46:16 +00:00
Chet Haase
41ffab86d9 Merge "increase the rate at which we dispatch events." into ics-mr1 2011-11-10 13:44:34 -08:00
Kenny Root
0d1569c359 am f4db2fe5: am bc853c03: Merge "Close file on exception as well" into ics-mr1 
* commit 'f4db2fe56479635f8ec0a195e9e6b53a55216139':
  Close file on exception as well
 2011-11-10 21:23:24 +00:00
Martijn Coenen
0946fe5be3 Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE). 
This reverts commit 562dfff65ac79590c0b7c50019cd3d107e8b4e0e. These API's are still used
by GMM in the version that ships with MR1, so we need them to keep Beam working for
GMM. Note that these APIs are hidden.

From version 5.13 onwards GMM will use the new API's.

Change-Id: I316a9c9b7d0052a14f6c1df70f2ed463bca61800
 2011-11-10 13:22:27 -08:00
Kenny Root
f4db2fe564 am bc853c03: Merge "Close file on exception as well" into ics-mr1 
* commit 'bc853c0344b2bbe6f94f425cd0fb1d2642c0fa2f':
  Close file on exception as well
 2011-11-10 21:20:28 +00:00
Kenny Root
bc853c0344 Merge "Close file on exception as well" into ics-mr1 2011-11-10 13:18:24 -08:00
Tom Taylor
fb894276b1 am 0bbd151e: am faa81c82: Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1 
* commit '0bbd151e1dab043226725d23f0ca26f4d09ee76f':
  Revert "Add new secure setting for controlling Messaging notifications"
 2011-11-10 21:16:54 +00:00
Tom Taylor
0bbd151e1d am faa81c82: Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1 
* commit 'faa81c82103e89a3f2c86c4e737d9beb7e557402':
  Revert "Add new secure setting for controlling Messaging notifications"
 2011-11-10 21:13:42 +00:00
Tom Taylor
faa81c8210 Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1 2011-11-10 13:11:16 -08:00