am 34763928: Merge "add ART for inet connection condition" into gingerbread

Merge commit '34763928c995a15ee0b9ecfb7c0f4772ef20f2ea' into gingerbread-plus-aosp

* commit '34763928c995a15ee0b9ecfb7c0f4772ef20f2ea':
  add ART for inet connection condition
This commit is contained in:
Robert Greenwalt
2010-09-10 10:06:54 -07:00
committed by Android Git Automerger
75 changed files with 24 additions and 24 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 843 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 880 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1017 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 892 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 832 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 833 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 838 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 808 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 757 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 719 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 724 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 669 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 770 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 682 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 683 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 655 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 820 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 768 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 735 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 739 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 654 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 743 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 768 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 785 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 807 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 826 B

View File

@@ -242,30 +242,30 @@ public class StatusBarPolicy {
R.drawable.stat_sys_data_in_g, R.drawable.stat_sys_data_in_g,
R.drawable.stat_sys_data_out_g, R.drawable.stat_sys_data_out_g,
R.drawable.stat_sys_data_inandout_g }, R.drawable.stat_sys_data_inandout_g },
{ R.drawable.stat_sys_roaming_cdma_0, { R.drawable.stat_sys_data_fully_connected_g,
R.drawable.stat_sys_roaming_cdma_0, R.drawable.stat_sys_data_fully_in_g,
R.drawable.stat_sys_roaming_cdma_0, R.drawable.stat_sys_data_fully_out_g,
R.drawable.stat_sys_roaming_cdma_0 } R.drawable.stat_sys_data_fully_inandout_g }
}; };
private static final int[][] sDataNetType_3g = { private static final int[][] sDataNetType_3g = {
{ R.drawable.stat_sys_data_connected_3g, { R.drawable.stat_sys_data_connected_3g,
R.drawable.stat_sys_data_in_3g, R.drawable.stat_sys_data_in_3g,
R.drawable.stat_sys_data_out_3g, R.drawable.stat_sys_data_out_3g,
R.drawable.stat_sys_data_inandout_3g }, R.drawable.stat_sys_data_inandout_3g },
{ R.drawable.stat_sys_roaming_cdma_0, { R.drawable.stat_sys_data_fully_connected_3g,
R.drawable.stat_sys_roaming_cdma_0, R.drawable.stat_sys_data_fully_in_3g,
R.drawable.stat_sys_roaming_cdma_0, R.drawable.stat_sys_data_fully_out_3g,
R.drawable.stat_sys_roaming_cdma_0 } R.drawable.stat_sys_data_fully_inandout_3g }
}; };
private static final int[][] sDataNetType_e = { private static final int[][] sDataNetType_e = {
{ R.drawable.stat_sys_data_connected_e, { R.drawable.stat_sys_data_connected_e,
R.drawable.stat_sys_data_in_e, R.drawable.stat_sys_data_in_e,
R.drawable.stat_sys_data_out_e, R.drawable.stat_sys_data_out_e,
R.drawable.stat_sys_data_inandout_e }, R.drawable.stat_sys_data_inandout_e },
{ R.drawable.stat_sys_roaming_cdma_0, { R.drawable.stat_sys_data_fully_connected_e,
R.drawable.stat_sys_roaming_cdma_0, R.drawable.stat_sys_data_fully_in_e,
R.drawable.stat_sys_roaming_cdma_0, R.drawable.stat_sys_data_fully_out_e,
R.drawable.stat_sys_roaming_cdma_0 } R.drawable.stat_sys_data_fully_inandout_e }
}; };
//3.5G //3.5G
private static final int[][] sDataNetType_h = { private static final int[][] sDataNetType_h = {
@@ -273,10 +273,10 @@ public class StatusBarPolicy {
R.drawable.stat_sys_data_in_h, R.drawable.stat_sys_data_in_h,
R.drawable.stat_sys_data_out_h, R.drawable.stat_sys_data_out_h,
R.drawable.stat_sys_data_inandout_h }, R.drawable.stat_sys_data_inandout_h },
{ R.drawable.stat_sys_roaming_cdma_0, { R.drawable.stat_sys_data_fully_connected_h,
R.drawable.stat_sys_roaming_cdma_0, R.drawable.stat_sys_data_fully_in_h,
R.drawable.stat_sys_roaming_cdma_0, R.drawable.stat_sys_data_fully_out_h,
R.drawable.stat_sys_roaming_cdma_0 } R.drawable.stat_sys_data_fully_inandout_h }
}; };
//CDMA //CDMA
@@ -286,10 +286,10 @@ public class StatusBarPolicy {
R.drawable.stat_sys_data_in_1x, R.drawable.stat_sys_data_in_1x,
R.drawable.stat_sys_data_out_1x, R.drawable.stat_sys_data_out_1x,
R.drawable.stat_sys_data_inandout_1x }, R.drawable.stat_sys_data_inandout_1x },
{ R.drawable.stat_sys_roaming_cdma_0, { R.drawable.stat_sys_data_fully_connected_1x,
R.drawable.stat_sys_roaming_cdma_0, R.drawable.stat_sys_data_fully_in_1x,
R.drawable.stat_sys_roaming_cdma_0, R.drawable.stat_sys_data_fully_out_1x,
R.drawable.stat_sys_roaming_cdma_0 } R.drawable.stat_sys_data_fully_inandout_1x }
}; };
// Assume it's all good unless we hear otherwise. We don't always seem // Assume it's all good unless we hear otherwise. We don't always seem
@@ -320,10 +320,10 @@ public class StatusBarPolicy {
R.drawable.stat_sys_wifi_signal_2, R.drawable.stat_sys_wifi_signal_2,
R.drawable.stat_sys_wifi_signal_3, R.drawable.stat_sys_wifi_signal_3,
R.drawable.stat_sys_wifi_signal_4 }, R.drawable.stat_sys_wifi_signal_4 },
{ R.drawable.stat_sys_data_in_e, { R.drawable.stat_sys_wifi_signal_1_fully,
R.drawable.stat_sys_data_in_e, R.drawable.stat_sys_wifi_signal_2_fully,
R.drawable.stat_sys_data_in_e, R.drawable.stat_sys_wifi_signal_3_fully,
R.drawable.stat_sys_data_in_e } R.drawable.stat_sys_wifi_signal_4_fully }
}; };
private static final int sWifiTemporarilyNotConnectedImage = private static final int sWifiTemporarilyNotConnectedImage =
R.drawable.stat_sys_wifi_signal_0; R.drawable.stat_sys_wifi_signal_0;