summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2013-12-09 21:16:41 +0100
committerArne Schwabe <arne@rfc2549.org>2013-12-09 21:16:41 +0100
commit08eb0e7ef5b3e19d2b5768ab9a05003ad41f9cfc (patch)
tree2cb6311d0b064f00bf3e77a00b2433564ae964af /src
parentff97fd341d3dd022e827a1b7e0e854e556be519e (diff)
Fix attach vs inflate layout
--HG-- extra : rebase_source : 9d274f32022799450007dae251548c490f39f4bf
Diffstat (limited to 'src')
-rw-r--r--src/de/blinkt/openvpn/fragments/LogFragment.java16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/de/blinkt/openvpn/fragments/LogFragment.java b/src/de/blinkt/openvpn/fragments/LogFragment.java
index a2a6e3c4..c289580c 100644
--- a/src/de/blinkt/openvpn/fragments/LogFragment.java
+++ b/src/de/blinkt/openvpn/fragments/LogFragment.java
@@ -67,6 +67,7 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar.
private TextView mUpStatus;
private TextView mDownStatus;
private TextView mConnectStatus;
+ private boolean mShowOptionsLayout;
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
@@ -608,10 +609,25 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar.
mUpStatus = (TextView) v.findViewById(R.id.speedUp);
mDownStatus = (TextView) v.findViewById(R.id.speedDown);
mConnectStatus = (TextView) v.findViewById(R.id.speedStatus);
+ if (mShowOptionsLayout)
+ mOptionsLayout.setVisibility(View.VISIBLE);
return v;
}
@Override
+<<<<<<< mine
+=======
+ public void onAttach(Activity activity) {
+ super.onAttach(activity);
+ if(getResources().getBoolean(R.bool.logSildersAlwaysVisible)) {
+ mShowOptionsLayout=true;
+ if (mOptionsLayout!= null)
+ mOptionsLayout.setVisibility(View.VISIBLE);
+ }
+ }
+
+ @Override
+>>>>>>> theirs
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);