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

44026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
12bf1133bd am ff34565f: am 1bf518d8: Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb 
* commit 'ff34565fcb366d4bd0066bd7fe6f588e42a9a9cc':
  Add TelephonyManager.getCurrentPhoneType
 2011-02-01 21:06:38 -08:00
Wink Saville
ff34565fcb am 1bf518d8: Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb 
* commit '1bf518d8b333768e26bacf340f88f7d4ba8b9a91':
  Add TelephonyManager.getCurrentPhoneType
 2011-02-01 21:03:58 -08:00
Wink Saville
1bf518d8b3 Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb 2011-02-01 21:02:10 -08:00
Michael Jurka
c3e59272a4 am 3b723ace: am 46ab5e13: Merge "add missing call to superclass method" into honeycomb 
* commit '3b723ace405305e61ab25f96cb8ee1a321edcf9b':
  add missing call to superclass method
 2011-02-01 20:57:13 -08:00
Michael Jurka
3b723ace40 am 46ab5e13: Merge "add missing call to superclass method" into honeycomb 
* commit '46ab5e13f27324d634ff27b7fd75c5d432b915bf':
  add missing call to superclass method
 2011-02-01 20:55:15 -08:00
Michael Jurka
46ab5e13f2 Merge "add missing call to superclass method" into honeycomb 2011-02-01 20:53:13 -08:00
Michael Jurka
b8f939fb57 add missing call to superclass method 2011-02-01 20:50:30 -08:00
Dharmaray Kundargi
13c0552643 am e9c5ade3: am c08f85a6: Fix issue 3414805 Crash during Overlay editing. JNI fixes. 
* commit 'e9c5ade37168e43203c060635c66dbd4de2ae458':
  Fix issue 3414805 Crash during Overlay editing. JNI fixes.
 2011-02-01 20:44:33 -08:00
Dharmaray Kundargi
e9c5ade371 am c08f85a6: Fix issue 3414805 Crash during Overlay editing. JNI fixes. 
* commit 'c08f85a6484ee5da7062a5eac0f19912bd7e2513':
  Fix issue 3414805 Crash during Overlay editing. JNI fixes.
 2011-02-01 20:42:32 -08:00
Dharmaray Kundargi
c08f85a648 Fix issue 3414805 Crash during Overlay editing. JNI fixes. 
Change-Id: I5e966c6987920318d3ce03f78552d0028ef55a26
 2011-02-01 20:19:16 -08:00
Wink Saville
9d72be3318 Add TelephonyManager.getCurrentPhoneType 
The new method getCurrentPhoneType has the old behavior of getPhoneType
and does not check for voice capable. This allows code to assume
the old behavior.

bug: 3198435
Change-Id: I0542838ceca2f757cceb6cd7f795e95fe886523e
 2011-02-01 19:22:15 -08:00
Ben Murdoch
c5f520aa09 am 6a48ba74: am 3b8657de: Merge "Move setExpandedTileBounds from WC to UI thread" into honeycomb 
* commit '6a48ba740e8d93c945ce7d829a25de2b004d0452':
  Move setExpandedTileBounds from WC to UI thread
 2011-02-01 18:42:12 -08:00
Ben Murdoch
6a48ba740e am 3b8657de: Merge "Move setExpandedTileBounds from WC to UI thread" into honeycomb 
* commit '3b8657debcbcf1bb4e66ac797d7ea15d737ecb42':
  Move setExpandedTileBounds from WC to UI thread
 2011-02-01 18:39:51 -08:00
Ben Murdoch
3b8657debc Merge "Move setExpandedTileBounds from WC to UI thread" into honeycomb 2011-02-01 18:37:43 -08:00
Ben Murdoch
fa148f6889 Move setExpandedTileBounds from WC to UI thread 
Bug: 3412928
Change-Id: I2d5c8cc1ba188152dd570ef3a0f2f2f14d64465f
 2011-02-02 02:27:40 +00:00
Brian Muramatsu
e776768b26 am 0872e36c: am 1d696fa4: Merge "Fix Incorrect Times in TimePickerDialog" into honeycomb 
* commit '0872e36ccb0926fe1fb04a0bc6593f9c167dacbc':
  Fix Incorrect Times in TimePickerDialog
 2011-02-01 18:13:24 -08:00
Brian Muramatsu
0872e36ccb am 1d696fa4: Merge "Fix Incorrect Times in TimePickerDialog" into honeycomb 
* commit '1d696fa45881ff234c9b76eef8ee5aab444ba918':
  Fix Incorrect Times in TimePickerDialog
 2011-02-01 18:10:59 -08:00
