Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,129 Commits 3 Branches 0 Tags
82b8b686521323948cd76946e9bd6d6be019797d
Commit Graph

8336 Commits

Author SHA1 Message Date
Daisuke Miyakawa
82b8b68652 Let vCard importer/exporter select charset. 
There are some other bug where charset for import/export is used during vCard handling.

Bug: 2572064
Change-Id: I0aef8a6eba0a7e9263e47368a43dbba05efa91b0
 2010-04-06 13:41:27 +09:00
Dan Morrill
7d6eef83d3 am a03dfc07: am ca5e7de8: am 21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo 2010-04-05 15:11:02 -07:00
Kenny Root
e19a2184b2 am 6613ffb3: am 16197a24: am 0db37997: Merge "Revert to previous text selection behavior" into froyo 2010-04-05 15:10:58 -07:00
Jaikumar Ganesh
6cf720c492 am dc56ced8: am f84207f6: am c6af69b2: Merge "Add an extra for the Disconnect Headset State." into froyo 2010-04-05 15:04:06 -07:00
Dan Morrill
a03dfc0792 am ca5e7de8: am 21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo 
Merge commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e' into kraken

* commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e':
  Adding a feature definition for touchscreens that was overlooked in the last
 2010-04-05 15:03:48 -07:00
Kenny Root
6613ffb331 am 16197a24: am 0db37997: Merge "Revert to previous text selection behavior" into froyo 
Merge commit '16197a246fdeff0167f9abdc6a3da5d83759993d' into kraken

* commit '16197a246fdeff0167f9abdc6a3da5d83759993d':
  Revert to previous text selection behavior
 2010-04-05 15:03:45 -07:00
Dan Morrill
ca5e7de82b am 21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo 
Merge commit '21390f08138801f9e008917c0c0149839a80d002' into froyo-plus-aosp

* commit '21390f08138801f9e008917c0c0149839a80d002':
  Adding a feature definition for touchscreens that was overlooked in the last
 2010-04-05 14:59:47 -07:00
Kenny Root
16197a246f am 0db37997: Merge "Revert to previous text selection behavior" into froyo 
Merge commit '0db37997366a4d781af48be758a9d90b6d07d7d5' into froyo-plus-aosp

* commit '0db37997366a4d781af48be758a9d90b6d07d7d5':
  Revert to previous text selection behavior
 2010-04-05 14:59:44 -07:00
Dan Morrill
21390f0813 Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo 2010-04-05 14:56:03 -07:00
Kenny Root
0db3799736 Merge "Revert to previous text selection behavior" into froyo 2010-04-05 14:55:10 -07:00
Jaikumar Ganesh
dc56ced8f0 am f84207f6: am c6af69b2: Merge "Add an extra for the Disconnect Headset State." into froyo 
Merge commit 'f84207f6ca90307b10d94e484baf55330d644c1d' into kraken

* commit 'f84207f6ca90307b10d94e484baf55330d644c1d':
  Add an extra for the Disconnect Headset State.
 2010-04-05 14:53:41 -07:00
Jaikumar Ganesh
f84207f6ca am c6af69b2: Merge "Add an extra for the Disconnect Headset State." into froyo 
Merge commit 'c6af69b2684e1a95368f52e1f1614595f85c9c12' into froyo-plus-aosp

* commit 'c6af69b2684e1a95368f52e1f1614595f85c9c12':
  Add an extra for the Disconnect Headset State.
 2010-04-05 14:50:46 -07:00
Kenny Root
8cdb684163 Revert to previous text selection behavior 
There was a new behavior that starting "Select text" would allow you to
swipe from beginning to end and immediately copy that. This change
reverts to the previous behavior that "Select text" will start where
your cursor is currently and any tap will extend the selection from that
origin to the point of the tap.

Change-Id: Ib955cc8d62a652f518435953da2f54e810d9dfb0
 2010-04-05 14:48:44 -07:00
Jaikumar Ganesh
c6af69b268 Merge "Add an extra for the Disconnect Headset State." into froyo 2010-04-05 14:45:27 -07:00
Jaikumar Ganesh
c24dbdb57b Add an extra for the Disconnect Headset State. 
This extra tells as to who initiated the disconnection.

Bug:2568119
Change-Id: Iea706ad69f79ae0257604dfa84d49126fb851cca
 2010-04-05 14:43:59 -07:00
Dan Morrill
b0fe033ff8 Adding a feature definition for touchscreens that was overlooked in the last 
round.

