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

2599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Irfan Sheriff
297da30060 Merge "Fix style for text colour settings" 2010-10-06 16:00:38 -07:00
Irfan Sheriff
30482aff01 Fix style for text colour settings 
Bug: 3061128
Change-Id: I8ad81f829bb8c34d2d288a13ce49a14c6e97192d
 2010-10-06 15:58:40 -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
Eric Fischer
84c8c175c8 Import revised translations. DO NOT MERGE 
Change-Id: I58d987d8ee9629e2d035a3bfddefedbe185daf8f
 2010-10-06 11:56:08 -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
Adam Lesinski
e684399717 Added widget preview image. NOTE: This image should be replaced by a custom graphic. 
Change-Id: Ia8abd993b399a9fed567266f699874baa67a09f9
 2010-10-04 16:40:29 -07:00
Eric Fischer
4e6466f5ef am 25c52b70: am 340c5c42: Separate the Settings activity name into two different strings. 
Merge commit '25c52b70faceb24cade0f5480c372de3f47bdf79'

* commit '25c52b70faceb24cade0f5480c372de3f47bdf79':
  Separate the Settings activity name into two different strings.
 2010-10-01 12:06:18 -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
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
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
0b5b53e9ed am ddaf8f49: (-s ours) am f20931bc: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'ddaf8f490f8099514c2e3d0767e0838440f3fd1c'

* commit 'ddaf8f490f8099514c2e3d0767e0838440f3fd1c':
  Import revised translations.  DO NOT MERGE
 2010-09-30 18:13:01 -07:00
Freeman Ng
ab5c381222 keep screen on in setup wizard datetime and wifi settings activities 
bug: 3052067

Change-Id: I5378a5f9afd90e6aaadb25e0284188c25dce6b2a
 2010-09-30 17:32:01 -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
Ying Wang
c845c6db98 Fix proguard flag file dependency. 
Change-Id: I32004f93fe66f54647f1c93125425a9646431070
 2010-09-30 13:23:20 -07:00