Brian Muramatsu
1d696fa458 Merge "Fix Incorrect Times in TimePickerDialog" into honeycomb 2011-02-01 18:09:36 -08:00
Brian Muramatsu
87879e8ef9 Fix Incorrect Times in TimePickerDialog 
Bug 3414311

TimePicker#setCurrentHour subtracts 12 from the given hour if
is24HourView returns false. TimePickerDialog calls setCurrentHour before
setIs24HourView, so the 12 will always be substracted from the time.
Reorder the statements so that TimePickerDialog sets is24HourView,
before setting the hour and time.

Change-Id: Ib997397b04dbdd767e67806aea7614426019e938
 2011-02-01 17:56:29 -08:00
Nick Pelly
826da2299a Reconcile api/11.xml with honeycomb-plus-aosp to fix build. 
Change-Id: I107094cf0d2972a45e6ef9d7555096cbcd4ebe01
 2011-02-01 17:32:46 -08:00
Jaikumar Ganesh
17689de1cf am 25bbfda2: am 485d577a: Merge "Fix BluetoothAdapter Connection change intent doc." into honeycomb 
* commit '25bbfda2442e6d8f55bdc8e2dd0eca18b0ba594b':
  Fix BluetoothAdapter Connection change intent doc.
 2011-02-01 17:12:23 -08:00
Jaikumar Ganesh
25bbfda244 am 485d577a: Merge "Fix BluetoothAdapter Connection change intent doc." into honeycomb 
* commit '485d577af1b410769e1a364d8e2bf7837fb313b0':
  Fix BluetoothAdapter Connection change intent doc.
 2011-02-01 17:08:46 -08:00
Jaikumar Ganesh
485d577af1 Merge "Fix BluetoothAdapter Connection change intent doc." into honeycomb 2011-02-01 17:06:56 -08:00
Dianne Hackborn
8f43c1a5b9 am d48ba867: am e77f9914: Merge "Whoops, need to put this check back." into honeycomb 
* commit 'd48ba867d69159542cf967d5fcaba41c5474f134':
  Whoops, need to put this check back.
 2011-02-01 16:54:50 -08:00
Jaikumar Ganesh
0b5b35f8a1 Fix BluetoothAdapter Connection change intent doc. 
Bug: 3414206
Change-Id: Icf87e28e11b0b5072fe546225bbfb1dc68487ef0
 2011-02-01 16:53:14 -08:00
Dianne Hackborn
d48ba867d6 am e77f9914: Merge "Whoops, need to put this check back." into honeycomb 
* commit 'e77f99144f015d9044909a4c128fa916465b0671':
  Whoops, need to put this check back.
 2011-02-01 16:53:09 -08:00
Dianne Hackborn
e77f99144f Merge "Whoops, need to put this check back." into honeycomb 2011-02-01 16:50:44 -08:00
Dianne Hackborn
a48a37f025 Whoops, need to put this check back. 
We still don't want third party wallpapers to be able to do this,
since it can't work with all window animations.

Change-Id: I97c8ef78c36bd89bf47a7c4533ed1c244dcff4a6
 2011-02-01 16:30:38 -08:00
Dianne Hackborn
06a4b53d8d am 2a70a1e3: am bd77ed7f: Merge "Make image wallpaper use a big surface." into honeycomb 
* commit '2a70a1e349cb982ae68196195d4745474d8f2568':
  Make image wallpaper use a big surface.
 2011-02-01 16:28:39 -08:00
Dianne Hackborn
2a70a1e349 am bd77ed7f: Merge "Make image wallpaper use a big surface." into honeycomb 
* commit 'bd77ed7fff87b79008e3b071115674dff2721994':
  Make image wallpaper use a big surface.
 2011-02-01 16:26:12 -08:00
Dianne Hackborn
bd77ed7fff Merge "Make image wallpaper use a big surface." into honeycomb 2011-02-01 16:23:47 -08:00
Dianne Hackborn
f185552f63 Make image wallpaper use a big surface. 
Change-Id: I119f2bfee5fde08040520bd0da8574194a893ab5
 2011-02-01 16:20:20 -08:00
Jaikumar Ganesh
0cd527800e Merge "Remove discoverable timeout handler." 2011-02-01 15:39:40 -08:00
Wink Saville
1a24a9c1d4 am 566cd74f: am 4b77bbd2: Merge "Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices." into honeycomb 
* commit '566cd74f5686b480d2e3d49c4505c45df7712587':
  Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices.
 2011-02-01 15:30:29 -08:00
