Commit Graph

5804 Commits

Author SHA1 Message Date
John Reck
07957aa476 am 5159f778: am f01a4710: am 1e2063fb: am d1b16386: am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev
* commit '5159f778f0ea497327bc6efc6029ae95a1d1af05':
  Improve ImageView drawable re-use
2015-07-10 18:57:03 +00:00
John Reck
5159f778f0 am f01a4710: am 1e2063fb: am d1b16386: am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev
* commit 'f01a471060df22ee5c92acdf8effa340b5f568b3':
  Improve ImageView drawable re-use
2015-07-10 18:42:54 +00:00
John Reck
5a1356916d Improve ImageView drawable re-use
Bug 22403868

Initial attempt only helped if setImageBitmap() was the only
thing called but during new-loading content it's common for a
placeholder to be set via setImageDrawable.

Tweak ImageView slightly to just have a BitmapDrawable that it
lazy-creates but will hold on to for any subsequent calls
to setImageBitmap

Change-Id: I7380521c7b363d458e4cda041f1f8b2b1fb3a93a
2015-07-10 10:08:01 -07:00
John Reck
8a76fc5c1a am 66e86347: am 035e1b94: am 19cb0685: am 31ff4513: am b7ba1220: Teach ImageView to recycle internal drawables
* commit '66e86347875abec395c84337767553e101c5a633':
  Teach ImageView to recycle internal drawables
2015-07-10 02:38:22 +00:00
John Reck
66e8634787 am 035e1b94: am 19cb0685: am 31ff4513: am b7ba1220: Teach ImageView to recycle internal drawables
* commit '035e1b94ea25d78be562add377ee85a952caafa3':
  Teach ImageView to recycle internal drawables
2015-07-10 02:23:30 +00:00
John Reck
b7ba1220a3 Teach ImageView to recycle internal drawables
Bug: 22289362

It's pretty common for ImageView#setBitmap to be called
repeatedly. Avoid re-creating the BitmapDrawable in this scenario
as that has high object churn of semi-expensive objects like
Paint.

Change-Id: Ib77719cd0366d02c1a42f774850bf3b9caa9c288
2015-07-09 17:40:41 -07:00
Jun Mukai
a3ef629045 Merge "Introduces mouse actions for popup menu." 2015-07-09 21:12:44 +00:00
Julia Reynolds
5c7599a9d5 am 2ebd9a9c: am 17364a23: am 07ea25a7: am 68e4d688: am 279678e1: Merge "Show a default icon for permissions that lack a group." into mnc-dev
* commit '2ebd9a9cfcb01b3528791e108bbd7f5884577085':
  Show a default icon for permissions that lack a group.
2015-07-09 20:10:31 +00:00
Julia Reynolds
2ebd9a9cfc am 17364a23: am 07ea25a7: am 68e4d688: am 279678e1: Merge "Show a default icon for permissions that lack a group." into mnc-dev
* commit '17364a23929bdfeaa9bda3cbf5c71519268b1a3a':
  Show a default icon for permissions that lack a group.
2015-07-09 19:58:00 +00:00
Julia Reynolds
279678e1ff Merge "Show a default icon for permissions that lack a group." into mnc-dev 2015-07-09 18:58:13 +00:00
Julia Reynolds
d1af446feb Show a default icon for permissions that lack a group.
Bug: 22229417
Change-Id: I82e12504adcca5d3fb6902109a3d7075a4739843
2015-07-09 14:56:46 -04:00
Narayan Kamath
abbdae003a am a11c2f8f: am 49df8dff: am af7cf1c4: am 1601c604: am 14b50394: Reduce overly aggressive use of narrowAm / narrowPm.
* commit 'a11c2f8f6cd5e337746926282b73ca7fa3c4eee5':
  Reduce overly aggressive use of narrowAm / narrowPm.
2015-07-09 11:09:45 +00:00
Narayan Kamath
a11c2f8f6c am 49df8dff: am af7cf1c4: am 1601c604: am 14b50394: Reduce overly aggressive use of narrowAm / narrowPm.
* commit '49df8dff5f7d095af3055ae7dc5ad25f7fc3ad89':
  Reduce overly aggressive use of narrowAm / narrowPm.
