PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,462 Commits 1 Branch 0 Tags
26a1f898e04ca68dc8d1a58d15e9f901b09c90e2
Commit Graph

1374 Commits

Author SHA1 Message Date
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
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
abe9ac919c resolved conflicts for merge of 10ebf928 to master 
Change-Id: I7da3cff9619aa6ecdc860a24d65b5ca9f0b898bc
 2010-10-10 09:05:02 -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
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
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
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
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
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
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
Ken Wakasa
3cd9ddda0a am bc692e83: am 2d6c0b0d: Update strings for physical keyboard settings. 
Merge commit 'bc692e83c4b3bcd6c782935bcd1aff50d23143d0'

* commit 'bc692e83c4b3bcd6c782935bcd1aff50d23143d0':
  Update strings for physical keyboard settings.
 2010-09-30 11:29:31 -07:00
Gilles Debunne
e749ddb98d am 345fbf92: am a63b08d9: New assets for power widget: gps, sync 
Merge commit '345fbf926aba9dc743a58ace88545c030a1f43f4'

* commit '345fbf926aba9dc743a58ace88545c030a1f43f4':
  New assets for power widget: gps, sync
 2010-09-30 11:29:28 -07:00
Gilles Debunne
a6660211b3 am a48d2dbe: am 98289826: Merge "New assets (wifi, bluetooth...)" into gingerbread 
Merge commit 'a48d2dbeb2691744ec42c3c9fc64f7d17fda357e'

* commit 'a48d2dbeb2691744ec42c3c9fc64f7d17fda357e':
  New assets (wifi, bluetooth...)
 2010-09-30 11:00:10 -07:00
Eric Fischer
9fc1f468f4 resolved conflicts for merge of cf18672a to master 
Change-Id: I87a7ef635166f4f90205a4117cbdec8447471af1
 2010-09-30 10:56:10 -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
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
Gilles Debunne
a63b08d9c8 New assets for power widget: gps, sync 
Change-Id: Ie075549d7d0dd3193a53b75350340285d3ec80ad
 2010-09-29 16:21:19 -07:00
Daisuke Miyakawa
3b6aa41cce Improve UI of WifiSettingsForXL 
Change-Id: Idd25251581577246ff3fb6820b9c569454292593
 2010-09-29 16:09:42 -07:00
Eric Fischer
3388aac10a Import revised translations. DO NOT MERGE 
Change-Id: I9ea6e351c10191e58ed1d1c2784022f3d099c84b
 2010-09-29 14:36:34 -07:00
Gilles Debunne
a48d2dbeb2 am 98289826: Merge "New assets (wifi, bluetooth...)" into gingerbread 
Merge commit '98289826e6a36dcb9f6df7b8f407195b2760e3b4' into gingerbread-plus-aosp

* commit '98289826e6a36dcb9f6df7b8f407195b2760e3b4':
  New assets (wifi, bluetooth...)
 2010-09-29 12:20:36 -07:00