Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9578a2b authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Settings: Add logical camera default switch 

Add a switch to make logical camera as default camera (with smaller
camera id) for 3rd party app.

Test: Manually using Settings app, RunSettingsRoboTests
Bug: 77600932
Change-Id: I86c7f3b9830fb376b324621feb31cdfac59faee5
Merged-In: I86c7f3b9830fb376b324621feb31cdfac59faee5
parent e3319d04

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ 
    <!-- Whether to show Camera laser sensor switch in Developer Options -->

    <bool name="config_show_camera_laser_sensor">false</bool>



    <!-- Whether to show logical camera default switch in Developer Options -->

    <bool name="config_show_logical_camera_default">false</bool>



    <!-- Whether to show Connected MAC Randomization in Developer Options

         as not all devices can support dynamic MAC address change.  -->

    <bool name="config_wifi_support_connected_mac_randomization">false</bool>

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -9107,6 +9107,9 @@ 
    <!-- Title for Camera laser sensor switch [CHAR LIMIT=NONE] -->

    <string name="camera_laser_sensor_switch">Camera Laser Sensor</string>









    <!-- Title for logical camera default switch [CHAR LIMIT=NONE] -->









    <string name="logical_camera_default_switch">Logical Camera As Default</string>

















    <!-- Title of the setting to disable the automatic update -->









    <string name="ota_disable_automatic_update">Automatic system updates</string>

































res/xml/development_settings.xml



+4
−0






























Original line number
Diff line number
Diff line







@@ -192,6 +192,10 @@







            android:key="camera_laser_sensor_switch"









            android:title="@string/camera_laser_sensor_switch" />



















        <SwitchPreference









            android:key="logical_camera_default_switch"









            android:title="@string/logical_camera_default_switch" />



















        <Preference









            android:key="feature_flags_dashboard"









            android:title="@string/feature_flags_dashboard_title"
































src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java



+1
−0






























Original line number
Diff line number
Diff line







@@ -397,6 +397,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra







        controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle));









        controllers.add(new ConnectivityMonitorPreferenceController(context));









        controllers.add(new CameraLaserSensorPreferenceController(context));









        controllers.add(new LogicalCameraDefaultPreferenceController(context));









        controllers.add(new WifiDisplayCertificationPreferenceController(context));









        controllers.add(new WifiVerboseLoggingPreferenceController(context));









        controllers.add(new WifiConnectedMacRandomizationPreferenceController(context));
































src/com/android/settings/development/LogicalCameraDefaultPreferenceController.java
0 → 100644



+90
−0






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2018 The Android Open Source Project









 *









 * Licensed under the Apache License, Version 2.0 (the "License");









 * you may not use this file except in compliance with the License.









 * You may obtain a copy of the License at









 *









 *      http://www.apache.org/licenses/LICENSE-2.0









 *









 * Unless required by applicable law or agreed to in writing, software









 * distributed under the License is distributed on an "AS IS" BASIS,









 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.









 * See the License for the specific language governing permissions and









 * limitations under the License.









 */



















package com.android.settings.development;



















import android.content.Context;









import android.os.SystemProperties;









import android.support.v14.preference.SwitchPreference;









import android.support.v7.preference.Preference;









import android.text.TextUtils;



















import com.android.internal.annotations.VisibleForTesting;









import com.android.settings.R;









import com.android.settings.core.PreferenceControllerMixin;









import com.android.settingslib.development.DeveloperOptionsPreferenceController;



















public class LogicalCameraDefaultPreferenceController extends DeveloperOptionsPreferenceController









        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {



















    private static final String KEY_LOGICAL_CAMERA_DEFAULT_SWITCH = "logical_camera_default_switch";









    @VisibleForTesting









    static final String BUILD_TYPE = "ro.build.type";









    @VisibleForTesting









    static final String PROPERTY_LOGICAL_CAMERA_DEFAULT = "persist.camera.logical.default";









    @VisibleForTesting









    static final int ENABLED = 1;









    @VisibleForTesting









    static final int DISABLED = 0;









    @VisibleForTesting









    static final String USERDEBUG_BUILD = "userdebug";









    @VisibleForTesting









    static final String ENG_BUILD = "eng";









    @VisibleForTesting









    static final String USER_BUILD = "user";



















    public LogicalCameraDefaultPreferenceController(Context context) {









        super(context);









    }



















    @Override









    public boolean isAvailable() {









        return mContext.getResources().getBoolean(R.bool.config_show_logical_camera_default);









    }



















    @Override









    public String getPreferenceKey() {









        return KEY_LOGICAL_CAMERA_DEFAULT_SWITCH;









    }



















    @Override









    public boolean onPreferenceChange(Preference preference, Object newValue) {









        final boolean isEnabled = (Boolean) newValue;









        String value = Integer.toString(isEnabled ? ENABLED : DISABLED);









        SystemProperties.set(PROPERTY_LOGICAL_CAMERA_DEFAULT, value);









        return true;









    }



















    @Override









    public void updateState(Preference preference) {









        final boolean enabled = isLogicalCameraDefault();









        ((SwitchPreference) mPreference).setChecked(enabled);









    }



















    @Override









    protected void onDeveloperOptionsSwitchDisabled() {









        super.onDeveloperOptionsSwitchDisabled();









        SystemProperties.set(PROPERTY_LOGICAL_CAMERA_DEFAULT, Integer.toString(DISABLED));









        ((SwitchPreference) mPreference).setChecked(false);









    }



















    private boolean isLogicalCameraDefault() {









        final String prop = SystemProperties.get(PROPERTY_LOGICAL_CAMERA_DEFAULT,









                Integer.toString(DISABLED));









        return TextUtils.equals(Integer.toString(ENABLED), prop);









    }



















}