Commit Graph

1111 Commits

Author SHA1 Message Date
Dianne Hackborn
8731cb1b6a am 5e34f239: Fix issue #3124528: Mange applications is including cache files in storage size 2010-10-22 12:59:31 -07:00
Dianne Hackborn
5e34f23986 Fix issue #3124528: Mange applications is including cache files in storage size
Change-Id: If26aeaed7572354feca7b8e65b7451a024a10266
2010-10-22 12:18:16 -07:00
Nick Pelly
26d6e4704a am 781c0aa2: Merge "NFC Settings cleanup." into gingerbread
Merge commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571' into gingerbread-plus-aosp

* commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571':
  NFC Settings cleanup.
2010-10-21 09:37:55 -07:00
Nick Pelly
781c0aa21e Merge "NFC Settings cleanup." into gingerbread 2010-10-21 03:56:18 -07:00
Nick Pelly
e16f78d54a NFC Settings cleanup.
NFC service now tracks its own settings. Call the NFC API to determine
state.

Change-Id: Ibdb33e68abdbe36df31fb13ad95c8ca1b3bcb35b
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-20 18:42:23 -07:00
Dianne Hackborn
149fec6a89 am 7a519955: Merge "Fix issue #3114356: Storage visualization in Manage Apps is confusing" into gingerbread
Merge commit '7a51995581128a9ade44682abe064d9fcca79aa6' into gingerbread-plus-aosp

* commit '7a51995581128a9ade44682abe064d9fcca79aa6':
  Fix issue #3114356: Storage visualization in Manage Apps is confusing
2010-10-20 17:05:19 -07:00
Dianne Hackborn
d2be882d8f Fix issue #3114356: Storage visualization in Manage Apps is confusing
Also fixes issue #3097388: If you launch Manage Applications when SD
card app info isn't available, incomplete information gets cached

Change-Id: If3377a965653590e5bc1df25e38764a83e96b820
2010-10-20 16:54:41 -07:00
Dianne Hackborn
5cfa75875f am 916adce0: Fix issue #3108683: GRH18: Battery usage chart FCs
Merge commit '916adce02d5b37038cd78d11a8c884237684f9a8' into gingerbread-plus-aosp

* commit '916adce02d5b37038cd78d11a8c884237684f9a8':
  Fix issue #3108683: GRH18: Battery usage chart FCs
2010-10-19 18:20:40 -07:00
Dianne Hackborn
916adce02d Fix issue #3108683: GRH18: Battery usage chart FCs
Make array more bigger, and bounds check the thing.

Change-Id: Iaffebefd27c16c6ecf57566803859be1a5049b8a
2010-10-19 16:23:53 -07:00
Brad Fitzpatrick
17001cea9e NFC: async enabling/disabling, ala Bluewooth & Wifi.
Don't ANR when toggling.

Bug: 3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
2010-10-18 17:03:44 -07:00
Brad Fitzpatrick
d36d650a81 NFC: async enabling/disabling, ala Bluewooth & Wifi.
Don't ANR when toggling.

Bug: 3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
2010-10-18 15:25:49 -07:00
Dianne Hackborn
593a7049f5 am 1337d0f7: Implement issue #3094621 and #3094609 - wipe sd card
Merge commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87' into gingerbread-plus-aosp

* commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87':
  Implement issue #3094621 and #3094609 - wipe sd card
2010-10-16 16:55:30 -07:00
Dianne Hackborn
1337d0f70b Implement issue #3094621 and #3094609 - wipe sd card
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command

Implements requested UI changes.  Also some final tweaks to
Manage Applications.

Change-Id: I0219195dd0c74d8c003ef1c3f6e09714859d7f89
2010-10-16 16:27:25 -07:00
Nick Pelly
fb515337c2 am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread
Merge commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f' into gingerbread-plus-aosp

* commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f':
  Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
2010-10-15 18:21:06 -07:00
Nick Pelly
e1a9ca6862 Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread 2010-10-15 10:56:05 -07:00
Amith Yamasani
8de45a6686 am 1bdb7874: Make summary appear for both checked and unchecked NFC checkbox in Settings.
Merge commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed' into gingerbread-plus-aosp

* commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed':
  Make summary appear for both checked and unchecked NFC checkbox in Settings.
2010-10-15 10:06:18 -07:00
Amith Yamasani
1bdb7874ad Make summary appear for both checked and unchecked NFC checkbox in Settings.
And remove the extra "Tag" in the summary.

Bug: 3083079
Change-Id: I998c2556a88180098a060d43b720276a7619a368
2010-10-15 10:00:40 -07:00
Nick Pelly
a57eacef3c Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
Change-Id: I518389a317a4e9ab9009fd33330a91f7c35edc2a
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-15 02:15:27 -07:00
Jaikumar Ganesh
7805fa99ff am 022299df: Merge "Disconnect dock only if its connected." into gingerbread
Merge commit '022299dfce6a705a8cbaff972a4309da6e90a8c2' into gingerbread-plus-aosp

