Commit Graph

3828 Commits

Author SHA1 Message Date
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
Dianne Hackborn
300768fea5 Fix issue #3400255 Dialog fragments crash on rotation in Settings app
Change-Id: I337c1fb41e3fbedd7982418df497487481bb35d2
2011-01-27 20:39:21 -08:00
Jake Hamby
a6d9fce2e1 Don't display extra A2DP profile icon for OPP.
The getDrawableResource() method for OppProfileManager was returning
the resource ID for the A2DP icon. This was causing an extra headset
icon to be drawn for devices supporting OPP, when no icon should be
shown for this profile. Changed to return 0.

Bug: 3368197
Change-Id: Idcadaf59fe53301544cda215ca24f15608b2d727
2011-01-27 20:32:21 -08:00
Justin Ho
738516b70b am f74f870b: am 3b3af8d3: Merge "Updating Delete and Refresh icons to Honeycomb style" into honeycomb
* commit 'f74f870ba135d8a5e8e7b99b0089c88f516881d1':
  Updating Delete and Refresh icons to Honeycomb style
2011-01-27 19:10:23 -08:00
Justin Ho
f74f870ba1 am 3b3af8d3: Merge "Updating Delete and Refresh icons to Honeycomb style" into honeycomb
* commit '3b3af8d3b0e6f76c355ce5363ed4c582f620cc4e':
  Updating Delete and Refresh icons to Honeycomb style
2011-01-27 19:08:25 -08:00
Justin Ho
3b3af8d3b0 Merge "Updating Delete and Refresh icons to Honeycomb style" into honeycomb 2011-01-27 19:06:24 -08:00
Jake Hamby
8a8dac1c42 am 792fb594: am 3d1fd57e: Increase size of BT profile icons and decrease alpha for inactive profiles
* commit '792fb594d58358eee869f69b4000b50c2a235033':
  Increase size of BT profile icons and decrease alpha for inactive profiles
2011-01-27 18:40:51 -08:00
Jake Hamby
792fb594d5 am 3d1fd57e: Increase size of BT profile icons and decrease alpha for inactive profiles
* commit '3d1fd57e3063d9501266dc46e13df63eb4ba685a':
  Increase size of BT profile icons and decrease alpha for inactive profiles
2011-01-27 18:38:58 -08:00
Jake Hamby
3d1fd57e30 Increase size of BT profile icons and decrease alpha for inactive profiles
Increase the size of the Bluetooth profile icons from 20dp to 30dp.
Decrease the alpha for disabled profile icons to 50% of theme default.

Bug: 3400851
Change-Id: Ieb5ecb01ccbd7185d383828e0d9c9f78525ee0c4
2011-01-27 18:33:17 -08:00
Justin Ho
8472b1b60d Updating Delete and Refresh icons to Honeycomb style
Bug: 3362749
Change-Id: Ib4b61c9e7db05b0627c1f353d3747268455dab6c
2011-01-27 17:59:23 -08:00
Amith Yamasani
2b47976885 am 6a66b5c8: am a4035aef: Merge "Use the correct resource id for Battery use shortcut title." into honeycomb
* commit '6a66b5c861bc3fcf8af2c8592c071d52809998d0':
  Use the correct resource id for Battery use shortcut title.
2011-01-27 15:16:43 -08:00
Jake Hamby
f870c1926c am f2941db7: am 6d509d2f: Merge "Fix settings NPE crash on launch." into honeycomb
* commit 'f2941db77a82cff807e2318b4780dfd7e9c83823':
  Fix settings NPE crash on launch.
2011-01-27 15:11:13 -08:00
Justin Ho
f994c3165e am 8d263307: am c5708925: Adding missing hdpi assets
* commit '8d2633075f8b2459656beb5ade5235465a6ed9e3':
  Adding missing hdpi assets
2011-01-27 15:11:08 -08:00
Amith Yamasani
6a66b5c861 am a4035aef: Merge "Use the correct resource id for Battery use shortcut title." into honeycomb
* commit 'a4035aef92132ec1e74e3af15f0adad9c1913ae4':
  Use the correct resource id for Battery use shortcut title.
2011-01-27 15:11:04 -08:00
Amith Yamasani
a4035aef92 Merge "Use the correct resource id for Battery use shortcut title." into honeycomb 2011-01-27 15:08:34 -08:00