| commit | 14683023a73a4dd654dbb4fe0e018109aeda5c08 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Wed Sep 21 06:59:11 2011 -0700 |
| committer | The Android Automerger <android-build@android.com> | Wed Sep 21 06:59:11 2011 -0700 |
| tree | 7d2700395782253d999b063260df3e2db065d62f | |
| parent | fdfb636336dd848621e1a1401b1cd1ef29a0a060 [diff] | |
| parent | 512d1239bd65d1d730eac609fd687690639ab07d [diff] |
merge in ics-release history after reset to master
diff --git a/res/images/icon_error.png b/res/images/icon_error.png old mode 100755 new mode 100644 index 795740f..cb3d1ab --- a/res/images/icon_error.png +++ b/res/images/icon_error.png Binary files differ
diff --git a/res/images/icon_installing.png b/res/images/icon_installing.png index 3300cd7..571eb8b 100644 --- a/res/images/icon_installing.png +++ b/res/images/icon_installing.png Binary files differ
diff --git a/res/images/icon_installing_overlay01.png b/res/images/icon_installing_overlay01.png index ac98efa..e762d6c 100644 --- a/res/images/icon_installing_overlay01.png +++ b/res/images/icon_installing_overlay01.png Binary files differ
diff --git a/res/images/icon_installing_overlay02.png b/res/images/icon_installing_overlay02.png index bfc1cf8..f7a8530 100644 --- a/res/images/icon_installing_overlay02.png +++ b/res/images/icon_installing_overlay02.png Binary files differ
diff --git a/res/images/icon_installing_overlay03.png b/res/images/icon_installing_overlay03.png index 145fc79..1a1d738 100644 --- a/res/images/icon_installing_overlay03.png +++ b/res/images/icon_installing_overlay03.png Binary files differ
diff --git a/res/images/icon_installing_overlay04.png b/res/images/icon_installing_overlay04.png index ef1074a..a74903d 100644 --- a/res/images/icon_installing_overlay04.png +++ b/res/images/icon_installing_overlay04.png Binary files differ
diff --git a/res/images/icon_installing_overlay05.png b/res/images/icon_installing_overlay05.png index edc0d35..d17bdc0 100644 --- a/res/images/icon_installing_overlay05.png +++ b/res/images/icon_installing_overlay05.png Binary files differ
diff --git a/res/images/icon_installing_overlay06.png b/res/images/icon_installing_overlay06.png index 3a00af5..1200b75 100644 --- a/res/images/icon_installing_overlay06.png +++ b/res/images/icon_installing_overlay06.png Binary files differ
diff --git a/res/images/icon_installing_overlay07.png b/res/images/icon_installing_overlay07.png index b9f9e17..3838a85 100644 --- a/res/images/icon_installing_overlay07.png +++ b/res/images/icon_installing_overlay07.png Binary files differ
diff --git a/ui.c b/ui.c index d08f7d3..25df3d0 100644 --- a/ui.c +++ b/ui.c
@@ -45,7 +45,7 @@ 6, // indeterminate progress bar frames 20, // fps 7, // installation icon frames (0 == static image) - 33, 83, // installation icon overlay offset + 13, 190, // installation icon overlay offset }; static pthread_mutex_t gUpdateMutex = PTHREAD_MUTEX_INITIALIZER;
