diff options
| author | Simon Wilson <simonwilson@google.com> | 2011-03-14 11:40:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-14 11:40:17 -0700 |
| commit | ee3f6ef2fc7bcfae9d8af8430760388f653a10c8 (patch) | |
| tree | 9e2e4a39580c2cc3eda8b8a3b6a5c99a10e02fb4 | |
| parent | 45660662e61e8cc3ff13144668767a86d1d5b7f4 (diff) | |
| parent | 9999ad20dfc2174f8c1431c93cf46ce0edd30aeb (diff) | |
| download | frameworks_base-ee3f6ef2fc7bcfae9d8af8430760388f653a10c8.zip frameworks_base-ee3f6ef2fc7bcfae9d8af8430760388f653a10c8.tar.gz frameworks_base-ee3f6ef2fc7bcfae9d8af8430760388f653a10c8.tar.bz2 | |
Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
| -rw-r--r-- | core/java/android/provider/Settings.java | 14 | ||||
| -rw-r--r-- | core/res/res/drawable-hdpi/stat_sys_data_fully_inandout_4g.png | bin | 0 -> 1767 bytes | |||
| -rw-r--r-- | core/res/res/drawable-hdpi/stat_sys_data_inandout_4g.png | bin | 0 -> 1817 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/stat_sys_data_fully_inandout_4g.png | bin | 0 -> 1444 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/stat_sys_data_inandout_4g.png | bin | 0 -> 1468 bytes |
5 files changed, 14 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 02c90b4..0ff1976 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2565,6 +2565,14 @@ public final class Settings { "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. * @hide @@ -2701,6 +2709,12 @@ public final class Settings { "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. */ diff --git a/core/res/res/drawable-hdpi/stat_sys_data_fully_inandout_4g.png b/core/res/res/drawable-hdpi/stat_sys_data_fully_inandout_4g.png Binary files differnew file mode 100644 index 0000000..4ff7db3 --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_sys_data_fully_inandout_4g.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_inandout_4g.png b/core/res/res/drawable-hdpi/stat_sys_data_inandout_4g.png Binary files differnew file mode 100644 index 0000000..c5edf2c --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_sys_data_inandout_4g.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_fully_inandout_4g.png b/core/res/res/drawable-mdpi/stat_sys_data_fully_inandout_4g.png Binary files differnew file mode 100644 index 0000000..de8c5ee --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_data_fully_inandout_4g.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_inandout_4g.png b/core/res/res/drawable-mdpi/stat_sys_data_inandout_4g.png Binary files differnew file mode 100644 index 0000000..f407bc9 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_data_inandout_4g.png |