Wink Saville
566cd74f56 am 4b77bbd2: Merge "Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices." into honeycomb 
* commit '4b77bbd2ffc9d3a5c9dc5a03d98c7f94436173f7':
  Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices.
 2011-02-01 15:28:10 -08:00
Wink Saville
4b77bbd2ff Merge "Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices." into honeycomb 2011-02-01 15:24:31 -08:00
Jean-Baptiste Queru
61b6822d71 Merge "Really get the new GB APIs." 2011-02-01 15:22:06 -08:00
Jean-Baptiste Queru
72f43886fb Really get the new GB APIs. 
Change-Id: Ib2bc4d964ad925977ed58e466cc50ed3e89f5924
 2011-02-01 15:21:21 -08:00
Paul Westbrook
7759e9217f am 59927ce5: am 8b805ddc: Merge "Enable retrieving default download manager settings" into honeycomb 
* commit '59927ce5ce34b6b26e6410102b3580cc6b4e1335':
  Enable retrieving default download manager settings
 2011-02-01 15:12:46 -08:00
Paul Westbrook
59927ce5ce am 8b805ddc: Merge "Enable retrieving default download manager settings" into honeycomb 
* commit '8b805ddc2eacaf7c5618619feee2154c4b18e9bf':
  Enable retrieving default download manager settings
 2011-02-01 15:09:53 -08:00
Paul Westbrook
8b805ddc2e Merge "Enable retrieving default download manager settings" into honeycomb 2011-02-01 15:07:40 -08:00
Jean-Baptiste Queru
22d197eb31 am 068f3ef9: am 066e1e3c: am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load" 
* commit '068f3ef956ee3cadfe6089d9614ab093c03525c6':
  Don't crash zygote if webcore fails to load
 2011-02-01 14:50:51 -08:00
Jean-Baptiste Queru
068f3ef956 am 066e1e3c: am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load" 
* commit '066e1e3cc6a0a3f2fbf672b82f8e3317574b86da':
  Don't crash zygote if webcore fails to load
 2011-02-01 14:48:21 -08:00
Romain Guy
509e6cd895 am 1c531f4a: am f222956c: Merge "Correctly set the alpha of a hardware layer before drawing it. Bug #3410819" into honeycomb 
* commit '1c531f4a44c9ea61e74dbe2ded1b8dca0f83f790':
  Correctly set the alpha of a hardware layer before drawing it. Bug #3410819
 2011-02-01 14:37:07 -08:00
Mike Cleron
1aa03cf72a am 00ab863a: am fb3221bf: Merge "Assume ARGB_8888 for unknown configs. Bug #3327175" into honeycomb 
* commit '00ab863a19610725469a27aaab0779de8d62c2e1':
  Assume ARGB_8888 for unknown configs. Bug #3327175
 2011-02-01 14:37:01 -08:00
Paul Westbrook
d99d0dc43a Enable retrieving default download manager settings 
Enable retrieving the default download manager settings from
a resource, when the SettingsProvider database is created

The default setting for these values is -1, which will cause
DownloadManger to not enforce a limit.

Bug: 3341145
Change-Id: I25294d0f75fb0bdf20d4bef54457056c25c31add
 2011-02-01 14:36:24 -08:00
Romain Guy
1c531f4a44 am f222956c: Merge "Correctly set the alpha of a hardware layer before drawing it. Bug #3410819" into honeycomb 
* commit 'f222956c955c97cf436c6f18b50bd0e57c89f381':
  Correctly set the alpha of a hardware layer before drawing it. Bug #3410819
 2011-02-01 14:33:01 -08:00
Mike Cleron
00ab863a19 am fb3221bf: Merge "Assume ARGB_8888 for unknown configs. Bug #3327175" into honeycomb 
* commit 'fb3221bf6d9d59b792dfe4b0aa6a6567a5a92ba7':
  Assume ARGB_8888 for unknown configs. Bug #3327175
 2011-02-01 14:32:19 -08:00
Jean-Baptiste Queru
e9a1afcbda am bf3e43eb: Merge da20efd9 
* commit 'bf3e43eb00b72e350a1e6a96233f745ae2ee8ba8':
  Final final final Gingerbread MR API changes.
 2011-02-01 14:16:42 -08:00
Jaikumar Ganesh
fbb238db71 Remove discoverable timeout handler. 
This is leftover code from bluez3 days. We get a property change
in Bluez4 and an intent is sent.

Change-Id: Iba8821ef73edf08add590ef9d11074b59fec2d50
 2011-02-01 14:15:12 -08:00