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

48802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
77dd616e68 am 00b3a5c6: am c404e9b2: Merge "More compatibility mode improvements." into honeycomb-mr2 
* commit '00b3a5c65e6ef26056178d1d7473b921671752e9':
  More compatibility mode improvements.
 2011-05-24 19:13:45 -07:00
Dianne Hackborn
00b3a5c65e am c404e9b2: Merge "More compatibility mode improvements." into honeycomb-mr2 
* commit 'c404e9b20165f634904d1489216d17d8e09fe696':
  More compatibility mode improvements.
 2011-05-24 19:10:53 -07:00
Dianne Hackborn
c404e9b201 Merge "More compatibility mode improvements." into honeycomb-mr2 2011-05-24 19:07:55 -07:00
Dianne Hackborn
5be8de3420 More compatibility mode improvements. 
We now correctly adjust display metrics, fixing for example issues
seen in Barcode Scanner.  In addition the decision about when to use
compatibility mode has a bug fixed where certain apps would not go
out of compatibility mode even though they should be able to.

Change-Id: I5971206323df0f11ce653d1c790c700f457f0582
 2011-05-24 18:13:25 -07:00
Kristian Monsen
bc533dd320 am 18a259fe: am 36ac304c: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2 
* commit '18a259fe37861a78632a0667d746ea7d06356ced':
  Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
 2011-05-24 11:22:39 -07:00
Kristian Monsen
18a259fe37 am 36ac304c: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2 
* commit '36ac304c6e62dbb1caaf729c70d7aa956aff63be':
  Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
 2011-05-24 11:19:00 -07:00
Kristian Monsen
36ac304c6e Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE" into honeycomb-mr2 2011-05-24 11:16:39 -07:00
John Reck
00bcea1ac3 am dc8a53a7: am 2959916b: Merge "Update the Desktop UA to Chrome" into honeycomb-mr2 
* commit 'dc8a53a7db91ac23d2b213dc5cf758d64bd880be':
  Update the Desktop UA to Chrome
 2011-05-24 11:10:00 -07:00
John Reck
dc8a53a7db am 2959916b: Merge "Update the Desktop UA to Chrome" into honeycomb-mr2 
* commit '2959916b13165f56431f3993bd6b16364032af14':
  Update the Desktop UA to Chrome
 2011-05-24 11:06:38 -07:00
John Reck
2959916b13 Merge "Update the Desktop UA to Chrome" into honeycomb-mr2 2011-05-24 11:03:11 -07:00
Kristian Monsen
f147b5f2a6 Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE 
This is the WebView part, passing the bypass list to
the native side.

Moved some code to JWebCoreJavaBridge.java because
because sendStaticMessage only takes one argument.

Needs CL in external/webkit:
https://android-git.corp.google.com/g/#change,111108

Needs following CL in external/chromium:
https://android-git.corp.google.com/g/#change,111107

Change-Id: Ib548bdcbc9eb22bbb8f2754808840052bd3ec80e
 2011-05-24 18:58:51 +01:00
Wink Saville
5faaaa5f5a am 543c3146: Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE 
* commit '543c3146cb011380e4328e049abf97bc797db95a':
  Handle ProvideLocalInfo stk command.
 2011-05-24 10:10:13 -07:00
Wink Saville
543c3146cb Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE 2011-05-24 10:06:58 -07:00
Kazuhiro Ondo
38b6999d9e Handle ProvideLocalInfo stk command. 
Change-Id: I4cb685f7d8e7442185e927fa0d49531b96eeab08
 2011-05-24 10:04:09 -07:00
Irfan Sheriff
c2ff0e7031 am 9a737639: Merge "Clear network id when invalid" into honeycomb-LTE 
* commit '9a7376396ccd272d4be429373e06ae64fe096380':
  Clear network id when invalid
 2011-05-23 22:33:33 -07:00
Irfan Sheriff
9a7376396c Merge "Clear network id when invalid" into honeycomb-LTE 2011-05-23 22:30:33 -07:00
Jeffrey Tinker
c41a17de2b am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 
* commit '6e5cdca12bdbc26dd4d4eb1b1d986783b13601aa':
  Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
 2011-05-23 18:47:17 -07:00
Mike Lockwood
859443f2a4 am c0d9834a: am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 
* commit 'c0d9834a1c6dd8d9cd0b7fe9b50495578c104405':
  GPS: Change NTP polling interval from 4 to 24 hours
 2011-05-23 18:45:17 -07:00
Jeffrey Tinker
6e5cdca12b am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 
* commit 'ef89cc14957ab631346564801841190346632ac9':
  Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
 2011-05-23 18:15:47 -07:00
Jeffrey Tinker
ef89cc1495 Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 2011-05-23 18:10:10 -07:00
Mike Lockwood
c0d9834a1c am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 
* commit '5d78e0b8ea548da3fa88ae2190a9334297b992b6':
  GPS: Change NTP polling interval from 4 to 24 hours
 2011-05-23 18:04:44 -07:00
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
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
Irfan Sheriff
0a8bd60a8e Clear network id when invalid 
Bug: 4391449
Change-Id: If0902a3fe4ad65d34dfc3d60f0e630d5e868d6a9
 2011-05-23 17:02:11 -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
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
5443ba43bb Update the Desktop UA to Chrome 
Bug: 4347787

Change-Id: I5117c7dbd4e73c39ed417113f12b517de5411e81
 2011-05-23 16:50:29 -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
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
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