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

1104 Commits

Author SHA1 Message Date
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
Gilles Debunne
98289826e6 Merge "New assets (wifi, bluetooth...)" into gingerbread 2010-09-29 12:18:13 -07:00
Eric Fischer
cf18672acf am 5698a75f: Split strings with SD card references into variations. 
Merge commit '5698a75f15526a38ee8e0b647d05e4ee358c575a' into gingerbread-plus-aosp

* commit '5698a75f15526a38ee8e0b647d05e4ee358c575a':
  Split strings with SD card references into variations.
 2010-09-29 12:17:20 -07:00
Gilles Debunne
5fb48a2539 New assets (wifi, bluetooth...) 
Change-Id: I1b6c3a7049348aa63dddbacaf615b9ff5d630583
 2010-09-29 12:10:37 -07:00
Nick Pelly
d83aaf28bc resolved conflicts for merge of 1ff9ad3f to master 
Change-Id: I55137a241e13ec7da1d413cf9b7fd1c1fdd8c4d1
 2010-09-29 12:10:35 -07:00
Eric Fischer
5698a75f15 Split strings with SD card references into variations. 
Change-Id: I75263d57928817a211fbaf6ed45f828936f8d1be
 2010-09-29 12:09:06 -07:00
Ken Wakasa
47ad0cf3bc am d2c3f37f: Revise the Language & keyboard settings layout. 
Merge commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025' into gingerbread-plus-aosp

* commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025':
  Revise the Language & keyboard settings layout.
 2010-09-29 09:58:01 -07:00
Ken Wakasa
d2c3f37fa4 Revise the Language & keyboard settings layout. 
bug: 2954950
Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017
 2010-09-29 23:52:02 +09:00
David Pettersson
4c8c96a4f5 Changed the text input type of APN name to plain text 
Changed the input type of the APN name text field
from email adress to plain text to facilitate the
input method choosing input after locale and not
restricting the input to latin characters. There is
no reason to restrict the APN name to latin
characters only.

Change-Id: Ib85fa980407a67112fd91e744b0dc0632d5c907e
 2010-09-29 09:47:00 +02:00
Nick Pelly
1ff9ad3fb4 am 48ad5dfe: Merge "Add NFC checkbox to Settings app." into gingerbread 
Merge commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4' into gingerbread-plus-aosp

* commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4':
  Add NFC checkbox to Settings app.
 2010-09-28 22:34:42 -07:00
Nick Pelly
48ad5dfe31 Merge "Add NFC checkbox to Settings app." into gingerbread 2010-09-28 22:32:51 -07:00
Nick Pelly
ad50ba065d Add NFC checkbox to Settings app. 
Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Heavily modified to remove dead code.

Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900
 2010-09-28 21:26:50 -07:00
Chris Palmer
3e126474e9 am e2ab4597: am 88fdee27: Merge "Improve the add-device-admin layout." into gingerbread 
Merge commit 'e2ab45972af13c30bb98848813313603670c8965'

* commit 'e2ab45972af13c30bb98848813313603670c8965':
  Improve the add-device-admin layout.
 2010-09-28 13:58:03 -07:00
Chris Palmer
e2ab45972a am 88fdee27: Merge "Improve the add-device-admin layout." into gingerbread 
Merge commit '88fdee27e97900173be2b1f4f86c25a7c381969c' into gingerbread-plus-aosp

* commit '88fdee27e97900173be2b1f4f86c25a7c381969c':
  Improve the add-device-admin layout.
 2010-09-28 10:44:16 -07:00
Chris Palmer
51794a05ad Improve the add-device-admin layout. 
Make it so that the app's explanation comes before the list of possible
policies. This gives the app a chance to explain itself instead of having
the explanation hidden below the fold. To avoid situations in which one
bunch of text items can obscure the other, use an expandable/ellipsizable
TextView with an indicator image. This resolves b/2992594.

Change-Id: I0eb0d0c46bb4be2ec2e019d741915537e1fcc592
 2010-09-28 10:32:49 -07:00
Eric Fischer
2d68f1b56b am 54e21852: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 
Merge commit '54e21852f221c183eba12e1706650cdc7e0a395f' into gingerbread-plus-aosp

* commit '54e21852f221c183eba12e1706650cdc7e0a395f':
  Trim unwanted whitespace from translations.  DO NOT MERGE
 2010-09-27 12:33:33 -07:00
Eric Fischer
b9e77aacd1 Trim unwanted whitespace from translations. DO NOT MERGE 
Change-Id: I63529a6379e74b15cca02519445616225f5bd2f7
 2010-09-27 12:21:49 -07:00
Daisuke Miyakawa
2aae224a94 Modify title color. 
Change-Id: I3b0ab29ec33aadc5940ed2d8aa54dfffea2d55e6
 2010-09-24 15:10:41 -07:00
Eric Fischer
16b81c667d Merge "Import revised translations." 2010-09-24 13:20:38 -07:00
Daisuke Miyakawa
eb04789db8 Add missing icon. 
Change-Id: I3747f65bea5ddfb2b050f8da9bcbcd3fd2f9acc4
 2010-09-24 13:00:38 -07:00
Eric Fischer
5dc3028f28 Import revised translations. 
Change-Id: Iaf1681fd1e93df389d6028cf41d6f830f509b7ce
 2010-09-24 12:28:13 -07:00