Change-Id: I8f30676a7b468a9868503b05f366709d5534a44e
 2010-04-05 14:43:58 -07:00
Amith Yamasani
6243d4ca06 am c778f71d: am 733a2f65: am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo 2010-04-05 14:37:32 -07:00
Amith Yamasani
c778f71d5c am 733a2f65: am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo 
Merge commit '733a2f654934d452b2febf6f80cd1136830758d5' into kraken

* commit '733a2f654934d452b2febf6f80cd1136830758d5':
  Fix a crash in BatteryStatsImpl, due to a previous fix.
 2010-04-05 14:25:31 -07:00
Amith Yamasani
733a2f6549 am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo 
Merge commit '1b4c0d702066794b9ce97b02721aa9e552997381' into froyo-plus-aosp

* commit '1b4c0d702066794b9ce97b02721aa9e552997381':
  Fix a crash in BatteryStatsImpl, due to a previous fix.
 2010-04-05 14:20:57 -07:00
Amith Yamasani
1b4c0d7020 Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo 2010-04-05 14:17:55 -07:00
Ray Chen
505a318eae am 507748e9: am 6c935602: am 44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent. 2010-04-05 13:30:13 -07:00
Ray Chen
507748e972 am 6c935602: am 44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent. 
Merge commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3' into kraken

* commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3':
  Make createVideoThumbnail and createImageThumbnail look consistent.
 2010-04-05 13:19:39 -07:00
Ray Chen
6c9356028c am 44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent. 
Merge commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a' into froyo-plus-aosp

* commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a':
  Make createVideoThumbnail and createImageThumbnail look consistent.
 2010-04-05 13:16:19 -07:00
Ray Chen
44dcf65871 Make createVideoThumbnail and createImageThumbnail look consistent. 
Change-Id: I9a4798fefe3968ac847d46100036a6dde39791c9
 2010-04-05 13:06:39 -07:00
Amith Yamasani
e5795610bd Fix a crash in BatteryStatsImpl, due to a previous fix. 
This is probably the real fix for the original bug. The last line was probably not
well formed and resulted in an overrun in the native code.

Bug: 2564824
Change-Id: I8a9cc267f8045a61eff4b5d532258afa32a8b837
 2010-04-05 12:43:44 -07:00
Cary Clark
9187c0ba4a am 1cab1936: am 6cf2c14f: am 3eefc126: check for webviewcore before reading settings 2010-04-05 12:39:30 -07:00
Cary Clark
1cab19369d am 6cf2c14f: am 3eefc126: check for webviewcore before reading settings 
Merge commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a' into kraken

* commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a':
  check for webviewcore before reading settings
 2010-04-05 12:33:03 -07:00
Cary Clark
6cf2c14f65 am 3eefc126: check for webviewcore before reading settings 
Merge commit '3eefc126e5a0b4af4738332e8d43fe2e2d00424c' into froyo-plus-aosp

* commit '3eefc126e5a0b4af4738332e8d43fe2e2d00424c':
  check for webviewcore before reading settings
 2010-04-05 12:30:12 -07:00
Cary Clark
3eefc126e5 check for webviewcore before reading settings 
In setActive(), the WebViewCore instance may
have already been destroyed before the settings
object can be read.

Change-Id: I46b2a57b2d92fc7216b1c984f7044fea1fc2409e
http://b/2570700
 2010-04-05 15:25:26 -04:00
Leon Scroggins
783e72ef4b am 86d663fa: am e64e090e: am f9b1a092: Only include WEB_EDIT if there are more textfields. 2010-04-05 11:47:51 -07:00
Leon Scroggins
86d663faa0 am e64e090e: am f9b1a092: Only include WEB_EDIT if there are more textfields. 
Merge commit 'e64e090e0d4f70233fac901ac1b977123f6f0452' into kraken

* commit 'e64e090e0d4f70233fac901ac1b977123f6f0452':
  Only include WEB_EDIT if there are more textfields.
 2010-04-05 11:40:44 -07:00
Leon Scroggins
e64e090e0d am f9b1a092: Only include WEB_EDIT if there are more textfields. 
Merge commit 'f9b1a092b6c86549a8257015a03ea59ebcd9a85e' into froyo-plus-aosp

* commit 'f9b1a092b6c86549a8257015a03ea59ebcd9a85e':
  Only include WEB_EDIT if there are more textfields.
 2010-04-05 11:38:05 -07:00
