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

2075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Roy West
effdd53ff8 Fix bug3076083 re backup setting strings 
Change-Id: I01939082d8179d28872a3367eb1691738595cb71
 2010-10-09 09:40:23 -07: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
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
Eric Fischer
5a2708d544 Import revised translations. DO NOT MERGE 
Change-Id: I1ac2d76272f5d7e1d4dd8efff22a6bd249702dd3
 2010-10-06 17:15:09 -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
Eric Fischer
84c8c175c8 Import revised translations. DO NOT MERGE 
Change-Id: I58d987d8ee9629e2d035a3bfddefedbe185daf8f
 2010-10-06 11:56:08 -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
Eric Fischer
25c52b70fa am 340c5c42: Separate the Settings activity name into two different strings. 
Merge commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74' into gingerbread-plus-aosp

* commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74':
  Separate the Settings activity name into two different strings.
 2010-10-01 12:04:08 -07:00
Eric Fischer
340c5c4237 Separate the Settings activity name into two different strings. 
The German translators would like to be able to hyphenate the name
shown in the Launcher but to keep the name shown within the activity
as a single word.

Change-Id: I22402c41186fdcdaed2712933ddf0f215b3a3329
 2010-10-01 11:45:47 -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
95d7a702c3 Merge "Fix android:allowClearUserData." into gingerbread 2010-09-30 19:03:55 -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
Eric Fischer
ddaf8f490f am f20931bc: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'f20931bc564774bbcae5f1f5f7c9aa35f612dad3' into gingerbread-plus-aosp

* commit 'f20931bc564774bbcae5f1f5f7c9aa35f612dad3':
  Import revised translations.  DO NOT MERGE
 2010-09-30 15:58:20 -07:00
Eric Fischer
f20931bc56 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-30 15:48:14 -07:00
Ken Wakasa
bc692e83c4 am 2d6c0b0d: Update strings for physical keyboard settings. 
Merge commit '2d6c0b0d7750237caf5e4b679ed14786fe81fde1' into gingerbread-plus-aosp

* commit '2d6c0b0d7750237caf5e4b679ed14786fe81fde1':
  Update strings for physical keyboard settings.
 2010-09-30 10:10:29 -07:00
Gilles Debunne
345fbf926a am a63b08d9: New assets for power widget: gps, sync 
Merge commit 'a63b08d9c8ae698960e3da502046e0cd09bc0a85' into gingerbread-plus-aosp

* commit 'a63b08d9c8ae698960e3da502046e0cd09bc0a85':
  New assets for power widget: gps, sync
 2010-09-30 10:08:43 -07:00
Ken Wakasa
2d6c0b0d77 Update strings for physical keyboard settings. 
bug: 2954950
Change-Id: I023de6dbe191ca6525cec51147a916eb746fb3e7
 2010-09-30 12:52:52 +09:00
Gilles Debunne
a63b08d9c8 New assets for power widget: gps, sync 
Change-Id: Ie075549d7d0dd3193a53b75350340285d3ec80ad
 2010-09-29 16:21:19 -07:00