mirror of
https://github.com/MatomoCamp/matomocamp-companion-android.git
synced 2024-09-19 16:13:46 +02:00
Fixed problem during menu creation in TrackScheduleEventActivity in
Android 4.0.x
This commit is contained in:
parent
3aa100a2fc
commit
4be572c336
2 changed files with 9 additions and 21 deletions
|
@ -8,10 +8,10 @@
|
|||
style="?android:attr/progressBarStyleLarge"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center" />
|
||||
android:layout_gravity="center"
|
||||
android:visibility="gone" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical" >
|
||||
|
|
|
@ -39,7 +39,6 @@ public class TrackScheduleEventActivity extends ActionBarActivity implements Loa
|
|||
private Track track;
|
||||
private int initialPosition = -1;
|
||||
private View progress;
|
||||
private View content;
|
||||
private ViewPager pager;
|
||||
private TrackScheduleEventAdapter adapter;
|
||||
|
||||
|
@ -50,9 +49,11 @@ public class TrackScheduleEventActivity extends ActionBarActivity implements Loa
|
|||
setContentView(R.layout.track_schedule_event);
|
||||
|
||||
progress = findViewById(R.id.progress);
|
||||
content = findViewById(R.id.content);
|
||||
pager = (ViewPager) findViewById(R.id.pager);
|
||||
adapter = new TrackScheduleEventAdapter(getSupportFragmentManager());
|
||||
pager.setAdapter(adapter);
|
||||
PageIndicator pageIndicator = (PageIndicator) findViewById(R.id.indicator);
|
||||
pageIndicator.setViewPager(pager);
|
||||
|
||||
Bundle extras = getIntent().getExtras();
|
||||
day = extras.getParcelable(EXTRA_DAY);
|
||||
|
@ -71,13 +72,7 @@ public class TrackScheduleEventActivity extends ActionBarActivity implements Loa
|
|||
}
|
||||
|
||||
private void setCustomProgressVisibility(boolean isVisible) {
|
||||
if (isVisible) {
|
||||
progress.setVisibility(View.VISIBLE);
|
||||
content.setVisibility(View.GONE);
|
||||
} else {
|
||||
progress.setVisibility(View.GONE);
|
||||
content.setVisibility(View.VISIBLE);
|
||||
}
|
||||
progress.setVisibility(isVisible ? View.VISIBLE : View.GONE);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -101,19 +96,12 @@ public class TrackScheduleEventActivity extends ActionBarActivity implements Loa
|
|||
|
||||
if (data != null) {
|
||||
adapter.setCursor(data);
|
||||
if (pager.getAdapter() == null) {
|
||||
pager.setAdapter(adapter);
|
||||
|
||||
PageIndicator pageIndicator = (PageIndicator) findViewById(R.id.indicator);
|
||||
pageIndicator.setViewPager(pager);
|
||||
|
||||
if (initialPosition != -1) {
|
||||
pager.setCurrentItem(initialPosition, false);
|
||||
initialPosition = -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLoaderReset(Loader<Cursor> loader) {
|
||||
|
|
Loading…
Reference in a new issue