Commit Graph

1134 Commits

Author SHA1 Message Date
Jaikumar Ganesh
213d579f98 Merge "Don't disconnect the same device before connecting." into gingerbread 2010-09-16 19:08:32 -07:00
Jaikumar Ganesh
84905edb63 Don't disconnect the same device before connecting.
We Pair: Remote device sends incoming connection, we get connected.
We get BondingState change and we connect.
Settings app disconnects connected profiles and then connects
without checking whether we are disconnecting the same device itself.

How was it working before ? Settings app used to queue all
commands. The disconnect followed by the connect would work
but unnecessarily disconnect and then connect.
With the queuing moved to framework, the connect fails
since the disconnect status has not been broadcasted.

Settings app shouldn't be disconnecting connected profiles.
That logic should reside in the framework. There is an open bug
and when the new APIs get implemented this will get removed.

Change-Id: I32a7fa36ff3c3321691c55071498f985dcdcfe8e
2010-09-16 18:56:30 -07:00
Dianne Hackborn
e2fc49ac1b am 5c2a4684: Merge "Supercalifragilisticexpialidocious." into gingerbread
Merge commit '5c2a46848133c0ad6b2197aa1d6f5ae2ba9c8119' into gingerbread-plus-aosp

* commit '5c2a46848133c0ad6b2197aa1d6f5ae2ba9c8119':
  Supercalifragilisticexpialidocious.
2010-09-14 12:33:38 -07:00
Dianne Hackborn
5c2a468481 Merge "Supercalifragilisticexpialidocious." into gingerbread 2010-09-14 12:31:20 -07:00
Dianne Hackborn
44178e2801 Supercalifragilisticexpialidocious.
Change-Id: Ifaece97c80b859cb455eab56230e076eca916f4a
2010-09-14 12:29:32 -07:00
Brad Fitzpatrick
f8a473c398 am c5c8dad0: Use new apply() instead of commit().
Merge commit 'c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb' into gingerbread-plus-aosp

* commit 'c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb':
  Use new apply() instead of commit().
2010-09-14 10:29:35 -07:00
Brad Fitzpatrick
c5c8dad0af Use new apply() instead of commit().
apply() starts an async disk write and doesn't have a return
value but is otherwise identical in observable effects.

Change-Id: I0f528607319d7eb5136bb11fce0b24d8741ccdf9
2010-09-14 09:26:51 -07:00
Jaikumar Ganesh
1647d472a8 am e714898a: Merge "OutOfband pairing user dialog." into gingerbread
Merge commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120' into gingerbread-plus-aosp

* commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120':
  OutOfband pairing user dialog.
2010-09-13 11:52:15 -07:00
Jaikumar Ganesh
e714898a1a Merge "OutOfband pairing user dialog." into gingerbread 2010-09-13 11:43:01 -07:00
Chung-yih Wang
2af8a0076e am e5e4282a: Enable the call setting when the VoIP feature is supported.
Merge commit 'e5e4282af1d2d4277c8e2c13a312be0187f44257' into gingerbread-plus-aosp

* commit 'e5e4282af1d2d4277c8e2c13a312be0187f44257':
  Enable the call setting when the VoIP feature is supported.
2010-09-10 19:52:31 -07:00
Chung-yih Wang
e5e4282af1 Enable the call setting when the VoIP feature is supported.
If the VoIP feature is included, the user need to be able to
configure the internet call settings even if it is in airplan mode.

Change-Id: I00d73fb0d9213162b8a9887cad0f800418446787
2010-09-11 10:24:46 +08:00
Jaikumar Ganesh
a197eea307 OutOfband pairing user dialog.
Change-Id: I2f996067b983ad4678814040eb0773fa3968be13
2010-09-09 15:29:03 -07:00
Dianne Hackborn
1cc3202d0e am 2d5cd1df: Follow rename.
Merge commit '2d5cd1dfbc635fef3321694f33faf38ffa993d3f' into gingerbread-plus-aosp

* commit '2d5cd1dfbc635fef3321694f33faf38ffa993d3f':
  Follow rename.
