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

6464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android (Google) Code Review
948ee25127 Merge change 21660 into eclair 
* changes:
  Optimized Galaxy
 2009-08-17 20:00:32 -07:00
Romain Guy
4f7136c659 Optimized Galaxy 2009-08-17 19:59:27 -07:00
Android (Google) Code Review
e5a07e65c5 Merge change 21655 into eclair 
* changes:
  resolved conflicts for merge of 696b912e to eclair
 2009-08-17 19:21:49 -07:00
johnwang
01ae863611 resolved conflicts for merge of 696b912e to eclair 
modified:   telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
	modified:   telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

	modified:   telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
	modified:   telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
 2009-08-17 19:20:07 -07:00
Android (Google) Code Review
9fb956dbdc Merge change 21653 into eclair 
* changes:
  Remove global IO context and integrate it into the RS context.
 2009-08-17 18:40:38 -07:00
Jason Sams
bc948dedce Remove global IO context and integrate it into the RS context. 2009-08-17 18:35:48 -07:00
Android (Google) Code Review
437f79b6b7 Merge change 21637 into eclair 
* changes:
  Fix 2058938. As zoom control is uesd in overview mode to switch to reading mode, we also want to hide it after double tap is done.
 2009-08-17 18:18:44 -07:00
Android (Google) Code Review
30c1738b2c Merge change 21638 into eclair 
* changes:
  Don't use BoringLayout to display text that has paragraph-style markup.
 2009-08-17 17:24:47 -07:00
Eric Fischer
86fcef87b8 Don't use BoringLayout to display text that has paragraph-style markup. 
BoringLayout assumes it doesn't have to do any work to calculate the
line height.  In this case, though, there may actually be work to be
done, so have it fall back to StaticLayout to do the more thorough job.

Bug 2051050
 2009-08-17 17:16:44 -07:00
Grace Kloba
d7660ccb7b Fix 2058938. As zoom control is uesd in overview mode to switch to reading 
mode, we also want to hide it after double tap is done.
 2009-08-17 17:13:01 -07:00
Android (Google) Code Review
517825091a Merge change 21576 into eclair 
* changes:
  Support for marshalling pointers / intptr_t in Parcel.
 2009-08-17 16:39:43 -07:00
Jim Miller
20ea6ce0e8 Change get/set IsSyncable() methods to static. Add isUserFacing flag to SyncAdapterType. Update api file. 2009-08-17 16:06:15 -07:00
Android (Google) Code Review
d871167284 Merge change 21581 into eclair 
* changes:
  Fix CDMA to startup/shutdown based on apn en/disab
 2009-08-17 15:48:01 -07:00
Android (Google) Code Review
736c24a8af Merge change 21516 into eclair 
* changes:
  Update docs: readFromParcel() is not necessary to make a class support Parcelable.
 2009-08-17 15:38:14 -07:00
Andreas Huber
2f10ae08d4 Support for marshalling pointers / intptr_t in Parcel. 
Some refactoring to eliminate code duplication in Parcel implementation.
 2009-08-17 15:31:25 -07:00
Android (Google) Code Review
5fe1afe9cc Merge change 21603 into eclair 
* changes:
  Fix infinite recursion.
 2009-08-17 15:25:23 -07:00
Dianne Hackborn
46407d831e Fix infinite recursion. 2009-08-17 15:22:29 -07:00
Robert Greenwalt
25a5d3db3f Fix CDMA to startup/shutdown based on apn en/disab 
Fixes MMS during wifi.
Also fixes CDMA for ConnectivityManager change.
 2009-08-17 15:20:14 -07:00
Android (Google) Code Review
01f750d6fa Merge change 21587 into eclair 
* changes:
  BatteryService: Remove hard coded power supply names.
 2009-08-17 14:26:06 -07:00
Mike Lockwood
304928fb7e BatteryService: Remove hard coded power supply names. 
Search all subdirectories of /sys/class/power_supply and match on
the power supply type instead.

Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-08-17 17:20:40 -04:00
Fred Quintana
718671b441 fix build breakage 2009-08-17 14:08:37 -07:00
Jason Sams
60fae2af3c am b93cdae7: Merge change 21570 into eclair 
Merge commit 'b93cdae749c48a629331c9b039d3a0488752b82f'

