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

Commit c8d19b89 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Update transient navigation confirmation wording & behavior" into klp-dev

parents 1e4e3825 d67ec25a

core/java/android/provider/Settings.java

+3 −0
Original line number Diff line number Diff line
@@ -4365,6 +4365,9 @@ public final class Settings { 
        /** @hide */

        public static final String BAR_SERVICE_COMPONENT = "bar_service_component";



        /** @hide */

        public static final String TRANSIENT_NAV_CONFIRMATIONS = "transient_nav_confirmations";



        /**

         * This are the settings to be backed up.

         *

core/res/res/layout/toast_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
            android:paddingRight="16dp"

            android:singleLine="true"

            android:textColor="@android:color/white"

            android:textSize="16sp" />

            android:textSize="14sp" />



        <LinearLayout

            android:id="@android:id/button1"

core/res/res/values-land/refs.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 * Copyright (c) 2013, 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.

*/

-->

<resources>

    <item type="string" name="transient_navigation_confirmation">@string/transient_navigation_confirmation_long</item>

</resources>
 
 No newline at end of file

core/res/res/values-sw600dp-port/refs.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 * Copyright (c) 2013, 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.

*/

-->

<resources>

    <item type="string" name="transient_navigation_confirmation">@string/transient_navigation_confirmation_long</item>

</resources>
 
 No newline at end of file

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -1241,4 +1241,8 @@ 
         To do this, add 21407 item to values-mcc214-mnc04/config.xml -->

    <string-array translatable="false" name="config_operatorConsideredNonRoaming">

    </string-array>



    <!-- Threshold (in ms) under which a screen off / screen on will be considered a reset of the

         transient navigation confirmation prompt.-->

    <integer name="config_transient_navigation_confirmation_panic">5000</integer>

</resources>