Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #2119 #2118 #2134

Merged
merged 3 commits into from
Oct 12, 2020
Merged

Fixes #2119 #2118 #2134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b00b83
This commit Fixes #2119 #2118
riturajjain2000 Oct 5, 2020
ef9f446
This commit Fixes #2119 #2118
riturajjain2000 Oct 5, 2020
74e12b0
Made Changes as asked
riturajjain2000 Oct 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,21 @@
<uses-library
android:name="org.apache.http.legacy"
android:required="false" />
<activity android:name=".activity.SoundMeterActivity"></activity>

<activity
android:name=".activity.SoundMeterActivity"
android:screenOrientation="portrait" />
<activity android:name=".activity.CreateConfigActivity" />
<activity
android:name=".activity.ThermometerActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme" />
<activity
android:name=".activity.RoboticArmActivity"
android:screenOrientation="landscape" />
android:screenOrientation="sensorLandscape" />
<activity
android:name=".activity.SplashActivity"
android:screenOrientation="portrait"
android:screenOrientation="user"
android:theme="@style/AppThemeSplash">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down Expand Up @@ -73,7 +76,7 @@
<activity
android:name=".activity.LogicalAnalyzerActivity"
android:configChanges="screenSize|orientation"
android:screenOrientation="landscape" />
android:screenOrientation="sensorLandscape" />
<activity android:name=".activity.SensorDataLoggerActivity" />
<activity
android:name=".activity.MultimeterActivity"
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/io/pslab/activity/MultimeterActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.graphics.Typeface;
import android.location.Location;
Expand Down Expand Up @@ -202,6 +203,9 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
checkConfig();
logTimer();
}
if (getResources().getBoolean(R.bool.isTablet)) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER);
}
}

@Override
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/io/pslab/activity/PowerSourceActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.location.Location;
import android.location.LocationManager;
import android.os.Bundle;
Expand Down Expand Up @@ -329,6 +330,10 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
isPlayingBack = true;
disableButtons();
}

if (getResources().getBoolean(R.bool.isTablet)) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER);
}
}

/**
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.location.Location;
Expand Down Expand Up @@ -495,6 +496,10 @@ public void onClick(View v) {
}
}
});

if (getResources().getBoolean(R.bool.isTablet)) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER);
}
}

public void saveWaveConfig() {
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/res/layout-land/splash_screen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="200dp"
android:alpha="0"
android:contentDescription="@string/pocket_science_logo"
android:src="@drawable/logo"
android:alpha="0"/>
android:src="@drawable/logo" />

<ImageView
android:id="@+id/PSLabText_land"
android:id="@+id/PSLabText"
android:layout_width="320dp"
android:layout_height="94dp"
android:alpha="0"
android:contentDescription="@string/app_name"
android:src="@drawable/text"
android:alpha="0"/>
android:src="@drawable/text" />
</LinearLayout>
Loading