2015-07-09 10:57:21 +00:00
Narayan Kamath
14b5039477 Reduce overly aggressive use of narrowAm / narrowPm.
Increase threshold to 4 from 2. Given that this threshold is
applied independently, we now have a few more languages where we
use a mixture of narrow and regular AM/PM markers. Those languages
are : Bodo (brx), Cherokee (chr), Ewe (ee), German Swiss (gsw, not de-CH)
and Makonde (kde).

I've included a full table of diffs in the commit message.

bug: 22208502

1,5c1,5
<     L= af AM= v , PM= n
<     L= af-NA AM= v , PM= n
<     L= af-ZA AM= v , PM= n
<     L= agq AM= a , PM= p
<     L= agq-CM AM= a , PM= p
---
>     L= af AM= vm. , PM= nm.
>     L= af-NA AM= vm. , PM= nm.
>     L= af-ZA AM= vm. , PM= nm.
>     L= agq AM= a.g , PM= a.k
>     L= agq-CM AM= a.g , PM= a.k
9,10c9,10
<     L= am AM= ጠ , PM= ከ
<     L= am-ET AM= ጠ , PM= ከ
---
>     L= am AM= ጥዋት , PM= ከሰዓት
>     L= am-ET AM= ጥዋት , PM= ከሰዓት
68,71c68,71
<     L= br AM= am , PM= gm
<     L= br-FR AM= am , PM= gm
<     L= brx AM= a , PM= p
<     L= brx-IN AM= a , PM= p
---
>     L= br AM= A.M. , PM= G.M.
>     L= br-FR AM= A.M. , PM= G.M.
>     L= brx AM= फुं , PM= p
>     L= brx-IN AM= फुं , PM= p
84,85c84,85
<     L= chr AM= a , PM= p
<     L= chr-US AM= a , PM= p
---
>     L= chr AM= ᏌᎾᎴ , PM= p
>     L= chr-US AM= ᏌᎾᎴ , PM= p
114,119c114,119
<     L= ee AM= a , PM= p
<     L= ee-GH AM= a , PM= p
<     L= ee-TG AM= a , PM= p
<     L= el AM= π , PM= μ
<     L= el-CY AM= π , PM= μ
<     L= el-GR AM= π , PM= μ
---
>     L= ee AM= ŋdi , PM= p
>     L= ee-GH AM= ŋdi , PM= p
>     L= ee-TG AM= ŋdi , PM= p
>     L= el AM= π.μ. , PM= μ.μ.
>     L= el-CY AM= π.μ. , PM= μ.μ.
>     L= el-GR AM= π.μ. , PM= μ.μ.
144c144
<     L= en-GB AM= a , PM= p
---
>     L= en-GB AM= a.m. , PM= p.m.
153c153
<     L= en-IE AM= a , PM= p
---
>     L= en-IE AM= a.m. , PM= p.m.
215c215
<     L= eo AM= a , PM= p
---
>     L= eo AM= atm , PM= ptm
314,315c314,315
<     L= ga AM= a , PM= p
<     L= ga-IE AM= a , PM= p
---
>     L= ga AM= a.m. , PM= p.m.
>     L= ga-IE AM= a.m. , PM= p.m.
318,323c318,323
<     L= gl AM= a , PM= p
<     L= gl-ES AM= a , PM= p
<     L= gsw AM= a , PM= p
<     L= gsw-CH AM= a , PM= p
<     L= gsw-FR AM= a , PM= p
<     L= gsw-LI AM= a , PM= p
---
>     L= gl AM= a.m. , PM= p.m.
>     L= gl-ES AM= a.m. , PM= p.m.
>     L= gsw AM= a , PM= nam.
>     L= gsw-CH AM= a , PM= nam.
>     L= gsw-FR AM= a , PM= nam.
>     L= gsw-LI AM= a , PM= nam.
328,329c328,329
<     L= gv AM= a , PM= p
<     L= gv-IM AM= a , PM= p
---
>     L= gv AM= a.m. , PM= p.m.
>     L= gv-IM AM= a.m. , PM= p.m.
352,353c352,353
<     L= ig AM= a , PM= p
<     L= ig-NG AM= a , PM= p
---
>     L= ig AM= A.M. , PM= P.M.
>     L= ig-NG AM= A.M. , PM= P.M.
356,357c356,357
<     L= is AM= f. , PM= e.
<     L= is-IS AM= f. , PM= e.
---
>     L= is AM= f.h. , PM= e.h.
>     L= is-IS AM= f.h. , PM= e.h.
374,375c374,375
<     L= kde AM= a , PM= p
<     L= kde-TZ AM= a , PM= p
---
>     L= kde AM= Muhi , PM= p
>     L= kde-TZ AM= Muhi , PM= p
409,410c409,410
<     L= kw AM= a , PM= p
<     L= kw-GB AM= a , PM= p
---
>     L= kw AM= a.m. , PM= p.m.
>     L= kw-GB AM= a.m. , PM= p.m.
414,415c414,415
<     L= lag AM= a , PM= p
<     L= lag-TZ AM= a , PM= p
---
>     L= lag AM= TOO , PM= MUU
>     L= lag-TZ AM= TOO , PM= MUU
435,436c435,436
<     L= luy AM= a , PM= p
<     L= luy-KE AM= a , PM= p
---
>     L= luy AM= a.m. , PM= p.m.
>     L= luy-KE AM= a.m. , PM= p.m.
459,465c459,465
<     L= mr AM= स , PM= सं
<     L= mr-IN AM= स , PM= सं
<     L= ms AM= PG , PM= p
<     L= ms-Latn AM= PG , PM= p
<     L= ms-Latn-BN AM= PG , PM= p
<     L= ms-Latn-MY AM= PG , PM= p
<     L= ms-Latn-SG AM= PG , PM= p
---
>     L= mr AM= स , PM= म.उ.
>     L= mr-IN AM= स , PM= म.उ.
>     L= ms AM= PG , PM= PTG
>     L= ms-Latn AM= PG , PM= PTG
>     L= ms-Latn-BN AM= PG , PM= PTG
>     L= ms-Latn-MY AM= PG , PM= PTG
>     L= ms-Latn-SG AM= PG , PM= PTG
474,476c474,476
<     L= nb AM= a , PM= p
<     L= nb-NO AM= a , PM= p
<     L= nb-SJ AM= a , PM= p
---
>     L= nb AM= a.m. , PM= p.m.
>     L= nb-NO AM= a.m. , PM= p.m.
>     L= nb-SJ AM= a.m. , PM= p.m.
490,491c490,491
<     L= nmg AM= a , PM= p
<     L= nmg-CM AM= a , PM= p
---
>     L= nmg AM= maná , PM= kugú
>     L= nmg-CM AM= maná , PM= kugú
515,516c515,516
<     L= ps AM= a , PM= p
<     L= ps-AF AM= a , PM= p
---
>     L= ps AM= غ.م. , PM= غ.و.
>     L= ps-AF AM= غ.م. , PM= غ.و.
527,530c527,530
<     L= qu AM= a , PM= p
<     L= qu-BO AM= a , PM= p
<     L= qu-EC AM= a , PM= p
<     L= qu-PE AM= a , PM= p
---
>     L= qu AM= a.m. , PM= p.m.
>     L= qu-BO AM= a.m. , PM= p.m.
>     L= qu-EC AM= a.m. , PM= p.m.
>     L= qu-PE AM= a.m. , PM= p.m.
572,573c572,573
<     L= si AM= පෙ , PM= ප
<     L= si-LK AM= පෙ , PM= ප
---
>     L= si AM= පෙ , PM= ප.ව.
>     L= si-LK AM= පෙ , PM= ප.ව.
576,577c576,577
<     L= sl AM= d , PM= p
<     L= sl-SI AM= d , PM= p
---
>     L= sl AM= dop. , PM= pop.
>     L= sl-SI AM= dop. , PM= pop.
582,586c582,586
<     L= so AM= a , PM= p
<     L= so-DJ AM= a , PM= p
<     L= so-ET AM= a , PM= p
<     L= so-KE AM= a , PM= p
<     L= so-SO AM= a , PM= p
---
>     L= so AM= sn. , PM= gn.
>     L= so-DJ AM= sn. , PM= gn.
>     L= so-ET AM= sn. , PM= gn.
>     L= so-KE AM= sn. , PM= gn.
>     L= so-SO AM= sn. , PM= gn.
616,617c616,617
<     L= te AM= ఉ , PM= సా
<     L= te-IN AM= ఉ , PM= సా
---
>     L= te AM= [AM] , PM= [PM]
>     L= te-IN AM= [AM] , PM= [PM]