2010-09-03 13:29:51 -07:00
Dianne Hackborn
2d5cd1dfbc Follow rename.
Change-Id: I255df1429b999943d7b3d2ca2b453045f195fdb9
2010-09-03 12:53:20 -07:00
Erik Ljungberg
6e6d05801e am 83c3b64f: BT: The Phone doesn\'t "wake up" when trying to pair with it.
Merge commit '83c3b64ff7235e1382712a899ab0a269ce8a28d6' into gingerbread-plus-aosp

* commit '83c3b64ff7235e1382712a899ab0a269ce8a28d6':
  BT: The Phone doesn't "wake up" when trying to pair with it.
2010-09-01 22:04:59 -07:00
Erik Ljungberg
83c3b64ff7 BT: The Phone doesn't "wake up" when trying to pair with it.
To improve the pairing request usability:
- In the case where a notification shall be used the standard
  notification sound is added
- When the screen is off notification is always used.

Change-Id: I751a7913517c64de5d7ba06d7c17358197d002c5
2010-09-01 21:59:48 -07:00
Dianne Hackborn
16339b6f35 am 5774d5d3: Show correct process dependency for providers.
Merge commit '5774d5d34b2339135feab01b998fcd111ebdde4d' into gingerbread-plus-aosp

* commit '5774d5d34b2339135feab01b998fcd111ebdde4d':
  Show correct process dependency for providers.
2010-08-31 19:03:31 -07:00
Dianne Hackborn
5774d5d34b Show correct process dependency for providers.
Use the new API that allows us to always retrieve the desired
provider info.

Change-Id: I9265d8f169ee34c87f0ca89315ee78bb2ae49674
2010-08-31 18:59:09 -07:00
Brad Fitzpatrick
6442f0b466 am 22aa2130: Merge "Make power control widget be more responsive. Fix StrictMode violations." into gingerbread
Merge commit '22aa2130fe40952d477a998ba60dea99ada32711' into gingerbread-plus-aosp

* commit '22aa2130fe40952d477a998ba60dea99ada32711':
  Make power control widget be more responsive.  Fix StrictMode violations.
2010-08-30 12:33:48 -07:00
Brad Fitzpatrick
ae0ff95272 Make power control widget be more responsive. Fix StrictMode violations.
Also use new location providers changed broadcast intent, and fix a bug
introduced in Froyo where we stopped observing the SYSTEM_CLOSE_DIALOGS
intent so we fell out of sync (more often) with the sync settings.

Now even responsive during the boot I/O storm!  (except for toggling
brightness, which still does disk writes from the UI thread...)

BUG=2956025

Change-Id: I77876ff6e0be2325c15d5f08bb2970edf233f839
2010-08-27 17:11:10 -07:00
Dianne Hackborn
805ad7d1aa am 4749fcf7: More tricksy.
Merge commit '4749fcf762de0e34ac28f927501d42555062c521' into gingerbread-plus-aosp

* commit '4749fcf762de0e34ac28f927501d42555062c521':
  More tricksy.
2010-08-19 18:37:35 -07:00
Dianne Hackborn
4749fcf762 More tricksy.
Change-Id: I4752344e0eea302ba28e907ff5bd5c20f74a82b7
2010-08-19 18:21:31 -07:00
Erik Ljungberg
d5234bc844 BT: The Phone doesn't "wake up" when trying to pair with it.
To improve the pairing request usability:
- In the case where a notification shall be used the standard
  notification sound is added
- When the screen is off notification is always used.

Change-Id: I751a7913517c64de5d7ba06d7c17358197d002c5
2010-08-19 17:47:44 +02:00
Jake Hamby
2876ad6208 am 2fcfb289: Merge " Fix Bluetooth Settings activity memory leak."
Merge commit '2fcfb28982b84a6383774cfd50d6a963b1a985e1' into gingerbread-plus-aosp

* commit '2fcfb28982b84a6383774cfd50d6a963b1a985e1':
  Fix Bluetooth Settings activity memory leak.
2010-08-18 19:36:53 -07:00
Jake Hamby
2fcfb28982 Merge " Fix Bluetooth Settings activity memory leak." 2010-08-18 19:29:53 -07:00
Dianne Hackborn
4962c855b8 am a712c3b7: A couple small settings fixes:
Merge commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a' into gingerbread-plus-aosp

* commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a':
  A couple small settings fixes:
