diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-12-27 09:41:07 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-12-27 09:41:07 -0800 |
| commit | 354b0e6d4ac3cde84af0a61fc5e9315d7d43086d (patch) | |
| tree | 67902ba1c3116ed9d50408614c04eb6d727d3fee /src | |
| parent | 7e8e48d7a2fb0300e64295b78556f02ec26a58e1 (diff) | |
| parent | a8838e65806dbf5357faf2febe872d65ea0aedb2 (diff) | |
| download | android_packages_apps_Snap-354b0e6d4ac3cde84af0a61fc5e9315d7d43086d.tar.gz android_packages_apps_Snap-354b0e6d4ac3cde84af0a61fc5e9315d7d43086d.tar.bz2 android_packages_apps_Snap-354b0e6d4ac3cde84af0a61fc5e9315d7d43086d.zip | |
Merge "SnapdragonCamera: Modify ManualExposure time from ms to ns"
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/SettingsActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java index 52cd04ac3..79c9bfcc0 100755 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -193,7 +193,7 @@ public class SettingsActivity extends PreferenceActivity { alert.show(); } else if (manualExposureMode.equals(expTimePriority)) { alert.setMessage("Enter exposure time in the range of " + exposureRange[0] - + "ms to " + exposureRange[1] + "ms"); + + "ns to " + exposureRange[1] + "ns"); linear.addView(ExpTimeInput); linear.addView(ExpTimeText); alert.setView(linear); @@ -225,7 +225,7 @@ public class SettingsActivity extends PreferenceActivity { final TextView ExpTimeRangeText = new TextView(this); ISORangeText.setText("Enter ISO in the range of " + isoRange[0] + " to " + isoRange[1]); ExpTimeRangeText.setText("Enter exposure time in the range of " + exposureRange[0] - + "ms to " + exposureRange[1] + "ms"); + + "ns to " + exposureRange[1] + "ns"); linear.addView(ISORangeText); linear.addView(ISOinput); linear.addView(ISOtext); |