Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,480 Commits 3 Branches 0 Tags
0bd6723652b45c38afcef77d37dfd526a6578a85
Commit Graph

6480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
0bd6723652 am 8df8b2b4: Allow wallpapers to get touch events. 
Merge commit '8df8b2b405c60cacf7a66c4e2ca078dd3d7ec7bd'

* commit '8df8b2b405c60cacf7a66c4e2ca078dd3d7ec7bd':
  Allow wallpapers to get touch events.
 2009-08-17 22:37:47 -07:00
Romain Guy
aa7c305624 am 948ee251: Merge change 21660 into eclair 
Merge commit '948ee251276e1ce7f5c5517b24bf88a75e99f160'

* commit '948ee251276e1ce7f5c5517b24bf88a75e99f160':
  Optimized Galaxy
 2009-08-17 22:37:44 -07:00
Dianne Hackborn
8df8b2b405 Allow wallpapers to get touch events. 2009-08-17 21:23:05 -07:00
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
johnwang
d80afe63d2 am e5a07e65: Merge change 21655 into eclair 
Merge commit 'e5a07e65c5f0bf8a4374934f6a3d85713cb6161b'

* commit 'e5a07e65c5f0bf8a4374934f6a3d85713cb6161b':
  Use dataRoaming in dataConnectionTracker.
 2009-08-17 19:26:43 -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
Jason Sams
7b26ce8c15 am 9fb956db: Merge change 21653 into eclair 
Merge commit '9fb956dbdce14e38e38cb45a14610a8c822cbbf0'

* commit '9fb956dbdce14e38e38cb45a14610a8c822cbbf0':
  Remove global IO context and integrate it into the RS context.
 2009-08-17 18:45:15 -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
Grace Kloba
fd43fae06f am 437f79b6: Merge change 21637 into eclair 
Merge commit '437f79b6b76418c70b53d7db8af80c7a3dee333b'

* commit '437f79b6b76418c70b53d7db8af80c7a3dee333b':
  Fix 2058938. As zoom control is uesd in overview mode to switch to reading
 2009-08-17 18:21: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
Eric Fischer
7ae01943aa am 30c1738b: Merge change 21638 into eclair 
Merge commit '30c1738b2cd9e59263a4eecc4e666f7a3cb35b03'

* commit '30c1738b2cd9e59263a4eecc4e666f7a3cb35b03':
  Don't use BoringLayout to display text that has paragraph-style markup.
 2009-08-17 17:28:22 -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
0e4e11b7ca Merge change 21615 
* changes:
  Add new calendar database columns.
 2009-08-17 16:47:04 -07:00
Ken Shirriff
1fa642826d Add new calendar database columns. 
The columns are guestsCanModify, guestsCanInviteOthers,
guestsCanSeeGuests, organizer, and canInviteOthers.
 2009-08-17 16:43:53 -07:00
Andreas Huber
b4d28aef3c am 51782509: Merge change 21576 into eclair 
Merge commit '517825091a2fdbdb20dc569184f2736c78ecc1bd'

* commit '517825091a2fdbdb20dc569184f2736c78ecc1bd':
  Support for marshalling pointers / intptr_t in Parcel.
 2009-08-17 16:42:48 -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
a4d18dff39 am 20ea6ce0: Change get/set IsSyncable() methods to static. Add isUserFacing flag to SyncAdapterType. Update api file. 
Merge commit '20ea6ce0e8a758cc5c33eb2577495bf9f4dce16e'

* commit '20ea6ce0e8a758cc5c33eb2577495bf9f4dce16e':
  Change get/set IsSyncable() methods to static.  Add isUserFacing flag to SyncAdapterType. Update api file.
 2009-08-17 16:13:13 -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
Robert Greenwalt
d189896b2f am d8711672: Merge change 21581 into eclair 
Merge commit 'd87116728447eef3b73dd3b87074a5d12b532261'

* commit 'd87116728447eef3b73dd3b87074a5d12b532261':
  Fix CDMA to startup/shutdown based on apn en/disab
 2009-08-17 15:52:08 -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
Nick Pelly
f60492ca24 am 736c24a8: Merge change 21516 into eclair 
Merge commit '736c24a8af268d014163f4687750baf18664e690'

* commit '736c24a8af268d014163f4687750baf18664e690':
  Update docs: readFromParcel() is not necessary to make a class support
 2009-08-17 15:42:19 -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
Dianne Hackborn
a46917fef5 am 5fe1afe9: Merge change 21603 into eclair 
Merge commit '5fe1afe9cc24969d25496d57d911e8aae8b3ba7a'

* commit '5fe1afe9cc24969d25496d57d911e8aae8b3ba7a':
  Fix infinite recursion.
 2009-08-17 15:28:56 -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
Mike Lockwood
8e3384ae9f am 01f750d6: Merge change 21587 into eclair 
Merge commit '01f750d6fa03f16ef93802618a6ccf8b353ae8e2'

* commit '01f750d6fa03f16ef93802618a6ccf8b353ae8e2':
  BatteryService: Remove hard coded power supply names.
 2009-08-17 14:29:44 -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
fd6cfb72f7 am 718671b4: fix build breakage 
Merge commit '718671b441c6318276e6d954a41a95db0d7e6c49'

* commit '718671b441c6318276e6d954a41a95db0d7e6c49':
  fix build breakage
 2009-08-17 14:15:19 -07: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