Change-Id: Id87dd3a41b54f4d1e76535c80439e2436346a607
2015-07-09 10:01:31 +00:00
Mady Mellor
2f738d70a1 am d84ab3ea: am b2ff3bd4: am 88e76d88: am e46094c4: am 84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev
* commit 'd84ab3eab06dcce989a9e89c25ba0ecf670e557d':
  Use hint text to position handle / floating tool bar popups
2015-07-09 01:33:42 +00:00
Mady Mellor
d84ab3eab0 am b2ff3bd4: am 88e76d88: am e46094c4: am 84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev
* commit 'b2ff3bd42b06ea8c1a95b830f96d6ffee92d1a3a':
  Use hint text to position handle / floating tool bar popups
2015-07-09 01:14:50 +00:00
Mady Mellor
84005b4049 Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev 2015-07-09 00:06:13 +00:00
Jun Mukai
31f581c5a6 Introduces mouse actions for popup menu.
- mouse hover moves the selected item in the menu. It moves
  the selection rectangle, and further up/down key or enter
  key will start from the hovered item.
- when the mouse exits from the entire popup window, the
  selection is canceled. Further up/down key will start from
  the first item.

To implement these behaviors, and consider about other keyboard
behaviors which is special to menus, I believe it justifies
to create another class for the menu popups rather than using
ListPopupWindow directly.