2010-08-18 18:42:18 -07:00
Dianne Hackborn
a712c3b7b5 A couple small settings fixes:
- Correctly position WIFI/GPS charts.
- Start out with running services hidden in case we need to show
  the progress bar.

Change-Id: I8852f334f68f4e9122b5d688d9fd57d0f94d94d8
2010-08-18 17:47:39 -07:00
thigobr
d4cebee1e4 Fix Bluetooth Settings activity memory leak.
There were two leaks in Bluetooth Settings: one when rotating the
    phone and other when scanning for bluetooth devices.
2010-08-17 12:59:41 -03:00
Ben Clark
8d62eb4a51 am 0008d219: Refactor to remove multiple in-loop Object[]->String[] castings
Merge commit '0008d219a2964218477d5bd5f28a848844063c44' into gingerbread-plus-aosp

* commit '0008d219a2964218477d5bd5f28a848844063c44':
  Refactor to remove multiple in-loop Object[]->String[] castings
2010-08-17 07:48:32 -07:00
Dianne Hackborn
6ca1da8c97 am ff3673c7: Make running services initial update async.
Merge commit 'ff3673c7f477b1d78e64a8bc28754552dcdc8826' into gingerbread-plus-aosp

* commit 'ff3673c7f477b1d78e64a8bc28754552dcdc8826':
  Make running services initial update async.
2010-08-15 17:37:14 -07:00
Dianne Hackborn
ff3673c7f4 Make running services initial update async.
Also fix the value show for an app's awake time.

Change-Id: I801681d3a1d47a6bb1f3fb8cc5b0ef009201146f
2010-08-15 17:29:07 -07:00
Dianne Hackborn
343158c797 am be5994d2: Some improvements to the battery usage UI:
Merge commit 'be5994d20152c7194aac79eb8152240655fd3373' into gingerbread-plus-aosp

* commit 'be5994d20152c7194aac79eb8152240655fd3373':
  Some improvements to the battery usage UI:
2010-08-13 16:00:49 -07:00
Dianne Hackborn
be5994d201 Some improvements to the battery usage UI:
- Show wake lock usage in the battery history.
- Show WIFI usage in the battery history.
- Show the amount an app has held a wake lock in the app details.
- Also fix service run time computation in running services.

Change-Id: I5aa959857f83808fbc709f65204f59bbfb73935b
2010-08-13 14:22:34 -07:00
Jean-Baptiste Queru
f9cfab203a Fix build - add missing import
Change-Id: I31c5db903532c68b42760f29b3fbb46c7c7854f8
2010-08-12 14:30:26 -07:00
Dianne Hackborn
0e40487219 am 36735462: More version info.
Merge commit '3673546205ebf1b4c83c212c1032eea38c8adbe7' into gingerbread-plus-aosp

* commit '3673546205ebf1b4c83c212c1032eea38c8adbe7':
  More version info.
2010-08-11 22:32:15 -07:00
Dianne Hackborn
3673546205 More version info.
Change-Id: I006951028135e95ce7bb2463f00649a691b5f615
2010-08-11 22:28:29 -07:00
Dianne Hackborn
a3be864081 am 0f9daab7: Manage apps "third party" and "on sd card" filters were swapped.
Merge commit '0f9daab75f1557722b6e687a68eebfd5d28cbc51' into gingerbread-plus-aosp

* commit '0f9daab75f1557722b6e687a68eebfd5d28cbc51':
  Manage apps "third party" and "on sd card" filters were swapped.
2010-07-30 15:25:29 -07:00
Dianne Hackborn
0f9daab75f Manage apps "third party" and "on sd card" filters were swapped.
Also change the app details screen to make use of the common
ApplicationsState object for its UI, improving launch performance.

Change-Id: I387ed72a06d44aab47a85692c10247ce488c605c
2010-07-30 14:26:37 -07:00
Ben Clark
0008d219a2 Refactor to remove multiple in-loop Object[]->String[] castings
(This replaces Iaa0f3b25eaadb094a4c3fb4cecbd09e0322aae33)

This change removes the need to convert Object[]->String[] for each iteration
of each of available,tethered,errored states in updateStatus()
by converting these as soon as possible.

