diff options
author | Doug Zongker <dougz@google.com> | 2014-03-13 08:44:07 -0700 |
---|---|---|
committer | Doug Zongker <dougz@google.com> | 2014-03-13 08:44:07 -0700 |
commit | cfcec9e1d468708269edbd1e8520d1253989aefb (patch) | |
tree | 10485d489baff7a80488b5daf7381916c1fd8b0e /res/images | |
parent | be7eea0a880ed266bb4111dcc3a2159fdb8791d5 (diff) | |
parent | ea868b3846794cd36424f477503377ea9348137a (diff) | |
download | bootable_recovery-cfcec9e1d468708269edbd1e8520d1253989aefb.tar.gz bootable_recovery-cfcec9e1d468708269edbd1e8520d1253989aefb.tar.bz2 bootable_recovery-cfcec9e1d468708269edbd1e8520d1253989aefb.zip |
Merge commit 'ea868b38' into manualmerge
Conflicts:
screen_ui.cpp
screen_ui.h
Change-Id: Iefe7dde04cc76639f56730a19238436073f18ffb
Diffstat (limited to 'res/images')
-rw-r--r-- | res/images/icon_installing.png | bin | 25261 -> 118562 bytes |
-rw-r--r-- | res/images/icon_installing_overlay01.png | bin | 10095 -> 0 bytes |
-rw-r--r-- | res/images/icon_installing_overlay02.png | bin | 9990 -> 0 bytes |
-rw-r--r-- | res/images/icon_installing_overlay03.png | bin | 9782 -> 0 bytes |
-rw-r--r-- | res/images/icon_installing_overlay04.png | bin | 9817 -> 0 bytes |
-rw-r--r-- | res/images/icon_installing_overlay05.png | bin | 9863 -> 0 bytes |
-rw-r--r-- | res/images/icon_installing_overlay06.png | bin | 9944 -> 0 bytes |
-rw-r--r-- | res/images/icon_installing_overlay07.png | bin | 10062 -> 0 bytes |
-rw-r--r-- | res/images/indeterminate01.png | bin | 673 -> 0 bytes |
-rw-r--r-- | res/images/indeterminate02.png | bin | 687 -> 0 bytes |
-rw-r--r-- | res/images/indeterminate03.png | bin | 661 -> 0 bytes |
-rw-r--r-- | res/images/indeterminate04.png | bin | 665 -> 0 bytes |
-rw-r--r-- | res/images/indeterminate05.png | bin | 683 -> 0 bytes |
-rw-r--r-- | res/images/indeterminate06.png | bin | 676 -> 0 bytes |
14 files changed, 0 insertions, 0 deletions
diff --git a/res/images/icon_installing.png b/res/images/icon_installing.png Binary files differindex 571eb8b..c2c0201 100644 --- a/res/images/icon_installing.png +++ b/res/images/icon_installing.png diff --git a/res/images/icon_installing_overlay01.png b/res/images/icon_installing_overlay01.png Binary files differdeleted file mode 100644 index e762d6c..0000000 --- a/res/images/icon_installing_overlay01.png +++ /dev/null diff --git a/res/images/icon_installing_overlay02.png b/res/images/icon_installing_overlay02.png Binary files differdeleted file mode 100644 index f7a8530..0000000 --- a/res/images/icon_installing_overlay02.png +++ /dev/null diff --git a/res/images/icon_installing_overlay03.png b/res/images/icon_installing_overlay03.png Binary files differdeleted file mode 100644 index 1a1d738..0000000 --- a/res/images/icon_installing_overlay03.png +++ /dev/null diff --git a/res/images/icon_installing_overlay04.png b/res/images/icon_installing_overlay04.png Binary files differdeleted file mode 100644 index a74903d..0000000 --- a/res/images/icon_installing_overlay04.png +++ /dev/null diff --git a/res/images/icon_installing_overlay05.png b/res/images/icon_installing_overlay05.png Binary files differdeleted file mode 100644 index d17bdc0..0000000 --- a/res/images/icon_installing_overlay05.png +++ /dev/null diff --git a/res/images/icon_installing_overlay06.png b/res/images/icon_installing_overlay06.png Binary files differdeleted file mode 100644 index 1200b75..0000000 --- a/res/images/icon_installing_overlay06.png +++ /dev/null diff --git a/res/images/icon_installing_overlay07.png b/res/images/icon_installing_overlay07.png Binary files differdeleted file mode 100644 index 3838a85..0000000 --- a/res/images/icon_installing_overlay07.png +++ /dev/null diff --git a/res/images/indeterminate01.png b/res/images/indeterminate01.png Binary files differdeleted file mode 100644 index 933528d..0000000 --- a/res/images/indeterminate01.png +++ /dev/null diff --git a/res/images/indeterminate02.png b/res/images/indeterminate02.png Binary files differdeleted file mode 100644 index d760e2b..0000000 --- a/res/images/indeterminate02.png +++ /dev/null diff --git a/res/images/indeterminate03.png b/res/images/indeterminate03.png Binary files differdeleted file mode 100644 index 0e97399..0000000 --- a/res/images/indeterminate03.png +++ /dev/null diff --git a/res/images/indeterminate04.png b/res/images/indeterminate04.png Binary files differdeleted file mode 100644 index c7d5b4e..0000000 --- a/res/images/indeterminate04.png +++ /dev/null diff --git a/res/images/indeterminate05.png b/res/images/indeterminate05.png Binary files differdeleted file mode 100644 index d6fb2a0..0000000 --- a/res/images/indeterminate05.png +++ /dev/null diff --git a/res/images/indeterminate06.png b/res/images/indeterminate06.png Binary files differdeleted file mode 100644 index 4486761..0000000 --- a/res/images/indeterminate06.png +++ /dev/null |