Leon Scroggins
f9b1a092b6 Only include WEB_EDIT if there are more textfields. 
Fixes http://b/issue?id=2559070

Requires a change to external/webkit.

Change-Id: I411a04d260c781a91d16832704bb5c34e9751bc1
 2010-04-05 14:31:37 -04:00
San Mehat
8839544ebb am d32de7f3: am 9d782f62: am 73a8f26a: Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo 2010-04-05 10:53:58 -07:00
San Mehat
d32de7f38f am 9d782f62: am 73a8f26a: Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo 
Merge commit '9d782f62defba898c3ebaa498ea1be9e5cb26ac7' into kraken

* commit '9d782f62defba898c3ebaa498ea1be9e5cb26ac7':
  NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed
 2010-04-05 10:44:45 -07:00
San Mehat
9d782f62de am 73a8f26a: Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo 
Merge commit '73a8f26aef40184d9d5dfe9dabcfbd345deb6386' into froyo-plus-aosp

* commit '73a8f26aef40184d9d5dfe9dabcfbd345deb6386':
  NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed
 2010-04-05 10:41:19 -07:00
San Mehat
73a8f26aef Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo 2010-04-05 10:35:56 -07:00
Mike Lockwood
79e642e8ed Call LocationManager.sendNiResponse() instead of calling directly to GpsLocationProvider 
Change-Id: I6a5b47abb0519f5228d29bc3340bb2490564803e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-04-04 18:44:05 -04:00
Amith Yamasani
dc6a0b84cc am e27c176e: am c2e060cb: am 0913ce95: Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo 2010-04-02 17:35:29 -07:00
Amith Yamasani
e27c176e6c am c2e060cb: am 0913ce95: Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo 
Merge commit 'c2e060cbedaa2371fcc5c909c216c8ceafa4f649' into kraken

* commit 'c2e060cbedaa2371fcc5c909c216c8ceafa4f649':
  Potential fix for bug: 2564824 : Device runtime restart in BatteryService
 2010-04-02 17:27:31 -07:00
Amith Yamasani
c2e060cbed am 0913ce95: Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo 
Merge commit '0913ce95c29371cb7b58e294a8d60262bc7f4329' into froyo-plus-aosp

* commit '0913ce95c29371cb7b58e294a8d60262bc7f4329':
  Potential fix for bug: 2564824 : Device runtime restart in BatteryService
 2010-04-02 17:24:49 -07:00
Amith Yamasani
0913ce95c2 Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo 2010-04-02 17:20:53 -07:00
Grace Kloba
1b70418acf am 1ea99657: am 6f8b89bb: am b2ade4a7: Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo 2010-04-02 16:59:01 -07:00
Grace Kloba
1ea99657e7 am 6f8b89bb: am b2ade4a7: Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo 
Merge commit '6f8b89bb6641dfc34fa36dec52d25115b35b37ec' into kraken

* commit '6f8b89bb6641dfc34fa36dec52d25115b35b37ec':
  Make sure when WebView modified mScrollX/Y directly,
 2010-04-02 16:52:23 -07:00
Grace Kloba
6f8b89bb66 am b2ade4a7: Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo 
Merge commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0' into froyo-plus-aosp

* commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0':
  Make sure when WebView modified mScrollX/Y directly,
 2010-04-02 16:46:39 -07:00
Grace Kloba
b2ade4a7e6 Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo 2010-04-02 16:41:13 -07:00
Adam Powell
fcced83081 am ffc67455: am 128f1a87: am 6024ca5c: Fix bug 2185026 - back button in context menu now calls onContextMenuClosed() 2010-04-02 16:32:21 -07:00
Adam Powell
ffc67455f8 am 128f1a87: am 6024ca5c: Fix bug 2185026 - back button in context menu now calls onContextMenuClosed() 
Merge commit '128f1a87c55a291109ce521a92308c186e5d2db5' into kraken

* commit '128f1a87c55a291109ce521a92308c186e5d2db5':
  Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
 2010-04-02 16:25:33 -07:00
Adam Powell
128f1a87c5 am 6024ca5c: Fix bug 2185026 - back button in context menu now calls onContextMenuClosed() 
Merge commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a' into froyo-plus-aosp

* commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a':
  Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
 2010-04-02 16:20:54 -07:00
Adam Powell
6024ca5c90 Fix bug 2185026 - back button in context menu now calls onContextMenuClosed() 
Change-Id: I6c16879a8ad8e4651d21f639a620a936bf991f8d
 2010-04-02 16:05:20 -07:00