* commit '022299dfce6a705a8cbaff972a4309da6e90a8c2':
  Disconnect dock only if its connected.
2010-10-14 15:33:42 -07:00
Jaikumar Ganesh
9d03e98d22 Disconnect dock only if its connected.
Scenario: BT is off, device is paired with the desk dock.
Media is switched off. So when the user docks, it was trying to
disconnect even when BT was off and hence DBUS was crashing.

Bug: 3097224

Change-Id: I13e1dd4459c47d5ba9a403f2ae1cc8a131f02a08
2010-10-14 15:09:57 -07:00
Jake Hamby
8028cea196 am 8021537f: BT settings wait for HS service before connect. DO NOT MERGE
Merge commit '8021537ffea45d1a36274217610a314b3a0ac774' into gingerbread-plus-aosp

* commit '8021537ffea45d1a36274217610a314b3a0ac774':
  BT settings wait for HS service before connect.  DO NOT MERGE
2010-10-13 16:28:34 -07:00
Jake Hamby
8021537ffe BT settings wait for HS service before connect. DO NOT MERGE
Bluetooth connections from Settings app can sometimes fail if the
connection to BluetoothHeadsetService isn't ready. Changed code to
delay any headset connect or disconnect attempt when the service isn't
connected until onServiceConnected() is called.

Tested by adding a call to Thread.sleep(5000) before the return
statement in BluetoothHeadsetService.onBind(). This makes it easier to
kill the phone process and then attempt to connect in the settings app
before the service restarts.

Bug: 3048839
Change-Id: I2114ff8ad67c8c672fcf6ce0bf3de61fca7a49b3
2010-10-13 16:10:47 -07:00
Jaikumar Ganesh
836b4297cc am 03403712: Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread
Merge commit '0340371297887290d7593d7c346e422a4c9ecd1a' into gingerbread-plus-aosp

* commit '0340371297887290d7593d7c346e422a4c9ecd1a':
  DO NOT MERGE Add null check before disconnecting a device.
2010-10-13 11:13:33 -07:00
Jaikumar Ganesh
0340371297 Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread 2010-10-13 11:09:35 -07:00
Jaikumar Ganesh
268d1f1e4b DO NOT MERGE Add null check before disconnecting a device.
Bug: 3076404
Change-Id: I8ef140395503816296124a38e42ab9cc7e6f7159
2010-10-13 10:56:01 -07:00
Nick Pelly
f4e4319f41 am 083310d3: Update NFC settings description, and fix polarity.
Merge commit '083310d316059c6592120c32e1c0b736e85b83c0' into gingerbread-plus-aosp

* commit '083310d316059c6592120c32e1c0b736e85b83c0':
  Update NFC settings description, and fix polarity.
2010-10-12 21:27:48 -07:00
Nick Pelly
083310d316 Update NFC settings description, and fix polarity.
Change-Id: I0d45652113617230e04536a7cc2ff148dd52595a
2010-10-12 21:22:54 -07:00
Jaikumar Ganesh
0d5e320cdd am bdf13107: Merge "Call disconnect / connect without checking the current status" into gingerbread
Merge commit 'bdf1310707e436db484113d7aa2881c966cddd0f' into gingerbread-plus-aosp

* commit 'bdf1310707e436db484113d7aa2881c966cddd0f':
  Call disconnect / connect without checking the current status
2010-10-12 19:06:15 -07:00
Nick Pelly
b3c4365d10 am cd99332f: Merge "Update settings app for new NFC API." into gingerbread
Merge commit 'cd99332fee649afd85798499cea5c45a098b8a20' into gingerbread-plus-aosp

* commit 'cd99332fee649afd85798499cea5c45a098b8a20':
  Update settings app for new NFC API.
2010-10-12 19:04:17 -07:00
Jaikumar Ganesh
bdf1310707 Merge "Call disconnect / connect without checking the current status" into gingerbread 2010-10-12 19:04:01 -07:00
Nick Pelly
cd99332fee Merge "Update settings app for new NFC API." into gingerbread 2010-10-12 18:58:46 -07:00
Jaikumar Ganesh
d3a460cce7 Call disconnect / connect without checking the current status
Its the job of the framework to check that, it already does that.
Framework will queue the commands. Earlier settings app used to queue
them.

Bug: 3076404

Change-Id: I664e1c4e2c0ef9c697066251ccca382ad12dfa2f
2010-10-12 16:19:40 -07:00
Nick Pelly
454d2ef051 Update settings app for new NFC API.
Change-Id: I2702e36d33591245fa86e00454348fc1a16f5cf8
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-12 13:07:06 -07:00
Kenny Root
52e8542d9d am 737e91ef: Merge "Don\'t show the sort menu for running process list" into gingerbread
Merge commit '737e91efb15fe5908781bc1cf446d28abc7726e8' into gingerbread-plus-aosp

* commit '737e91efb15fe5908781bc1cf446d28abc7726e8':
  Don't show the sort menu for running process list