* commit 'b93cdae749c48a629331c9b039d3a0488752b82f':
  Update fountain and add writable flag to script slots.
 2009-08-17 14:02:06 -07:00
Android (Google) Code Review
b93cdae749 Merge change 21570 into eclair 
* changes:
  Update fountain and add writable flag to script slots.
 2009-08-17 13:58:20 -07:00
Jason Sams
334ea0c98f Update fountain and add writable flag to script slots. 2009-08-17 13:56:09 -07:00
Fred Quintana
b5f93cd3c0 am 5e787c42: - add a "isSyncable" flag to a given account/authority pair that indicates whether or not syncs should be attempted for it. - add public methods to get and set this parameter 
Merge commit '5e787c42f2a6b3afc8ec8320a08d51b2d44b8614'

* commit '5e787c42f2a6b3afc8ec8320a08d51b2d44b8614':
  - add a "isSyncable" flag to a given account/authority pair that
 2009-08-17 13:07:26 -07:00
Romain Guy
596191889f am 76c830b2: Merge change 21540 into eclair 
Merge commit '76c830b229fc21d5ea0ea28955084cc187e25fc6'

* commit '76c830b229fc21d5ea0ea28955084cc187e25fc6':
  Fix listview clicks with the trackball.
 2009-08-17 13:05:05 -07:00
Fred Quintana
5e787c42f2 - add a "isSyncable" flag to a given account/authority pair that 
indicates whether or not syncs should be attempted for it.
- add public methods to get and set this parameter
 2009-08-17 13:02:42 -07:00
Android (Google) Code Review
76c830b229 Merge change 21540 into eclair 
* changes:
  Fix listview clicks with the trackball.
 2009-08-17 13:00:26 -07:00
Romain Guy
df01607380 Fix listview clicks with the trackball. 2009-08-17 12:51:30 -07:00
Mathias Agopian
8f5af58265 am 0ef135d5: Merge change 21537 into eclair 
Merge commit '0ef135d5c79ff5b443b43f8743250044700a8bb5'

* commit '0ef135d5c79ff5b443b43f8743250044700a8bb5':
  really be more friendly with C
 2009-08-17 12:40:41 -07:00
Android (Google) Code Review
0ef135d5c7 Merge change 21537 into eclair 
* changes:
  really be more friendly with C
 2009-08-17 12:37:25 -07:00
Mathias Agopian
2b8954809e really be more friendly with C 2009-08-17 12:33:20 -07:00
Dan Murphy
13e934daac am 921831b4: Merge change 21522 into eclair 
Merge commit '921831b4dcad1898c265889430a32367e99ef6c1'

* commit '921831b4dcad1898c265889430a32367e99ef6c1':
  Dock changes:Docking station intents
 2009-08-17 12:31:44 -07:00
Android (Google) Code Review
921831b4dc Merge change 21522 into eclair 
* changes:
  Dock changes:Docking station intents
 2009-08-17 12:27:06 -07:00
Dan Murphy
c9f4eaf438 Dock changes:Docking station intents 
Docking station intents for dock switch driver.
Add DockObserver and updated Intent.java and systemserver.jave

Signed-off-by: Dan Murphy <D.Murphy@motorola.com>

	modified:   core/java/android/content/Intent.java
	new file:   services/java/com/android/server/DockObserver.java
	modified:   services/java/com/android/server/SystemServer.java

Docking station updates

Add constants for the dock

Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-08-17 15:23:24 -04:00
Dianne Hackborn
160e4facf6 am 1a797546: Merge change 21380 into eclair 
Merge commit '1a797546d75d2c85d6fefeefdc55de051aa66018'

* commit '1a797546d75d2c85d6fefeefdc55de051aa66018':
  More work on wallpapers.
 2009-08-17 11:52:06 -07:00
Android (Google) Code Review
1a797546d7 Merge change 21380 into eclair 
* changes:
  More work on wallpapers.
 2009-08-17 11:46:57 -07:00
Romain Guy
75229368c2 am 54ba86f0: Merge change 21512 into eclair 
Merge commit '54ba86f0e236a55fb4dc3aabbd81078f586321a5'

* commit '54ba86f0e236a55fb4dc3aabbd81078f586321a5':
  Honor the clickable and enabled properties in ListView.
 2009-08-17 11:09:21 -07:00
