PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,778 Commits 1 Branch 0 Tags
8c1524d37adf46a0738b51dbf8c7a1c895761b1f
Commit Graph

2778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Irfan Sheriff
8b324d9957 am 52ad3f2f: am 566b5bb0: Improve password hint visibility 
Merge commit '52ad3f2f6c7da700b135b1d2e1fc7f507e4f2bf2'

* commit '52ad3f2f6c7da700b135b1d2e1fc7f507e4f2bf2':
  Improve password hint visibility
 2010-10-12 09:49:14 -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
Roy West
f233ec77eb am 30186392: With luck, final take on bug3076083, re back up settting 
Merge commit '3018639200a3f04d274166e26c98307ab07fc3b9' into gingerbread-plus-aosp

* commit '3018639200a3f04d274166e26c98307ab07fc3b9':
  With luck, final take on bug3076083, re back up settting
 2010-10-11 17:39:34 -07:00
Roy West
3018639200 With luck, final take on bug3076083, re back up settting 
Change-Id: I236854b4f5d679bd1581d80baba2bd43af7313eb
 2010-10-11 17:34:27 -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
Irfan Sheriff
52ad3f2f6c am 566b5bb0: Improve password hint visibility 
Merge commit '566b5bb0f91224069bbc98ea7042d22c8929aa59' into gingerbread-plus-aosp

* commit '566b5bb0f91224069bbc98ea7042d22c8929aa59':
  Improve password hint visibility
 2010-10-11 10:30:17 -07:00
Irfan Sheriff
566b5bb0f9 Improve password hint visibility 
Bug: 3083095
Change-Id: I9fcf9d529c598ad75dd438ef0e7a896c6568cbab
 2010-10-11 10:26:14 -07:00
Roy West
f0fa3dff71 am 81635077: am effdd53f: Fix bug3076083 re backup setting strings 
Merge commit '816350778ad2da0024cbd5d1838ecbcea8f018be'

* commit '816350778ad2da0024cbd5d1838ecbcea8f018be':
  Fix bug3076083 re backup setting strings
 2010-10-11 10:03:48 -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
Roy West
d80ac7ec78 am 83caf0b2: (-s ours) am 82d2908b: do not merge 
Merge commit '83caf0b26f133e7c07bd712635c789ff678597b0'

* commit '83caf0b26f133e7c07bd712635c789ff678597b0':
  do not merge
 2010-10-10 12:52:25 -07:00
Irfan Sheriff
85ba10524b Merge "Fix issue with limiting access points" 2010-10-10 12:22:04 -07:00
Roy West
0cd297b3fb am 60d9b33f: (-s ours) am e3b0bda2: do not merge 
Merge commit '60d9b33fcf3bfee7d3d3a85625376fb74d0c593c'

* commit '60d9b33fcf3bfee7d3d3a85625376fb74d0c593c':
  do not merge
 2010-10-10 11:03:45 -07:00
Eric Fischer
b6571974c7 am 5e51c769: (-s ours) am d86f58a9: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '5e51c769c77cad4d05446d888b0cf742b56a7318'

* commit '5e51c769c77cad4d05446d888b0cf742b56a7318':
  Import revised translations.  DO NOT MERGE
 2010-10-10 09:06:38 -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
Roy West
816350778a am effdd53f: Fix bug3076083 re backup setting strings 
Merge commit 'effdd53ff863d2ff8ffe64065c16b06ba01b3a8a' into gingerbread-plus-aosp

* commit 'effdd53ff863d2ff8ffe64065c16b06ba01b3a8a':
  Fix bug3076083 re backup setting strings
 2010-10-09 10:07:54 -07:00
Eric Fischer
12a821c7ba am 27db062d: (-s ours) am 84c8c175: Import revised translations. DO NOT MERGE 
Merge commit '27db062dd8464d3519d01780daf5516770ee83b8'

* commit '27db062dd8464d3519d01780daf5516770ee83b8':
  Import revised translations.  DO NOT MERGE
 2010-10-09 09:40:24 -07:00
Roy West
effdd53ff8 Fix bug3076083 re backup setting strings 
Change-Id: I01939082d8179d28872a3367eb1691738595cb71
 2010-10-09 09:40:23 -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
Roy West
83caf0b26f am 82d2908b: do not merge 
Merge commit '82d2908b2e1fc67f72e40f47fe053efca2bfce6c' into gingerbread-plus-aosp

* commit '82d2908b2e1fc67f72e40f47fe053efca2bfce6c':
  do not merge
 2010-10-07 15:48:18 -07:00
Roy West
82d2908b2e do not merge 
Change-Id: I97a2717227f18ab0c1a2688be65f444ef9d40521
 2010-10-07 15:15:45 -07:00
Roy West
60d9b33fcf am e3b0bda2: do not merge 
Merge commit 'e3b0bda234e2cdcb6349c5c0385aad34c38b1ec6' into gingerbread-plus-aosp

* commit 'e3b0bda234e2cdcb6349c5c0385aad34c38b1ec6':
  do not merge
 2010-10-07 14:04:23 -07:00
Adam Lesinski
daa6d1bc8a Merge "Added widget preview image. NOTE: This image should be replaced by a custom graphic." 2010-10-07 12:00:22 -07:00
Roy West
e3b0bda234 do not merge 
Change-Id: I722fd2d58d6532b8fc241ada8e52a731b438f1b6
 2010-10-07 08:34:41 -07:00
Eric Fischer
5e51c769c7 am d86f58a9: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'd86f58a93e14f6f187aa25d6714503af177031eb' into gingerbread-plus-aosp

* commit 'd86f58a93e14f6f187aa25d6714503af177031eb':
  Import revised translations.  DO NOT MERGE
 2010-10-07 07:17:15 -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
Eric Fischer
27db062dd8 am 84c8c175: Import revised translations. DO NOT MERGE 
Merge commit '84c8c175c8ee797f61121211c3ef8638d127cdf6' into gingerbread-plus-aosp

* commit '84c8c175c8ee797f61121211c3ef8638d127cdf6':
  Import revised translations.  DO NOT MERGE
 2010-10-07 07:14:16 -07:00
Eric Fischer
d86f58a93e Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-06 17:33:02 -07:00