2010-10-12 12:29:15 -07:00
Kenny Root
737e91efb1 Merge "Don't show the sort menu for running process list" into gingerbread 2010-10-12 12:25:34 -07:00
Freeman Ng
59561e0ada am 1054e489: Merge "Hide "System tutorial" option if there\'s no IME tutorial bug: 3074212" into gingerbread
Merge commit '1054e4890ae50d2550ee822f0680346f48d48c97' into gingerbread-plus-aosp

* commit '1054e4890ae50d2550ee822f0680346f48d48c97':
  Hide "System tutorial" option if there's no IME tutorial
2010-10-12 11:23:29 -07:00
Freeman Ng
1054e4890a Merge "Hide "System tutorial" option if there's no IME tutorial bug: 3074212" into gingerbread 2010-10-12 11:06:46 -07:00
Kenny Root
673085af9e Don't show the sort menu for running process list
You could bring up the menu and sort running processes by size or name
which would display the applications list at the same time the running
process list was being displayed. This happened because the
mApplicationsAdapter is used for the list of apps and is sortable, but
the running process list doesn't use the adapter.

Disable the menu when the running applications list is presented to
prevent this situation where two ListViews are visible.

Bug: 3084901
Change-Id: I5304cf7a1f426269ed4858e649729a35b9344717
2010-10-12 09:44:43 -07:00
Freeman Ng
2fc2ba11fe Hide "System tutorial" option if there's no IME tutorial
bug: 3074212

Change-Id: I3653c23cd893114cec7822efb2d6acb08b7ba91e
2010-10-11 18:51:34 -07:00
Jake Hamby
d7f7213af2 am 4c0ff2c7: Merge "Fix bug where car dock sometimes doesn\'t connect." into gingerbread
Merge commit '4c0ff2c7b5138c0fce6c83f6c414204e32ac96f3' into gingerbread-plus-aosp

* commit '4c0ff2c7b5138c0fce6c83f6c414204e32ac96f3':
  Fix bug where car dock sometimes doesn't connect.
2010-10-11 13:07:09 -07:00
Jake Hamby
4c0ff2c7b5 Merge "Fix bug where car dock sometimes doesn't connect." into gingerbread 2010-10-11 13:05:11 -07:00
Jean-Baptiste Queru
80455f367f am b84291bb: Merge "Support showing "Cold" battery health."
Merge commit 'b84291bbecb1ab8141cf8f56fd3d1523e5c707a6' into gingerbread-plus-aosp

* commit 'b84291bbecb1ab8141cf8f56fd3d1523e5c707a6':
  Support showing "Cold" battery health.
2010-10-10 17:50:41 -07:00
Jean-Baptiste Queru
b84291bbec Merge "Support showing "Cold" battery health." 2010-10-10 17:37:59 -07:00
Dianne Hackborn
10ebf928d8 am b8f9c9cf: Add confirmation when stopping system service, as per rwest.
Merge commit 'b8f9c9cf7c0343c6c05296bb7af8fdccdc3b7a3b' into gingerbread-plus-aosp

* commit 'b8f9c9cf7c0343c6c05296bb7af8fdccdc3b7a3b':
  Add confirmation when stopping system service, as per rwest.
2010-10-07 07:16:40 -07:00
Dianne Hackborn
0eb550efe2 am 4b21f7cd: Fix issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
Merge commit '4b21f7cd9424eeb83838071a4419912ee5d5e41d' into gingerbread-plus-aosp

* commit '4b21f7cd9424eeb83838071a4419912ee5d5e41d':
  Fix issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
2010-10-07 07:16:02 -07:00
Dianne Hackborn
b8f9c9cf7c Add confirmation when stopping system service, as per rwest.
Change-Id: I1cca31a87d3acfc49ffb4562d922d4577c0b1cba
2010-10-06 17:09:54 -07:00
Dianne Hackborn
4b21f7cd94 Fix issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
Make the receiver private.  Also fix to correctly update when sync
status changes.

Change-Id: I35481bf5b473196b00427da4df49aa76f691d38b
2010-10-06 14:28:23 -07:00
Dianne Hackborn
3e15e4e91b am 6dc1bf84: Manage apps "on SD card" now shows all apps that can go on SD card.
Merge commit '6dc1bf84cf72dd72a2517878f6b280e8afdcf4c2' into gingerbread-plus-aosp

* commit '6dc1bf84cf72dd72a2517878f6b280e8afdcf4c2':
  Manage apps "on SD card" now shows all apps that can go on SD card.
2010-10-04 23:04:57 -07:00
Dianne Hackborn
6dc1bf84cf Manage apps "on SD card" now shows all apps that can go on SD card.
Change-Id: Icc413891b2b884bb1af340b4c09ab3935c8e51ca
2010-10-04 22:35:26 -07:00
Dianne Hackborn
3cda486cd2 am 95d7a702: Merge "Fix android:allowClearUserData." into gingerbread
Merge commit '95d7a702c3a36ffe79da099b717dc76d62a5bab2' into gingerbread-plus-aosp

* commit '95d7a702c3a36ffe79da099b717dc76d62a5bab2':
  Fix android:allowClearUserData.
2010-09-30 19:14:28 -07:00