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

Commit ee3f6ef2 authored by Simon Wilson's avatar Simon Wilson Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread

parents 45660662 9999ad20

core/java/android/provider/Settings.java

+14 −0
Original line number Diff line number Diff line
@@ -2564,6 +2564,14 @@ public final class Settings { 
        public static final String WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY =

                "wifi_networks_available_repeat_delay";



        /**

         * Whether to nofity the user of WiMAX network.

         * If WiMAX is connected or disconnected, we will put this notification up.

         * @hide

         */

        public static final String WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON =

                "wimax_networks_available_notification_on";



        /**

         * The number of radio channels that are allowed in the local

         * 802.11 regulatory domain.
@@ -2700,6 +2708,12 @@ public final class Settings { 
        public static final String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS =

            "wifi_mobile_data_transition_wakelock_timeout_ms";



        /**

         * Whether the Wimax should be on.  Only the WiMAX service should touch this.

         * @hide

         */

        public static final String WIMAX_ON = "wimax_on";



        /**

         * Whether background data usage is allowed by the user. See

         * ConnectivityManager for more info.

core/res/res/drawable-hdpi/stat_sys_data_fully_inandout_4g.png

0 → 100644
+1.73 KiB
Loading image diff...

core/res/res/drawable-hdpi/stat_sys_data_inandout_4g.png

0 → 100644
+1.77 KiB
Loading image diff...

core/res/res/drawable-mdpi/stat_sys_data_fully_inandout_4g.png

0 → 100644
+1.41 KiB
Loading image diff...

core/res/res/drawable-mdpi/stat_sys_data_inandout_4g.png

0 → 100644
+1.43 KiB
Loading image diff...