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

48818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Onorato
cfb046dead am 2c09a9c0: am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2 
* commit '2c09a9c0e960163a16ad1d06055aa6ee9635c693':
  Make adb shell am display-size persistent.
 2011-05-25 11:46:28 -07:00
Joe Onorato
2c09a9c0e9 am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2 
* commit '5520610cb2612054c5d0bcec9d031f7b71faa349':
  Make adb shell am display-size persistent.
 2011-05-25 11:43:06 -07:00
Joe Onorato
5520610cb2 Merge "Make adb shell am display-size persistent." into honeycomb-mr2 2011-05-25 11:40:59 -07:00
Joe Onorato
571ae90801 Make adb shell am display-size persistent. 
Change-Id: If3d5d18729f4e89eb7e689994deadd996fd487e9
 2011-05-25 11:40:21 -07:00
Dianne Hackborn
103e74d9b1 am d6f29cd8: am 2a15eb55: Merge "Fix issue #4445007: DPM initializes some values to 1, instead of 0" into honeycomb-mr2 
* commit 'd6f29cd8f92b098330818227428f5a42836097b7':
  Fix issue #4445007: DPM initializes some values to 1, instead of 0
 2011-05-25 11:18:59 -07:00
Dianne Hackborn
d6f29cd8f9 am 2a15eb55: Merge "Fix issue #4445007: DPM initializes some values to 1, instead of 0" into honeycomb-mr2 
* commit '2a15eb559cfc18800b3e345995df76695a3ae4b2':
  Fix issue #4445007: DPM initializes some values to 1, instead of 0
 2011-05-25 11:14:13 -07:00
Dianne Hackborn
2a15eb559c Merge "Fix issue #4445007: DPM initializes some values to 1, instead of 0" into honeycomb-mr2 2011-05-25 11:10:15 -07:00
Amith Yamasani
361c286d09 am 5d9e0a1a: am 99a8e1d2: Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2 
* commit '5d9e0a1a867aa5b6162a972288cbef41fd68a29b':
  More preference item visual adjustments for smaller tablets. DO NOT MERGE
 2011-05-25 11:08:30 -07:00
Amith Yamasani
5d9e0a1a86 am 99a8e1d2: Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2 
* commit '99a8e1d2931f4deb35c54f144de26fc6124de5fc':
  More preference item visual adjustments for smaller tablets. DO NOT MERGE
 2011-05-25 11:02:01 -07:00
Amith Yamasani
99a8e1d293 Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2 2011-05-25 10:58:24 -07:00
Dianne Hackborn
d998acb349 Fix issue #4445007: DPM initializes some values to 1, instead of 0 
Also fix not writing the settings file when an admin is removed.

And take care of an old to-do about not removing an admin until
after it has received the broadcast about it being disabled.

Change-Id: I4ebe0ea0461222b65425b2c5438b646b572f18c8
 2011-05-25 10:51:27 -07:00
Russell Brenner
dd36e1bde1 am 8b98284b: am 64796477: Merge "DO NOT MERGE-Refire the redraw event if webkit wasn\'t ready" into honeycomb-mr2 
* commit '8b98284b97b81a4cc85d9fc26e79160e9c38ff1c':
  DO NOT MERGE-Refire the redraw event if webkit wasn't ready
 2011-05-25 09:14:50 -07:00
Russell Brenner
8b98284b97 am 64796477: Merge "DO NOT MERGE-Refire the redraw event if webkit wasn\'t ready" into honeycomb-mr2 
* commit '64796477f61f2fb5435e5043820c67dead4ec577':
  DO NOT MERGE-Refire the redraw event if webkit wasn't ready
 2011-05-25 09:05:55 -07:00
Russell Brenner
64796477f6 Merge "DO NOT MERGE-Refire the redraw event if webkit wasn't ready" into honeycomb-mr2 2011-05-25 09:00:26 -07:00
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
Russell Brenner
1d87cbf602 DO NOT MERGE-Refire the redraw event if webkit wasn't ready 
If webkit wasn't in a drawing mood, post a WEBKIT_DRAW event to
assure that the update is not lost.

bug: 4474358
Change-Id: Ib0c4cedb10f58821f95c439824c30043a906f8b8
 2011-05-24 17:17:40 -07:00
Amith Yamasani
6ea08998ee More preference item visual adjustments for smaller tablets. DO NOT MERGE 
Use medium text size for locale picker.
Hide icon region if there's no icon.

Bug: 4462313

Change-Id: I8062646f31bfec753bcd476f54c8ab5b66375b5e
 2011-05-24 15:50:36 -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