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

51283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
5d78e0b8ea Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 2011-05-23 18:01:50 -07:00
Mike Lockwood
4c12606852 GPS: Change NTP polling interval from 4 to 24 hours 
4 hours is excessive, and we want to save bandwidth on the NTP servers

Change-Id: Ic5ac4f4a8e62167206f3f620ea51635a2ea771d6
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-23 20:57:43 -04:00
Mathias Agopian
f56a960105 fix x86 build 
Change-Id: I03cfbfeaeb8b13842248856b14b4a23711036e10
 2011-05-23 17:48:36 -07:00
Adam Powell
7d372b49e2 am 7dfdb914: am f483ed90: am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2 
* commit '7dfdb914206eafbf2aa4533e9b6a50428a5d0d3d':
  Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
 2011-05-23 17:18:54 -07:00
Wink Saville
ed5af6d93b am 61a5ab57: am f89ea7a5: Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE 
* commit '61a5ab57b8a11d134ed3cfcab24a23d26ea4ddf0':
  Change getLteOnCdmaModeStatic to dynamically determine its result.
 2011-05-23 17:18:29 -07:00
Gilles Debunne
f3a135bfba Added a new flag in TextView to disable Suggestions. 
This is needed for specific TextEdit (such as AutoCompleteTextField)
which do not want to display the "No suggestions available" message.

Bug 4443830

Change-Id: Ic228b56bacfdf2765e70eb24952ab087556c1f93
 2011-05-23 17:15:20 -07:00
Amith Yamasani
fcdbcf9174 am 5b00912e: am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2 
* commit '5b00912e5844591a846e8ba3c4710d2daaa8069a':
  DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
 2011-05-23 17:12:00 -07:00
Mike Lockwood
49b9449b66 am d8d84708: am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 
* commit 'd8d8470825a637843d45a3b436e80a3b85f1dd11':
  MountService: Add StorageVolume as extra in storage related broadcasts.
 2011-05-23 17:09:30 -07:00
Amith Yamasani
5b00912e58 am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2 
* commit '51652f5674e266d62607324255517d41d225d9be':
  DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
 2011-05-23 17:08:48 -07:00
Mike Lockwood
d8d8470825 am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 
* commit '988b6648b0138fe1294228e17164b2f1d6a4042d':
  MountService: Add StorageVolume as extra in storage related broadcasts.
 2011-05-23 17:06:47 -07:00
Amith Yamasani
51652f5674 Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2 2011-05-23 17:05:47 -07:00
Mike Lockwood
988b6648b0 Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 2011-05-23 17:04:01 -07:00
Mike Lockwood
a5250c9392 MountService: Add StorageVolume as extra in storage related broadcasts. 
Change-Id: I8e1a21ae233ba9812e58b363b59a66b260a01cbf
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-23 20:01:55 -04:00
Dianne Hackborn
37cd57772b Merge "resolved conflicts for merge of 070a19e0 to master" 2011-05-23 16:59:20 -07:00
John Reck
f656d95078 am 82de141d: am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2 
* commit '82de141db736b95b0e388ff060e2d2535192d769':
  DO NOT MERGE Use previous version if version is a codename
 2011-05-23 16:53:28 -07:00
Amith Yamasani
1d2385d08a DO NOT MERGE. Preference activity changes to work on smaller tablet screens. 
Breadcrumbs move to the action bar on certain configs.

Padding around fragments and to the left of preference items
adjusted for different display sizes.

Change-Id: Ie899f9742f4ebd7044f158b1c7db06df82ad2d75
 2011-05-23 16:53:16 -07:00
John Reck
82de141db7 am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2 
* commit '4a74eb679917797bf77a20773e0c079f5cc808e4':
  DO NOT MERGE Use previous version if version is a codename
 2011-05-23 16:50:23 -07:00
John Reck
4a74eb6799 Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2 2011-05-23 16:47:32 -07:00
Dianne Hackborn
bbca81334e am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2 
* commit '4bb78889d04594c01a6af7f6d38c1764e9f575f9':
  Add "television" mode.
 2011-05-23 16:16:54 -07:00
Dianne Hackborn
4bb78889d0 am 40277df7: Merge "Add "television" mode." into honeycomb-mr2 
* commit '40277df7c33c0fc381eec589c768fe86de4b4404':
  Add "television" mode.
 2011-05-23 16:07:43 -07:00