This fix (and the code before) is strange because each of available,tethered,
errored are defined as type ArrayList<String> but
intent.getStringArrayListExtra() returns type Object[] dispite its name.
Because other calls to updateState() use String[] it seems best to do the
conversion outside this method in the Object[] case and thus avoid the
per-iteration casting in the Object[] case and the downright wasteful
per-iteration String[]->Object[]->String[] casting in the String[] input cases.

I've also removed some unused imports and an unused variable.

Change-Id: I805ef19aa9ceff7e4fc491623cdcb413ce170798
2010-07-29 20:51:31 +01:00
Dianne Hackborn
6fce81a69d am 508fedc4: Improvements to manage apps / running services:
Merge commit '508fedc4102790dcd7004e4962e2b540967b714b' into gingerbread-plus-aosp

* commit '508fedc4102790dcd7004e4962e2b540967b714b':
  Improvements to manage apps / running services:
2010-07-28 17:44:19 -07:00
Dianne Hackborn
508fedc410 Improvements to manage apps / running services:
- Running services now keeps a single data structure to make
  switching through the UI a lot faster.
- Display text when there are no apps.
- Fix deadlock.
- Add new preference entry to view manage apps for storage use.
- Etc.

Change-Id: I0f5babf407ed7e84169f59584ddcb6cd0e9d67d9
2010-07-28 17:41:08 -07:00
Dianne Hackborn
9248082d0a am e7623f77: Rewrite Manage Applications to be faster and simpler.
Merge commit 'e7623f775cb37a8de049dae8c03b5b396526fdd1' into gingerbread-plus-aosp

* commit 'e7623f775cb37a8de049dae8c03b5b396526fdd1':
  Rewrite Manage Applications to be faster and simpler.
2010-07-27 16:35:13 -07:00
Dianne Hackborn
e7623f775c Rewrite Manage Applications to be faster and simpler.
Change-Id: I4cf405e83a369cb935bccf375798557ffd93e14e
2010-07-27 15:23:51 -07:00
Jean-Baptiste Queru
885ac7701f am 46c0a5b1: Merge "Remove unused imports in SecuritySettings.java"
Merge commit '46c0a5b12973fcd40b72b48fe344e45f1110865e' into gingerbread-plus-aosp

* commit '46c0a5b12973fcd40b72b48fe344e45f1110865e':
  Remove unused imports in SecuritySettings.java
2010-07-26 14:37:30 -07:00
Jean-Baptiste Queru
46c0a5b129 Merge "Remove unused imports in SecuritySettings.java" 2010-07-26 14:33:08 -07:00
Dianne Hackborn
2e8bf1aa82 am 938079c9: Fix drawing of phone signal chart.
Merge commit '938079c9b36f0a45e58b5b086393647d71aebeba' into gingerbread-plus-aosp

* commit '938079c9b36f0a45e58b5b086393647d71aebeba':
  Fix drawing of phone signal chart.
2010-07-26 12:25:13 -07:00
Dianne Hackborn
bc77ddbcf5 am 4d83bd2d: Add UI to report a running service to the developer.
Merge commit '4d83bd2dbd6cd068ef770ec960c24414e8aa6391' into gingerbread-plus-aosp

* commit '4d83bd2dbd6cd068ef770ec960c24414e8aa6391':
  Add UI to report a running service to the developer.
2010-07-26 12:24:59 -07:00
Dianne Hackborn
4d4ccc9acb am 9db5ee35: Add facility to disable system packages.
Merge commit '9db5ee35d5345e13e6e6b857dbad5a83e9f037d1' into gingerbread-plus-aosp

* commit '9db5ee35d5345e13e6e6b857dbad5a83e9f037d1':
  Add facility to disable system packages.
2010-07-26 12:24:31 -07:00
Dianne Hackborn
e5d948f333 am cbaf6ceb: Add battery history details activity.
Merge commit 'cbaf6ceb8e6b2d36a40589de6380ff93e75335df' into gingerbread-plus-aosp

* commit 'cbaf6ceb8e6b2d36a40589de6380ff93e75335df':
  Add battery history details activity.
2010-07-26 12:24:09 -07:00
Dianne Hackborn
938079c9b3 Fix drawing of phone signal chart.
Change-Id: I15253624ab37d3a494a541d813ee1bf2187e145d
2010-07-25 12:41:05 -07:00