Bug: 19642104
Change-Id: I5e405c0491c67fdef9764898701119979ec13a9f
2015-07-08 13:18:54 -07:00
Mady Mellor
ff66ca5038 Use hint text to position handle / floating tool bar popups
In situations where the hint text does not match the direction of
the TextView's primary selection, when you copy text, and long press
in that EditText to paste, the cursor would use the direction of the
hint text to be placed, whereas the handle and floating tool bar
used the TextView's direction to be placed so they wouldn't match.

This CL updates the handle view and floating tool bars to use the
hint text direction when appropriate.

Bug: 21480429
Change-Id: I8090a5b2738c035522c307535ffa165ca024e811
2015-07-08 12:31:45 -07:00
Dianne Hackborn
1699ba48ce am 88936b7f: am a719be69: am 15e35270: am 5e449276: am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev
* commit '88936b7f82a6ec4023078e62304425147da4b56e':
  Implement better handling of text in assist.
2015-07-08 02:05:44 +00:00
Alan Viverette
b6bd296f60 am 6dcbc0a5: am 382fe3b8: am 292a1564: am 407630e7: am f12c91f5: Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev
* commit '6dcbc0a578100b0484c199e64be251cbb5212330':
  Remember focused child during layout when adapter has stable IDs
2015-07-08 02:04:57 +00:00
Alan Viverette
b2cc376e8c am 75f4278d: am 3c254aba: am 90433ee7: am e89c65fb: am 8830db0a: Merge "Never fully detach header or footer views in AbsListView" into mnc-dev
* commit '75f4278d73d701191ad82cb0e3b5566feff8d873':
  Never fully detach header or footer views in AbsListView
2015-07-08 02:03:18 +00:00
Dianne Hackborn
88936b7f82 am a719be69: am 15e35270: am 5e449276: am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev
* commit 'a719be69b1e0c8c6723457a51673f5dab8f9f819':
  Implement better handling of text in assist.