John Reck
3e1aecea2e DO NOT MERGE Use previous version if version is a codename 
When the version is reported as a codename, use the previous version
 in the user agent string.
 Bug: 4347787

Change-Id: I4ed804a7334d6ca242446176ff042c4ac7938a0f
 2011-05-23 15:45:16 -07:00
Dianne Hackborn
40277df7c3 Merge "Add "television" mode." into honeycomb-mr2 2011-05-23 15:18:20 -07:00
Dianne Hackborn
e360bb6bd8 Add "television" mode. 
Change-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b
 2011-05-23 15:11:08 -07:00
TK MUN
98a8231e83 am 59c87cb6: (-s ours) am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received 
* commit '59c87cb6074fe48dc0af20ef0082bdef0803dc45':
  DO NOT MERGE SystemUI: update signal level when broadcast is received
 2011-05-23 14:52:29 -07:00
TK MUN
59c87cb607 am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received 
* commit '6f0394a3b4d6082c9cb01de4a220a3b082e1840a':
  DO NOT MERGE SystemUI: update signal level when broadcast is received
 2011-05-23 14:47:38 -07:00
Steve Block
560e97f8e0 Merge "Log a StrictMode violation when WebView methods are called on the wrong thread" 2011-05-23 14:34:00 -07:00
Dianne Hackborn
939461300a resolved conflicts for merge of 070a19e0 to master 
Change-Id: I855ab02a4e8dd465af67fd23b66c0dace76bd411
 2011-05-23 14:10:26 -07:00
Wink Saville
9a8ea20d4b am 070eecef: Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE 
* commit '070eecef394175d7344cdadde675e8977a1609f0':
  Map multiple apnType to one DataConnection fixes.
 2011-05-23 13:42:14 -07:00
Wink Saville
b181738305 am d3924fe9: Merge "Data Connection: Use Alarm for all delayed data retries." into honeycomb-LTE 
* commit 'd3924fe9f6c99bc92ed86195e07ba82d39043812':
  Data Connection: Use Alarm for all delayed data retries.
 2011-05-23 13:42:11 -07:00
Wink Saville
070eecef39 Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE 2011-05-23 13:39:03 -07:00
Wink Saville
d3924fe9f6 Merge "Data Connection: Use Alarm for all delayed data retries." into honeycomb-LTE 2011-05-23 13:38:36 -07:00
Adam Powell
f4232e0097 Change action button layout for split action bars 
Change-Id: Ie1427ae6b0334bf0a8afd5cae968c286c82a3837
 2011-05-23 13:35:25 -07:00
TK MUN
6f0394a3b4 DO NOT MERGE SystemUI: update signal level when broadcast is received 
- Signal level updates should be updated whenever a signal change
broadcast is received but it is failing to do so.
- Only when state change broadcast is received, signal level was
updated. (Ex: State: Idle -> State: Connected)

Change-Id: I71d86782143b3440a042164a87af64c7bee97ae2
Signed-off-by: TK MUN <tk.mun@samsung.com>
 2011-05-23 13:12:55 -07:00
Shimeng (Simon) Wang
f55a00b1b8 am de60ce66: am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer. 
* commit 'de60ce66c117ebd224b9d3181e2184ec5cfe87f9':
  Simplify browser pause/resume logic to avoid stuck timer.
 2011-05-23 12:55:37 -07:00
Shimeng (Simon) Wang
de60ce66c1 am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer. 
* commit '358d2cd96403383cfb91bb68598a4cb2fe2e170e':
  Simplify browser pause/resume logic to avoid stuck timer.
 2011-05-23 12:14:04 -07:00
Ramesh Sudini
a95bce0b29 Map multiple apnType to one DataConnection fixes. 
With current design the code maps to the same DC, but no indications go out.
With this, making it more async in nature that the request goes all the way
to DC and all the data indications would be triggered by parallel paths through DCT.

Change-Id: I4c6e64912dafe19154d910bbd0441b10ada36cff
 2011-05-23 12:01:40 -07:00
Ramesh Sudini
a88d76b772 Data Connection: Use Alarm for all delayed data retries. 
Change-Id: I5045c3a10808b75f1ca3174bd1c16f332d5f7fa8
 2011-05-23 12:01:31 -07:00