Android (Google) Code Review
54ba86f0e2 Merge change 21512 into eclair 
* changes:
  Honor the clickable and enabled properties in ListView.
 2009-08-17 11:07:08 -07:00
Mike Lockwood
cd47012ff3 am 9dc2355b: Merge change 21492 into eclair 
Merge commit '9dc2355b9bdfdaadb72936b5ad865193a2af58c8'

* commit '9dc2355b9bdfdaadb72936b5ad865193a2af58c8':
  WifiService: Hash based on both SSID and BSSID in scan result cache.
 2009-08-17 10:59:49 -07:00
Mike Lockwood
2b79ed839c am 56e7ba29: Merge change 21510 into eclair 
Merge commit '56e7ba2928bce62283a62ad1c9d9f1ec7b54c24c'

* commit '56e7ba2928bce62283a62ad1c9d9f1ec7b54c24c':
  LocationManagerService: Add NullPointerException to avoid change in behavior.
 2009-08-17 10:59:46 -07:00
Andreas Huber
d6ba4c24aa am ffbd2426: Merge change 21340 into eclair 
Merge commit 'ffbd2426f07474a95fefa3b2f4fe7eb4d4329af5'

* commit 'ffbd2426f07474a95fefa3b2f4fe7eb4d4329af5':
  Squashed commit of the following:
 2009-08-17 10:59:41 -07:00
Jeff Sharkey
32b72f7a53 am fd0d6275: Fix ExpandableListView context menus when has header views. 
Merge commit 'fd0d627569cb250f7060a83161cc845b9616e5a1'

* commit 'fd0d627569cb250f7060a83161cc845b9616e5a1':
  Fix ExpandableListView context menus when has header views.
 2009-08-17 10:59:35 -07:00
Amith Yamasani
4a1035508f am 7d68dae9: Merge change 21494 into eclair 
Merge commit '7d68dae99ff2bb3c3aa066efc5b4b1d5c0cd332e'

* commit '7d68dae99ff2bb3c3aa066efc5b4b1d5c0cd332e':
  Allow animation styles to be applied to popup windows.
 2009-08-17 10:59:30 -07:00
Grace Kloba
78eab1b141 am 86192c61: Merge change 21442 into eclair 
Merge commit '86192c614c317b428e10c2dc9052a07304aa6c3f'

* commit '86192c614c317b428e10c2dc9052a07304aa6c3f':
  Fix a cookie bug. If "secure" is in the end of the string, it was ignored.
 2009-08-17 10:59:21 -07:00
Mike Lockwood
5dd98cc0c3 am 6ba7ae1e: LocationManagerService: Fix null pointer check in sendExtraCommand(). 
Merge commit '6ba7ae1e4c3c04f6a71380b913ad79f83b00a628'

* commit '6ba7ae1e4c3c04f6a71380b913ad79f83b00a628':
  LocationManagerService: Fix null pointer check in sendExtraCommand().
 2009-08-17 10:59:12 -07:00
Chih-Chung Chang
f4f266cb60 am 0ff7a463: Merge change 21473 into eclair 
Merge commit '0ff7a463ad7fe6ca7b0ab3afcf566bfdc69a00f0'

* commit '0ff7a463ad7fe6ca7b0ab3afcf566bfdc69a00f0':
  Fix 1860351: Put datetime in jpeg exif to datetaken field.
 2009-08-17 10:59:05 -07:00
Mike Lockwood
eb6ed4b4fd am 06952d92: (-s ours) DO NOT MERGE - cherry-picked from master: 
Merge commit '06952d9299c23ee15df0825e75934971cfecf2ba'

* commit '06952d9299c23ee15df0825e75934971cfecf2ba':
  DO NOT MERGE - cherry-picked from master:
 2009-08-17 10:59:02 -07:00
Romain Guy
621d0beb96 am 8af2d225: Merge change 21471 into eclair 
Merge commit '8af2d22552c61d8d4e09e52287f056428172ab05'

* commit '8af2d22552c61d8d4e09e52287f056428172ab05':
  Add Galaxy wallpaper
 2009-08-17 10:58:55 -07:00
Android (Google) Code Review
9dc2355b9b Merge change 21492 into eclair 
* changes:
  WifiService: Hash based on both SSID and BSSID in scan result cache.
 2009-08-17 10:47:06 -07:00