PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,592 Commits 1 Branch 0 Tags
788062fe82b1f9b51a7670da6400ebabf54da4ca
Commit Graph

3592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
51985c04dd Mass merge from gingerbread - do not merge 
Change-Id: I2693f4f400c0c56df04ccb571bfd3420c6f0d697
 2011-01-30 12:42:26 -08:00
Justin Ho
8a3f211b1c am 9685108e: am 6db0f05a: Deprecating old Settings icon completely Updating to new Settings launcher icon Bug: 3362749 
* commit '9685108ea050577d099e0c02ffb223b8cff3b7df':
  Deprecating old Settings icon completely Updating to new Settings launcher icon Bug: 3362749
 2011-01-29 14:34:12 -08:00
Justin Ho
9685108ea0 am 6db0f05a: Deprecating old Settings icon completely Updating to new Settings launcher icon Bug: 3362749 
* commit '6db0f05a8df1e8d1d6d4cd7601caad8b5ec8bd75':
  Deprecating old Settings icon completely Updating to new Settings launcher icon Bug: 3362749
 2011-01-29 14:32:34 -08:00
Justin Ho
6db0f05a8d Deprecating old Settings icon completely 
Updating to new Settings launcher icon
Bug: 3362749

Change-Id: I4d33650b68aac3aa9ddd56d2acab614f80266840
 2011-01-29 13:19:05 -08:00
Daisuke Miyakawa
3fb48a588a am bb627e40: am a93196f1: Take care of null in Wifi setup. 
* commit 'bb627e40cf7c174eb701eca8825e087355ba5eee':
  Take care of null in Wifi setup.
 2011-01-29 12:06:31 -08:00
Daisuke Miyakawa
bb627e40cf am a93196f1: Take care of null in Wifi setup. 
* commit 'a93196f1651a0598d6e398f6fb3c2e513a3b7091':
  Take care of null in Wifi setup.
 2011-01-29 12:04:06 -08:00
Daisuke Miyakawa
a93196f165 Take care of null in Wifi setup. 
The preference isn't available in Wifi setup launched from
SetupWizard, causing NPE.

Bug: 3404998
Change-Id: Ia0dabea95e5e7424698a269c0851d610fd305309
 2011-01-29 11:55:24 -08:00
Eric Fischer
29c03671f2 am 5a2bb8c0: (-s ours) Import revised translations. DO NOT MERGE 
* commit '5a2bb8c0dc33837696f80d6690d51f031d7884c8':
  Import revised translations.  DO NOT MERGE
 2011-01-29 11:25:03 -08:00
Eric Fischer
22b0e7aa8b am 95112e5b: (-s ours) Import revised translations. DO NOT MERGE 
* commit '95112e5b9810b6a70974ace6ee1c017b57e466af':
  Import revised translations.  DO NOT MERGE
 2011-01-29 10:47:04 -08:00
Irfan Sheriff
2310ebc22a am 6c15162b: am abeff000: Change sleep policy strings 
* commit '6c15162b7dd22e43852b1af3a38102a07f721f1c':
  Change sleep policy strings
 2011-01-29 10:17:12 -08:00
Irfan Sheriff
6c15162b7d am abeff000: Change sleep policy strings 
* commit 'abeff000fdd0c421ee514effb83c202174209b9d':
  Change sleep policy strings
 2011-01-29 10:14:45 -08:00
Eric Fischer
313c41fb35 am 8c152471: (-s ours) am abdfaed8: (-s ours) am 5a2bb8c0: Import revised translations. DO NOT MERGE 
* commit '8c152471853613730429fa9104ad9ff61efa91ec':
  Import revised translations.  DO NOT MERGE
 2011-01-29 09:18:11 -08:00
Eric Fischer
8c15247185 am abdfaed8: (-s ours) am 5a2bb8c0: Import revised translations. DO NOT MERGE 
* commit 'abdfaed8f4791a5f1776a005dd58c33e595842e8':
  Import revised translations.  DO NOT MERGE
 2011-01-29 09:12:45 -08:00
Irfan Sheriff
abeff000fd Change sleep policy strings 
Bug: 3404049
Change-Id: I8ad3eae778c1695fc98aaca01ef26677fa8106f1
 2011-01-29 09:10:13 -08:00
Eric Fischer
74e312f5ae am f3ee2680: (-s ours) am 0cd5e21a: (-s ours) am 95112e5b: Import revised translations. DO NOT MERGE 
* commit 'f3ee2680bc6a8dfd8b1cf09e2306fdc74476bd21':
  Import revised translations.  DO NOT MERGE
 2011-01-29 08:35:39 -08:00
Eric Fischer
f3ee2680bc am 0cd5e21a: (-s ours) am 95112e5b: Import revised translations. DO NOT MERGE 
* commit '0cd5e21a40fce62738792a45608a9b9391f62d2b':
  Import revised translations.  DO NOT MERGE
 2011-01-29 08:02:39 -08:00