2015-07-08 01:39:53 +00:00
Alan Viverette
6dcbc0a578 am 382fe3b8: am 292a1564: am 407630e7: am f12c91f5: Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev
* commit '382fe3b82bda9898fbb288f947c9d85fa507c6c3':
  Remember focused child during layout when adapter has stable IDs
2015-07-08 01:39:15 +00:00
Alan Viverette
75f4278d73 am 3c254aba: am 90433ee7: am e89c65fb: am 8830db0a: Merge "Never fully detach header or footer views in AbsListView" into mnc-dev
* commit '3c254abac56e145dae11d86254bd4a7e0a2b5397':
  Never fully detach header or footer views in AbsListView
2015-07-08 01:37:09 +00:00
Dianne Hackborn
f2474d336a Merge "Implement better handling of text in assist." into mnc-dev 2015-07-07 23:51:06 +00:00
Dianne Hackborn
6f0fdc4167 Implement better handling of text in assist.
TextView is now much smarter about the text it reports, limiting it
to what is visible (plus a bit more).  Also add a facility for it to
report where the lines of text are, both as offsets in the text string
and their baselines on screen.

Part of fixing issue #22328792: Fix scalability issues in AssistStructure

Change-Id: Idddb8c3a3331355f381e2d4af06d520fe7c7ce8e
2015-07-07 16:47:37 -07:00
Alan Viverette
f12c91f5e6 Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev 2015-07-07 23:26:36 +00:00
Alan Viverette
8830db0a6a Merge "Never fully detach header or footer views in AbsListView" into mnc-dev 2015-07-07 21:08:32 +00:00
Andrei Stingaceanu
734d61c2c2 am 4a981c3a: am 8f40a25d: am 5fcfa576: am bb09a7cd: am bc687f96: Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev
* commit '4a981c3a25cdce5d3a5c95beb7c2215476309d45':
  Drag handles persist after lost focus in extracted mode
2015-07-07 19:08:16 +00:00
Alan Viverette
1638133b3f Never fully detach header or footer views in AbsListView
AbsListView has special handling of header and footer views that avoids
full attachment; however, we still need to fully detach and reattach
non-header/footer views that cannot be recycled.

Bug: 22239425
Bug: 22238597
Bug: 22214485
Change-Id: Iae5f954fc76522c0a52d0c25e19985ae0196efa2
2015-07-07 11:04:32 -07:00
Andrei Stingaceanu
4a981c3a25 am 8f40a25d: am 5fcfa576: am bb09a7cd: am bc687f96: Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev
* commit '8f40a25de70bdb6878a5622fce2818039c4fdfbb':
  Drag handles persist after lost focus in extracted mode
2015-07-07 17:34:04 +00:00
Andrei Stingaceanu
bc687f96c7 Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev 2015-07-07 09:14:37 +00:00
Alan Viverette
2b460d08dc Remember focused child during layout when adapter has stable IDs
Ensures behavior is consistent between accessibility focus retention and
keyboard focus retention. Attempts to retain focus when possible.

Bug: 22207825
Change-Id: I62360892f52d456e2128f93a2dbf18f2bc934ef3
2015-07-06 11:01:50 -07:00
Abodunrinwa Toki
1156b48d5b am e91d7908: am 7099e39f: am 8fbe1a0c: Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev
* commit 'e91d790814144c7f9fda350aaa96132008020044':
  Add accessibility actions for the PROCESS_TEXT feature.
2015-07-04 08:06:01 +00:00
Keisuke Kuroyanagi
e2f22f8e56 am fd2b1f02: am 6ebe0bdc: am f3be3ddf: Merge "Fix: Selection handles can remain on home screen." into mnc-dev
* commit 'fd2b1f024e85d8e612be1e1b8d1ded9a1ffdc4da':
  Fix: Selection handles can remain on home screen.
2015-07-04 07:27:54 +00:00
Dianne Hackborn
7e07288c77 am 0783b9a4: am ee987ce4: am 76664d9d: Merge "Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW..." into mnc-dev
* commit '0783b9a47ae682cc85a14284e79643b5087b8c9f':
  Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW...