Jeffrey Tinker
8264641c98 Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038 
Fix for b/4198446 HC - Support for Widevine Adaptive VOD

Change-Id: Ia777c80825e3416bab6ae6273fba46a194135e60
 2011-05-23 11:09:16 -07:00
James Dong
d5762583bd am ebae1923: am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release(). 
* commit 'ebae1923869ee71ab119f766ac01c5a320619290':
  Add some logging to track down where ANR happens during MediaPlayer._release().
 2011-05-23 10:26:40 -07:00
Xavier Ducrohet
46e802e9c1 am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge. 
* commit '5b9ec6871afaf40325abe602cd1d29ddbd88cbb9':
  Merge e57aa434 from honeycomb-mr1. do not merge.
 2011-05-23 10:22:00 -07:00
Xavier Ducrohet
ea182704b6 am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread 
* commit '041fd74beade4e95cff6157af9dadbf9a99b7fcf':
  Merge 05b7b69c from honeycomb-mr1. do not merge.
 2011-05-23 10:21:57 -07:00
Xavier Ducrohet
162dd490cd am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread 
* commit '9d9a7466cd051748ba656acd39265099294c4153':
  Merge 2fae858d from Honeycomb-mr1. do not merge.
 2011-05-23 10:21:49 -07:00
Shimeng (Simon) Wang
358d2cd964 Simplify browser pause/resume logic to avoid stuck timer. 
The current browser pause/resume logic uses an integer count to track
the pause/resume behavior, which is mostly working fine in phone.  The interger
count is usually 0 when browser is paused, and its value is usually 1
when the browser is resumed and will trigger any delayed timer.

But in tablet, where tabs can be easily created/switched/deleted, this
logic will not work well and sometimes cause resources timers get stuck.
For example, in case multiple tabs are created, and you reload one of the
tabs, when it's almost finished, switch to another tab, and hit home or power
button, at this point of time, the browser will be suspended at
Controller.java::onPause, hence the integer count will be 0; but since
the other tab is also finished after the pause, the current logic at
Controller.java::onPageFinished will call pause timer again, which will make
the integer count to be -1.  Before the time the browser is resumed, it's very
possible some tabs will have some resources, such as images/flashs,
scheduled to be loaded, these will be in delayed timer in
ResourceLoadScheduler.cpp's m_requestTimer.
Now when the browser is resumed, the integer count will be 0, which will not
trigger delayed timer.  Then all the new timers will be stuck as well since
old timers are not executed yet.

The fix is to simplify the pause/resume logic by just using a boolean variable
instead of error-prone integer counting.

issue: 4177932
Change-Id: Id10af9298c7be1f82222d0b94c34c5dc68403630
 2011-05-23 10:00:39 -07:00
James Dong
ebae192386 am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release(). 
* commit 'a5293d1ca4459293f4993ea39c09ea703a022844':
  Add some logging to track down where ANR happens during MediaPlayer._release().
 2011-05-23 09:59:59 -07:00
Xavier Ducrohet
5b9ec6871a am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge. 
* commit '4c1e73b69a13a4f24a8fc123f599a9e9d8505525':
  Merge e57aa434 from honeycomb-mr1. do not merge.
 2011-05-23 09:52:55 -07:00
Xavier Ducrohet
041fd74bea am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread 
* commit 'f791863f0ac67ab6abd7410d5807d716cffc5b72':
  Merge 05b7b69c from honeycomb-mr1. do not merge.
 2011-05-23 09:52:52 -07:00
Xavier Ducrohet
9d9a7466cd am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread 
* commit 'bb43828aa749e71d4e52ba69db01b83c83a755b5':
  Merge 2fae858d from Honeycomb-mr1. do not merge.
 2011-05-23 09:52:41 -07:00
James Dong
a5293d1ca4 Add some logging to track down where ANR happens during MediaPlayer._release(). 
o add a log message in AwesomePlayer::reset before acquiring the lock

Change-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb
related-to-bug: 4409547
 2011-05-23 09:36:31 -07:00
Glenn Kasten
bdd8a16282 Merge "HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead" 2011-05-23 09:06:03 -07:00
Steve Block
08d584cd1c Log a StrictMode violation when WebView methods are called on the wrong thread 
Bug: 4373919
Change-Id: I1f526e033ce316e51b3de7fe4ac88119fbc65b4e
 2011-05-23 14:45:02 +01:00