Hung-ying Tyan
9bb922dd58 am 2188a5e7: am 27682b0a: Merge "Clear mDialogFragment when it\'s detached" into honeycomb 
* commit '2188a5e7e5e8c070e0cc6913e0ded0d35288fbb8':
  Clear mDialogFragment when it's detached
 2011-01-29 02:33:57 -08:00
Hung-ying Tyan
2188a5e7e5 am 27682b0a: Merge "Clear mDialogFragment when it\'s detached" into honeycomb 
* commit '27682b0aff076e9d4ef6c4651effc9ce47ff6fb6':
  Clear mDialogFragment when it's detached
 2011-01-29 02:31:34 -08:00
Hung-ying Tyan
27682b0aff Merge "Clear mDialogFragment when it's detached" into honeycomb 2011-01-29 02:29:15 -08:00
Vasu Nori
f3e7f5097d am 1acf3d16: am a0098bd3: Merge "bug:3402846 fix settings->storage" into honeycomb 
* commit '1acf3d16298ac6a9c807db71d1a0f8908b9bed3d':
  bug:3402846 fix settings->storage
 2011-01-28 18:45:12 -08:00
Vasu Nori
1acf3d1629 am a0098bd3: Merge "bug:3402846 fix settings->storage" into honeycomb 
* commit 'a0098bd34602acdf129ded0152ffeb07bb64d28d':
  bug:3402846 fix settings->storage
 2011-01-28 18:42:50 -08:00
Vasu Nori
a0098bd346 Merge "bug:3402846 fix settings->storage" into honeycomb 2011-01-28 18:39:38 -08:00
Irfan Sheriff
785961e574 am c3bc1104: am 7bdf0e73: Move sleep policy to main settings page 
* commit 'c3bc1104666ca4b54b849a5642ce7bc963a8e065':
  Move sleep policy to main settings page
 2011-01-28 17:32:45 -08:00
Irfan Sheriff
c3bc110466 am 7bdf0e73: Move sleep policy to main settings page 
* commit '7bdf0e73d051f176fbc20451761eb50177d69f91':
  Move sleep policy to main settings page
 2011-01-28 17:30:59 -08:00
Vasu Nori
a3314e2bdb bug:3402846 fix settings->storage 
Change-Id: Icb9e33cb0336f87f43797330f56e9c8fcbe2dfd0
 2011-01-28 17:14:38 -08:00
Irfan Sheriff
7bdf0e73d0 Move sleep policy to main settings page 
Bug: 3404049
Change-Id: I091abd737894a4adb9ebfc08b8e63bc3224b971c
 2011-01-28 17:00:37 -08:00
Daisuke Miyakawa
22e57a880f am e4df0b3e: am 46f4b754: Merge "Enlarge texts and fit the other elements" into honeycomb 
* commit 'e4df0b3ec87ddcb6d480ffff5c954d9eee7bef74':
  Enlarge texts and fit the other elements
 2011-01-28 16:28:57 -08:00
Daisuke Miyakawa
e4df0b3ec8 am 46f4b754: Merge "Enlarge texts and fit the other elements" into honeycomb 
* commit '46f4b754e1173cfc7065df39311ab5c30f92ed60':
  Enlarge texts and fit the other elements
 2011-01-28 16:26:08 -08:00
Daisuke Miyakawa
46f4b754e1 Merge "Enlarge texts and fit the other elements" into honeycomb 2011-01-28 16:23:45 -08:00
Eric Fischer
096b3bc894 am 72badf79: (-s ours) am 335387da: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '72badf79b4e86b6815e81d0e0dc2140799691fcf':
  Import revised translations.  DO NOT MERGE
 2011-01-28 15:18:20 -08:00
Eric Fischer
72badf79b4 am 335387da: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '335387dafe912d3487ef93aa3250ca3059bdfd48':
  Import revised translations.  DO NOT MERGE
 2011-01-28 15:14:04 -08:00
Eric Fischer
335387dafe Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-28 15:10:11 -08:00
Eric Fischer
2eb1edc446 Import revised translations. DO NOT MERGE 
Change-Id: Ifb50963e88a2d7c48440f0be4b411ede41ec0998
 2011-01-28 14:58:24 -08:00
Jake Hamby
12f608479f am e3b22331: am e1f883a3: Merge "Don\'t display extra A2DP profile icon for OPP." into honeycomb 
* commit 'e3b223310787a3603dce40c776e55e4a911c6025':
  Don't display extra A2DP profile icon for OPP.
 2011-01-28 14:25:37 -08:00
Jake Hamby
e3b2233107 am e1f883a3: Merge "Don\'t display extra A2DP profile icon for OPP." into honeycomb 
* commit 'e1f883a38c13ebb8ac7a66172f30b3b01b4577c0':
  Don't display extra A2DP profile icon for OPP.
 2011-01-28 14:23:13 -08:00
