PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,362 Commits 1 Branch 0 Tags
4ab6f77f98f08ee3d1b330b59ee0e7e480e5aa38
Commit Graph

17884 Commits

Author SHA1 Message Date
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
Jake Hamby
4747950d8e am d7f7213a: am 4c0ff2c7: Merge "Fix bug where car dock sometimes doesn\'t connect." into gingerbread 
Merge commit 'd7f7213af27fa6c5e476bb8a8d2951feb5e630b5'

* commit 'd7f7213af27fa6c5e476bb8a8d2951feb5e630b5':
  Fix bug where car dock sometimes doesn't connect.
 2010-10-12 13:18:21 -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
Jean-Baptiste Queru
ac3af83f69 am 80455f36: am b84291bb: Merge "Support showing "Cold" battery health." 
Merge commit '80455f367f968f64037dd32b3857891c9681664b'

* commit '80455f367f968f64037dd32b3857891c9681664b':
  Support showing "Cold" battery health.
 2010-10-11 17:49:52 -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
Irfan Sheriff
85ba10524b Merge "Fix issue with limiting access points" 2010-10-10 12:22:04 -07:00
Jean-Baptiste Queru
abe9ac919c resolved conflicts for merge of 10ebf928 to master 
Change-Id: I7da3cff9619aa6ecdc860a24d65b5ca9f0b898bc
 2010-10-10 09:05:02 -07:00
Jean-Baptiste Queru
902c4a6698 resolved conflicts for merge of 0eb550ef to master 
Change-Id: Id7434c6e95a688bf97786177a8dbecb4c3c5dc95
 2010-10-10 08:25:21 -07:00
Fabrice Di Meglio
26d5e866c7 Merge "Fix bug #3077713 (Account Sync status is sometimes not reflecting the real status)" 2010-10-08 17:30:26 -07:00
Fabrice Di Meglio
4c658d9731 Fix bug #3077713 (Account Sync status is sometimes not reflecting the real status) 
- make status refresh thru onResume()

This issue was a regression from the change to use Fragments

Change-Id: I5e293c4a72bdc70f02ccfe4fc84bfb32e2887fad
 2010-10-08 17:29:23 -07:00
Irfan Sheriff
9cf1b00657 Fix issue with limiting access points 
There should not be a limit on the general
settings screen to display access points

Change-Id: I81fd438c7464a229f00dcddca359476d8684a349
 2010-10-08 16:08:51 -07:00
Irfan Sheriff
55669944ae Merge "Use LinkProperties in WifiSettings UI" 2010-10-08 14:09:54 -07:00
Irfan Sheriff
34ce343004 Use LinkProperties in WifiSettings UI 
Change-Id: I6f59328173e9550a2822573a9b25517ebbec4024
 2010-10-08 14:00:21 -07:00
satok
295ea6f7fd Fix build breakage 
- removing final

Change-Id: Ieeff81025b96f55ca9b5577735c74b25333e2b48
 2010-10-08 14:48:15 +09:00
satok
186c9719eb Fix a bug that IME can't be changed. 
- Call InputMethodSubtypePicker instead of InputMethodPicker

Change-Id: Iedd7ffb037a772cc94b0db1dcfc3f75b10572a9c
 2010-10-08 14:17:23 +09: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
Zoran Jovanovic
211893e722 Fix: Text is cut in Edit word edit box when adding word to dictionary 
When a word is added to dictionary its display is cut in edit box of
Edit word dialog on some screens.

Change-Id: I8c8dde9df6b2ccad21bb2113a240d24a99d51012
 2010-10-07 08:29:58 +02: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
3eec44df27 am 3e15e4e9: am 6dc1bf84: Manage apps "on SD card" now shows all apps that can go on SD card. 
Merge commit '3e15e4e91b69da9091310bf9aadb1bcffcb3137c'

* commit '3e15e4e91b69da9091310bf9aadb1bcffcb3137c':
  Manage apps "on SD card" now shows all apps that can go on SD card.
 2010-10-06 17:08:02 -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
Daisuke Miyakawa
fef4125d4e Disable buttons during first scan. 
Also remove status manager code, as they should not be here.

Bug: 3069020
Change-Id: I6fcf8470066f96b7f608ceb519b0783e44307846
 2010-10-06 13:34:18 -07:00
Irfan Sheriff
c5361927f4 Add proxy UI for wifi 
bug: 3039302
Change-Id: I6fee69992ea78459f06ef270af5bf857eff93c44
 2010-10-06 10:40:44 -07:00
Amith Yamasani
44ba0fa9d1 Merge "3053971 Accessibility settings are not using Fragment APIs for dialogs. + 3053903 Pressing back while showing disable accessibility warning disables accessibility with no explicit user consent." 2010-10-05 14:03:13 -07:00
Amith Yamasani
e0e4fc208b Remove singleTop, as it's causing serious problems on the phone. And... 
Fix fragment launching from another app - pass along the fragment class name
and bundle from the original intent.

Bug: 3064432
Bug: 3059311 (partial fix)
 2010-10-05 13:27:45 -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
Daisuke Miyakawa
ce0a7b2df0 Disable Auto-timezone in SetupWizard 
Also remove status bar code, as we shouldn't touch it here.

Bug: 3008295
Change-Id: I1ae3f118eae2cacd135d3ec61f1c27993fe2e166
 2010-10-01 09:14:24 -07:00
Dianne Hackborn
3194754bfe am 3cda486c: am 95d7a702: Merge "Fix android:allowClearUserData." into gingerbread 
Merge commit '3cda486cd23c3739d70681166979a3e0ea439ed3'

* commit '3cda486cd23c3739d70681166979a3e0ea439ed3':
  Fix android:allowClearUserData.
 2010-09-30 22:14:41 -07:00
Svetoslav Ganov
cdd8e34b4f 3053971 Accessibility settings are not using Fragment APIs for dialogs. + 3053903 Pressing back while showing disable accessibility warning disables accessibility with no explicit user consent. 
Change-Id: Iac7e7a96d8d9f37d1b39c29237b3e2c93381b39b
 2010-09-30 20:19:07 -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
Dianne Hackborn
2f144fc07d Fix android:allowClearUserData. 
Now respect this flag for system apps.

Change-Id: I496b0051a4998cb41b8c07fd0eb85e253de1eb97
 2010-09-30 18:49:18 -07:00
Ken Wakasa
6d5b8951b1 Merge commit '47ad0cf3' into manualmerge 
Conflicts:
	res/xml/language_settings.xml
	src/com/android/settings/LanguageSettings.java

Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2
 2010-09-30 11:54:31 +09:00
Daisuke Miyakawa
3b6aa41cce Improve UI of WifiSettingsForXL 
Change-Id: Idd25251581577246ff3fb6820b9c569454292593
 2010-09-29 16:09:42 -07:00
Jake Hamby
582f1f84bb Fix bug where car dock sometimes doesn't connect. 
Attempt to connect to car/desk dock after pairing completes. This
fixes a bug where we didn't try to connect if we received the UUID
change intent before the bonding state change intent.

Change-Id: I7c12a4eb23d17d506e43a64bf2a3aa5241debcb9
 2010-09-29 15:38:19 -07:00
Nick Pelly
d83aaf28bc resolved conflicts for merge of 1ff9ad3f to master 
Change-Id: I55137a241e13ec7da1d413cf9b7fd1c1fdd8c4d1
 2010-09-29 12:10:35 -07:00