2015-07-04 07:27:17 +00:00
Abodunrinwa Toki
e91d790814 am 7099e39f: am 8fbe1a0c: Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev
* commit '7099e39f142ff67327ae1a242039fc5f98b76717':
  Add accessibility actions for the PROCESS_TEXT feature.
2015-07-02 02:51:33 +00:00
Abodunrinwa Toki
8fbe1a0cfc Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev 2015-07-02 02:29:34 +00:00
Keisuke Kuroyanagi
fd2b1f024e am 6ebe0bdc: am f3be3ddf: Merge "Fix: Selection handles can remain on home screen." into mnc-dev
* commit '6ebe0bdce26684cb37a2c509a462236f694ae178':
  Fix: Selection handles can remain on home screen.
2015-07-02 01:01:41 +00:00
Dianne Hackborn
0783b9a47a am ee987ce4: am 76664d9d: Merge "Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW..." into mnc-dev
* commit 'ee987ce4206ce741801d7a6193709fdf9867201c':
  Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW...
2015-07-02 01:01:14 +00:00
Keisuke Kuroyanagi
f3be3ddfd8 Merge "Fix: Selection handles can remain on home screen." into mnc-dev 2015-07-01 22:44:53 +00:00
Dianne Hackborn
de15edaa9b Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW...
...to an explicit toggle to enable in Settings

Add a new permission flag, saying the permission can be automatically
granted to pre-api-23 apps.  Apply this to SYSTEM_ALERT_WINDOW.

Change-Id: I24a0ceabe7e9f5e458a864d30eda2696ad14a699
2015-07-01 12:37:00 -07:00
Andrei Stingaceanu
99d3bbdcbf Drag handles persist after lost focus in extracted mode
If extracted mode is to be started and we already had a
selection made do not start the action mode but only the
selection. Non-extracted mode keeps the current behavior.

Bug: 22100966
Change-Id: Iad9a95c28474a68dc4fbc7032cbab1dc6e234d45
2015-07-01 15:59:41 +01:00
Keisuke Kuroyanagi
4712b8ef9e Fix: Selection handles can remain on home screen.
This happened as selection handles are shown even when
selection action mode is not active.

Bug: 22188927
Change-Id: Ifd88b91d98cc6f9b0c578e782144b6eee1bdeec9
2015-07-01 20:06:51 +09:00
Doris Liu
33a9cba550 am 3246ac08: am 94d225d8: am e08f3b3f: Merge "Resolve CompoundButton\'s foreground drawable for layout direction change" into mnc-dev
* commit '3246ac082dde2d307ba7f55b10d32199b914d4a8':
  Resolve CompoundButton's foreground drawable for layout direction change
2015-06-30 22:16:59 +00:00
Doris Liu
8a02858566 am efd9b869: am a5aedadc: am 99aa13ec: Merge "Allow null child view when checking whether divider should draw" into mnc-dev
* commit 'efd9b869d7225af5047352f9ca0180468467d54c':
  Allow null child view when checking whether divider should draw
2015-06-30 22:16:52 +00:00
Doris Liu
3246ac082d am 94d225d8: am e08f3b3f: Merge "Resolve CompoundButton\'s foreground drawable for layout direction change" into mnc-dev
* commit '94d225d80be2b76ed7ad0f64946d81ce15845e1f':
  Resolve CompoundButton's foreground drawable for layout direction change
2015-06-30 22:02:17 +00:00
Doris Liu
efd9b869d7 am a5aedadc: am 99aa13ec: Merge "Allow null child view when checking whether divider should draw" into mnc-dev
* commit 'a5aedadc0b94bab3277e7bf044250edfa41a71f0':
  Allow null child view when checking whether divider should draw
2015-06-30 22:02:12 +00:00
Alan Viverette
b3ce5839d8 am fe7b878f: am d3ddb2f7: am b35e8667: Merge "Handle null argument in ImageView.setImageIcon()" into mnc-dev
* commit 'fe7b878ff507be0cf991e24407a30d75891ac5e2':
  Handle null argument in ImageView.setImageIcon()
2015-06-30 21:54:58 +00:00