Daisuke Miyakawa
7893447987 Enlarge texts and fit the other elements 
Basically set text size to 18sp and change layouts
along with the new design.

- Add custom list item xml for Wi-Fi security field
  rename existing "custom_list_item.xml" to appropriate
  name so that we won't be confused with their naming.
- Use the custom xml just in SetupWizard.

Bug: 3364731
Change-Id: I014903277a03c359ea193dd0f0a37c84ade19fa1
 2011-01-28 14:22:48 -08:00
Jake Hamby
e1f883a38c Merge "Don't display extra A2DP profile icon for OPP." into honeycomb 2011-01-28 14:21:19 -08:00
Eric Fischer
abdfaed8f4 am 5a2bb8c0: Import revised translations. DO NOT MERGE 
* commit '5a2bb8c0dc33837696f80d6690d51f031d7884c8':
  Import revised translations.  DO NOT MERGE
 2011-01-28 14:16:07 -08:00
Eric Fischer
5a2bb8c0dc Import revised translations. DO NOT MERGE 
Change-Id: Ic85518cac2e5c92d829bc71da778b68259524624
 2011-01-28 13:21:54 -08:00
Daisuke Miyakawa
defb07d3da am b03c6276: am a7155141: Merge "Disable "add network" button." into honeycomb 
* commit 'b03c6276248475212d98e0ebae34dbf534f2c714':
  Disable "add network" button.
 2011-01-28 12:39:58 -08:00
Daisuke Miyakawa
b03c627624 am a7155141: Merge "Disable "add network" button." into honeycomb 
* commit 'a71551418cfeeb6da335bbc83fca80de4a82fa07':
  Disable "add network" button.
 2011-01-28 12:38:27 -08:00
Daisuke Miyakawa
a71551418c Merge "Disable "add network" button." into honeycomb 2011-01-28 12:36:07 -08:00
Daisuke Miyakawa
6ca5354727 Disable "add network" button. 
It has broken UI which possibly get users stuck.

Bug: 3400715
Change-Id: Ic618078bc70a7db35ec22e6382b9486e92630120
 2011-01-28 12:08:02 -08:00
satok
efa39c573e am 0f28e832: am c9cd29dd: Remove invalid call of "clearFocus" in SetupWizard...... 
* commit '0f28e83298a13328f7cd6147187a56c2a30b3e3f':
  Remove invalid call of "clearFocus" in SetupWizard......
 2011-01-28 09:50:59 -08:00
satok
0f28e83298 am c9cd29dd: Remove invalid call of "clearFocus" in SetupWizard...... 
* commit 'c9cd29ddb832fd76d96fea080abe8325a8bb1bd2':
  Remove invalid call of "clearFocus" in SetupWizard......
 2011-01-28 09:49:34 -08:00
Hung-ying Tyan
18eb39d085 Clear mDialogFragment when it's detached 
and re-associate it when it's re-created.

Before this CL, the association is gone when fragment goes through the pause-resume
cycle.

Similarly, restore onDismiss and onCancel listeners in VpnSettings.onCreateDialog(),
restore states in onCreate() instead of onActivityCreated() so that screen rotation
can be handled correctly.

Now that profiles are shared between Settings instances, always handle state change
in VpnSettings.changeState() so that state changed in one instance can be conveyed
to the other and preferences can be correctly enabled/disabled.

In additions, fix some trivial mistakes in VpnSettings.

Bug: 3396394
Change-Id: I242e1ed6c6d410b4dfefb373d8f98266fc9b46d0
 2011-01-28 23:39:45 +08:00
satok
c9cd29ddb8 Remove invalid call of "clearFocus" in SetupWizard...... 
Bug: 3398097

- Also disabled logging......
- Once you call "clearFocus", onFocusChanged will be called and
  EditText will try to show the keyboard again. And while bringing up the keyboard,
  the activity is changed and it will end up with the keyboard being shown in the next activity...

Change-Id: If4d3876d4950bb2583c5588f462a94d022d6a7cf
 2011-01-28 18:03:47 +09:00
Dianne Hackborn
efe9d71bce am 9a406ea1: am a5082305: Merge "Fix issue #3400255 Dialog fragments crash on rotation in Settings app" into honeycomb 
* commit '9a406ea101401f6f883aadced93b21bdcfa45c0d':
  Fix issue #3400255 Dialog fragments crash on rotation in Settings app
 2011-01-27 23:22:13 -08:00
Dianne Hackborn
9a406ea101 am a5082305: Merge "Fix issue #3400255 Dialog fragments crash on rotation in Settings app" into honeycomb 
* commit 'a5082305e8c4f3107ec1802b9fd911aba1c288f3':
  Fix issue #3400255 Dialog fragments crash on rotation in Settings app
 2011-01-27 23:20:37 -08:00
Dianne Hackborn
a5082305e8 Merge "Fix issue #3400255 Dialog fragments crash on rotation in Settings app" into honeycomb 2011-01-27 23:19:13 -08:00