Commit graph

13612 commits

Author SHA1 Message Date
Baligh Uddin
4059c22252 Import translations. DO NOT MERGE
Change-Id: I4f23306d49380f81b06494d1c4f21fbfbda7630e
Auto-generated-cl: translation import
2015-09-18 10:49:23 -07:00
Baligh Uddin
b57930a497 Import translations. DO NOT MERGE
Change-Id: Id52eaa6c87a18034b448d4404b571ce02a568031
Auto-generated-cl: translation import
2015-09-18 10:48:32 -07:00
Russell Brenner
c3cc203e4a am f52bae18: Don\'t show download toast during SUW
* commit 'f52bae18050b8955b8afeb1cb573d42ac6e260c0':
  Don't show download toast during SUW
2015-09-01 21:38:16 +00:00
Russell Brenner
f52bae1805 Don't show download toast during SUW
Check to see if setup wizard is running before showing toast to
inform user that a download was started. Note that this will only
affect the device owner; when adding new users later, the toast
will still appear. (The USER_SETUP_COMPLETE flag is hidden from
the SDK, while DEVICE_PROVISIONED remains available.)

Bug: 22594336
Change-Id: I57c42d6f821714b71cbb066e82bba2a1dbab4951
2015-08-25 17:39:00 +00:00
Mohammadinamul Sheik
81f9a0d8f3 am a289e139: am b0dd5cc7: Fix the ellipses image scaling of LatinIME
* commit 'a289e13927e7cd2e3d16edb96f56ced777b4c920':
  Fix the ellipses image scaling of LatinIME
2015-08-12 20:37:57 +00:00
Mohammadinamul Sheik
a289e13927 am b0dd5cc7: Fix the ellipses image scaling of LatinIME
* commit 'b0dd5cc7b235bf6e0aa59e83a58b1e902a2ff372':
  Fix the ellipses image scaling of LatinIME
2015-08-12 20:28:43 +00:00
Mohammadinamul Sheik
b0dd5cc7b2 Fix the ellipses image scaling of LatinIME
Bug: 23082844
Change-Id: I7baac5e5a0700280906fd0f5f9351fc8dfc4c2b3
(cherry picked from commit 990e9a75b6d88ba234131612f11eac6b69c1cf84)
2015-08-12 18:03:44 +00:00
Geoff Mendal
cc30f06888 Import translations. DO NOT MERGE
Change-Id: I9327dbfb97dc99e7c6b408d41ef97b620dc4b9a8
Auto-generated-cl: translation import
2015-07-31 20:05:51 -07:00
Geoff Mendal
af309ba046 Import translations. DO NOT MERGE
Change-Id: I27869e5a8e6238b2a9eb3948c6474f94d3817268
Auto-generated-cl: translation import
2015-07-29 16:05:32 -07:00
Geoff Mendal
0497f6d34d Import translations. DO NOT MERGE
Change-Id: I5894bc3e87ed62aa351d7545df7d9901ea115877
Auto-generated-cl: translation import
2015-07-29 16:04:36 -07:00
Mohammadinamul Sheik
234fc82508 am 464da87f: [LatinIME] bring back use_personliazed_dicts_summary resource.
* commit '464da87f3746af38aed787602beb48841d3075ae':
  [LatinIME] bring back use_personliazed_dicts_summary resource.
2015-07-29 16:31:08 +00:00
Mohammadinamul Sheik
464da87f37 [LatinIME] bring back use_personliazed_dicts_summary resource.
Bug: 22779653
Change-Id: Ia6af57e9a6ea59faf01c2587bab133136c5fc73a
(cherry picked from commit 6be49e8a9a26242cc9c49549c3a015662461fc48)
2015-07-28 23:06:10 +00:00
Mohammadinamul Sheik
ca8053d7f3 am 707ca769: Handle Cloud Sync and SpellChecker settings when permission changed
* commit '707ca7692a8666989b3fbe860bee28115103988e':
  Handle Cloud Sync and SpellChecker settings when permission changed
2015-07-24 04:20:13 +00:00
Mohammadinamul Sheik
707ca7692a Handle Cloud Sync and SpellChecker settings when permission changed
This build has been compiled against API 23

This build is approved to go out with the M OTA, but may NOT be released
to the public until the Play Store has enabled API level 23 apps

Version: 4.1.2300x.build_id


1. Disable the settings.
2. Disable the feature.
3. Force reload the facilitator.

Bug: 22564048
Change-Id: Ic09742786c3e4efc034bceee836ae6a1e07307a1
(cherry picked from commit 031d04192080f0368f21c3371d1ec6af87375357)
2015-07-24 02:00:54 +00:00
Mohammadinamul Sheik
992144a8c2 am 60415866: [LatinIME] Support MNC permissions.
* commit '604158669b407a40cd0f23538fad4dce5d738f24':
  [LatinIME] Support MNC permissions.
2015-07-16 00:04:12 +00:00
Mohammadinamul Sheik
604158669b [LatinIME] Support MNC permissions.
This build has been compiled against API 23

This build is approved to go out with the M OTA, but may NOT be released
to the public until the Play Store has enabled API level 23 apps

Version: 4.1.2300x.build_id

1. Replaces the personalization is on information with the suggest
   contacts.
2. Enables "Use Contacts" only if the app has permission to read
   contacts.
3. Disables the contacts dictionary in the Facilitator.
4. Do not register/read the contacts in the contact observer.

Bug: 22236416
Change-Id: I9674e13d0d0f4a2014c5024fde0178de684c07e7
2015-07-15 22:51:53 +00:00
Geoff Mendal
7d5fb3a943 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:48:45 +00:00
Geoff Mendal
6aea6b9da7 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:47:56 +00:00
Geoff Mendal
1aceaa3c2b Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:47:44 +00:00
Geoff Mendal
c8e261e95b Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:46:10 +00:00
Geoff Mendal
cf849b40df Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:44:45 +00:00
Geoff Mendal
29217bcd65 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:41:49 +00:00
Geoff Mendal
f98a60cc43 Import translations. DO NOT MERGE
Change-Id: Iebd6e5f51a121cae7913e6ac21c4140b9c4de6f9
Auto-generated-cl: translation import
2015-07-15 09:41:01 -07:00
Geoff Mendal
90a6cdb26a Import translations. DO NOT MERGE
Change-Id: I922b3fb60a57db87c8bf1da3d3cd7fa976d9f5f9
Auto-generated-cl: translation import
2015-07-15 09:37:13 -07:00
Geoff Mendal
8b8df7dcf1 Import translations. DO NOT MERGE
Change-Id: I1ce33d32d058d27eae565c1e982b491372878d25
Auto-generated-cl: translation import
2015-07-15 09:34:54 -07:00
Geoff Mendal
41bffb1293 Import translations. DO NOT MERGE
Change-Id: Id1d45fb3ba0b84c8574bd8e326c62f2417660ce3
Auto-generated-cl: translation import
2015-07-15 09:33:27 -07:00
Geoff Mendal
e3e9026a3a Import translations. DO NOT MERGE
Change-Id: Id4a9a90498ece00ba399074bef4010ecd315aeb7
Auto-generated-cl: translation import
2015-07-15 09:31:30 -07:00
Geoff Mendal
a00589437e Import translations. DO NOT MERGE
Change-Id: I41b452436ee558b42b104387eb3431d8164ab766
Auto-generated-cl: translation import
2015-07-15 09:30:20 -07:00
Geoff Mendal
285c9d825d Import translations. DO NOT MERGE
Change-Id: I7b33db63242fec09f647c250e66f9eef75c7b6fa
Auto-generated-cl: translation import
2015-07-15 09:28:54 -07:00
Jatin Matani
d711426a87 Remove android.util.Log from FileUtils
FileUtils is being used for other non android projects
and hence breaks when built. Instead use the log statements
at caller to record Log.e messages. Hence there is no side
effect here.

Bug:22042371
Change-Id: Ieb100006ff38e013bc30542637465f58bfc0f2f2
2015-07-09 11:50:10 -07:00
Jatin Matani
8c2591eec8 Bring back shortcuts and add to dictionary UI
For JB and lower devices, the UI is surfaced by the IME.
Bug: 22200135
Change-Id: Icca08500ee0683e2ceb5357b0bc430cd1712220e
2015-07-06 17:32:13 -07:00
Dan Zivkovic
d23dd5978d Don't prompt before downloading.
We don't pay attention to the answer, so don't ask.

Bug 22069694.

Change-Id: Ic048d5570e68fbc9438c6577e27e6c7f68428606
2015-06-25 15:01:04 -07:00
Dan Zivkovic
5e4c0caac3 Add some more logging. Why not.
Change-Id: I536212e1b3c35d75ed93f9ab3762908e3deb9a97
2015-06-24 18:56:48 -07:00
Dan Zivkovic
3aad142435 Load metadata.json from resources on DB reset.
This will ensure that a new (or upgraded) keyboard instance will know which
dictionaries are available for download so it requests missing dictionaries.
In addition, we increment the database version number to ensure upgrades of
existing Fava instances start with a clean slate.

Bug 22069694.

Change-Id: Id71310412682543a3931f9c5c03cb0369fa7b9ac
2015-06-24 18:40:34 -07:00
Tom Ouyang
c32389ce11 Merge "Small optimization to eliminate a >0 check in RichInputConnection." into jb-ub-latinimegoogle 2015-06-24 19:44:37 +00:00
Tom Ouyang
96640a110b Small optimization to eliminate a >0 check in RichInputConnection.
Change-Id: Ibdf97726008c1f94c970461196ba445ce328a8cb
2015-06-24 12:00:04 -07:00
Dan Zivkovic
563d7935a9 Extend laggy connection timeout for initial load.
The initial reloadTextCache() operation needs to read 1k characters, and it
could be slow on low-end devices. Also, the initial load is not blocking key
strokes, so it can take a little longer.

Bug 22062102.

Change-Id: I134424e8910c0d6131c311a862bdc87eccd3af44
2015-06-24 11:57:59 -07:00
Dan Zivkovic
ecea6a6113 Merge changes Iaed8abfb,I8e55b57c into jb-ub-latinimegoogle
* changes:
  LatinIME portion of StatsUtil change.
  Do not decorate committed spans.
2015-06-23 20:55:23 +00:00
Tom Ouyang
67eaf613f7 Merge "Workaround for preserving responsiveness on a slow InputConnection." into jb-ub-latinimegoogle 2015-06-23 20:35:09 +00:00
Tom Ouyang
912016b69f Workaround for preserving responsiveness on a slow InputConnection.
1. Add mechanism to detect a slow or non-resonsive InputConnection (IC)
2. When IC slowness is detected, skip certain IC calls that are known
   to be expensive (e.g., getTextAfterCursor).
3. Similarly, disables learning / unlearning on a slow IC.
4. IC slowness flag is reset when starting input on a new TextView or
   when a fixed amount of time has passed.

Note: These are mostly temporary workarounds. The permanent solution is
to refactor RichInputConnection so that it is less sensitive to IC
slowness in general.

Bug: 21926256
Change-Id: I383fab0516d3f3a8e0f71e5d760a8336a7730f7c
2015-06-23 10:34:44 -07:00
Dan Zivkovic
ee6de1466b Do not decorate committed spans.
Users rarely tap on committed words, and the cost of sending the spans back
through the input connection, back and forth to the target app, is too high.

Bug 21926256.

Change-Id: I8e55b57ce2148ed313dc927425b6d9c958634958
2015-06-23 10:25:58 -07:00
Dan Zivkovic
4e9d260826 Do not force downloads on package replace.
This is causing issues we can't deal with in a safe and timely manner.
Furthermore, users who need downloaded dictionaries already have them by now.

Bug 21797386.

Change-Id: I97e5fd84edcf2b16f04db57b7ae4a13fa9ce993f
2015-06-23 10:15:34 -07:00
Mohammadinamul Sheik
bf7c0106b0 Fix the previous downloads logic to not missing any downloads.
Bug: 21797386
Change-Id: Ic09698b28e31b4f16831898d7cb08853f4e5df4a
2015-06-22 20:23:27 -07:00
Dan Zivkovic
73aaf68337 Detection and logging of slow input connections.
Also adds a hook to log using StatsUtils.
Proto change is coming in a separate CL.

Bug 22010482.

Change-Id: I08065fc7a5cd116e50ff84cb14bbbc44c4f14bc7
2015-06-22 17:36:53 -07:00
Mohammadinamul Sheik
5a51e4a0a8 Clear/remove all the scheduled downloads in Download Manager
Bug: 21797386
Change-Id: I60f50a2fe890af46f5e847c34df2edf719d40ac4
2015-06-22 12:57:31 -07:00
Chieu Nguyen
779d4bb429 Disable download notifications.
Change-Id: I25263fe227ae88afa2021454b0dac2b0c7b9bfe0
2015-06-19 21:52:20 -07:00
Dan Zivkovic
0232e73dfa Cleanup before fixing getTextAfterCursor().
We never delete text after the cursor, so constrain the API accordingly.
Define the number of characters to read before and after.
Set them to reasonable values.
The next CL will start caching text after the cursor.

Bug 21926256.

Change-Id: Idd58daf68614de4a69344aa3c8a4323720c5d3a0
2015-06-19 12:06:18 -07:00
Dan Zivkovic
02c28453fc Do not restrict downloads to WiFi networks.
Bug 21900337.

Change-Id: I82991b492ea4c02a28a1ccc898d6f12741f1b793
2015-06-17 12:53:55 -07:00
Dan Zivkovic
764a18cd92 Revert "Remove "Personal dictionary" link from settings."
This reverts commit 76de0a8f52.

Bug 21881199.

Change-Id: I53f42a1e8f25d214de97264f4d25813bc637cafa
2015-06-16 18:26:02 -07:00
Mohammadinamul Sheik
94b4ffa17a Merge "Hide Notification when downloading the keyboard metadata" into jb-ub-latinimegoogle 2015-06-16 00:23:02 +00:00
Mohammadinamul Sheik
851a8b5489 Hide Notification when downloading the keyboard metadata
Bug: 21797386
Change-Id: Iebe9d2f18c5c8325a5601d49d8c4c65166b67036
2015-06-15 16:04:43 -07:00
Geoff Mendal
1fadf98997 Import translations. DO NOT MERGE
Change-Id: I778853cc6cf9bd0453ab7e9149b64602d6e6fb9b
Auto-generated-cl: translation import
2015-06-15 05:39:48 -07:00
Geoff Mendal
0f706a498b Import translations. DO NOT MERGE
Change-Id: Ib5516b4b5a50c0769410fdbb37f527a8a77bf4f9
Auto-generated-cl: translation import
2015-06-10 05:34:01 -07:00
Geoff Mendal
f5eb4d1f80 Import translations. DO NOT MERGE
Change-Id: I31808e8c9b7034fb2b180936168968eff69319e3
Auto-generated-cl: translation import
2015-06-08 06:00:17 -07:00
Geoff Mendal
71a21fbd0e Import translations. DO NOT MERGE
Change-Id: Ieead0f573f84c1959e2b396808b4f339eca666cd
Auto-generated-cl: translation import
2015-06-03 08:18:04 -07:00
Geoff Mendal
23c3c6e0bf Import translations. DO NOT MERGE
Change-Id: Ic2ece7209e745530a0856a3847cf00b3a63327c2
Auto-generated-cl: translation import
2015-06-01 08:01:13 -07:00
Dan Zivkovic
a9c235b533 Change metadata fetch interval back to 4 days.
Bug 19774872.

Change-Id: Icd790414d9462ee74a7eac11dd255fddf3048dce
2015-05-28 13:29:10 -07:00
Dan Zivkovic
04f03267a4 Mark resources translatable.
Bug 21366029.

Change-Id: I1fdf954112c15ae67084189306016018a811b37c
2015-05-21 11:19:45 -07:00
Dan Zivkovic
7891733c73 Remove dogfood history reset.
Change-Id: I1d7ebe5962fc3176c376e1ce34c7ac98cdf41373
2015-05-21 10:24:15 -07:00
Dan Zivkovic
0e15ff6b48 Fix on-commit bug in AOSP keyboard.
Bug 21272977.

Change-Id: Id561040c29a7f2576cd9ef0514c31751a4360ef8
2015-05-19 10:45:19 -07:00
Geoff Mendal
8796012ac7 Import translations. DO NOT MERGE
Change-Id: Ib618c2ce9292d8c2c5d3fbe926973f2319a45fc7
Auto-generated-cl: translation import
2015-05-13 05:34:36 -07:00
Mohammadinamul Sheik
b08f434482 Make the DictionaryService check for download every day.
Bug: 20103664
Change-Id: Iba019d5f79f46c560171e0594c2b5114b477923a
2015-05-12 13:49:35 -07:00
Mohammadinamul Sheik
44caf52581 Merge "clean up debug tags." into jb-ub-latinimegoogle 2015-05-12 20:46:29 +00:00
Mohammadinamul Sheik
142294a9fe clean up debug tags.
Change-Id: I2ca37bd691abcc036ead8071045d37d72b2d088d
2015-05-12 10:46:12 -07:00
Dan Zivkovic
f7a8edba2f Merge "Update the DB version." into jb-ub-latinimegoogle 2015-05-08 19:28:55 +00:00
Dan Zivkovic
f4590b0e28 Update the DB version.
Bug 20103664.

Change-Id: I1e2b72979df148d8aa71e3e58437a5853e63c261
2015-05-08 12:25:47 -07:00
Jatin Matani
e09da0aeb9 Set syncAutomatically for sync users
Note: this doesn't mean that sync would happen.
It only unblocks users who are already opted into
cloud sync

Change-Id: I91836efadac89d0429d7f2e9c9190a873a638743
2015-05-07 20:52:34 -07:00
Dan Zivkovic
bdc55e77f7 Metadata URI does not need additionalId.
Bug 20701628.

Change-Id: Ifba1e7dd7f9934c8c13279dfb95bf02c0e30e650
2015-05-06 09:30:47 -07:00
Dan Zivkovic
12d0641864 am 9bad1ac3: Look up thresholds during decoder reset.
* commit '9bad1ac33f65dc3454a689b88560988b77a00a87':
  Look up thresholds during decoder reset.
2015-05-05 01:18:22 +00:00
Dan Zivkovic
9bad1ac33f Look up thresholds during decoder reset.
Bug 20701628.

Change-Id: I4de89587776a0859aeda5d2ed76ab1eb4f918458
2015-05-04 14:48:28 -07:00
Mohammadinamul Sheik
9c08208d1a am f01cd568: Merge "Make the DictionaryService stage the downloaded files"
* commit 'f01cd568f0de414e88507ce244969cf0e509c537':
  Make the DictionaryService stage the downloaded files
2015-05-04 20:24:33 +00:00
Mohammadinamul Sheik
f01cd568f0 Merge "Make the DictionaryService stage the downloaded files" 2015-05-04 19:04:15 +00:00
Mohammadinamul Sheik
a0d9c82921 Make the DictionaryService stage the downloaded files
Bug: 20641948
Change-Id: I6639c995b12c033bc30241cd219201dd483ee516
2015-05-04 11:57:31 -07:00
Geoff Mendal
aa9bb2f1db Import translations. DO NOT MERGE
Change-Id: I4077e97bfbbb23bf55ceaf627306473e302f08fe
Auto-generated-cl: translation import
2015-05-01 20:47:07 -07:00
Dan Zivkovic
bdddc04635 am f22571e2: Delete history on upgrade in LatinIME.
* commit 'f22571e2d9756294fa2fa332a395c06010f54d92':
  Delete history on upgrade in LatinIME.
2015-05-01 20:10:16 +00:00
Dan Zivkovic
f22571e2d9 Delete history on upgrade in LatinIME.
Bug 20733902.

Change-Id: Ibe27e6cafe4db87ba62d7df708229e0d8564ffa8
2015-05-01 12:45:07 -07:00
Tom Ouyang
6d8e783d18 Do not learn from cursor corrections when autocorrection is disabled.
Bug: 20681528
Change-Id: I80e7095b70a151f3ccc36856d7e0837613a35972
2015-05-01 00:00:47 +00:00
Tom Ouyang
89f9070264 Do not learn from cursor corrections when autocorrection is disabled.
Bug: 20681528
Change-Id: I80e7095b70a151f3ccc36856d7e0837613a35972
2015-04-30 15:10:50 -07:00
Dan Zivkovic
e991c34297 am 459b4f35: Spelling cannot cache words across invocations.
* commit '459b4f353e6138b644c1f06de68e93532ee0d856':
  Spelling cannot cache words across invocations.
2015-04-29 21:42:50 +00:00
Dan Zivkovic
459b4f353e Spelling cannot cache words across invocations.
We want to let the facilitator decide if a word is valid or invalid, and cache
the answer in the facilitator's cache. The spell checker session doesn't need
its own word cache, except as a crutch to communicate suggestions to the code
that populates the suggestion drop-down. We leave that in place.

Bug 20018546.

Change-Id: I3c3c53e0c1d709fa2f64a2952a232acd7380b57a
2015-04-29 14:30:49 -07:00
Geoff Mendal
bd7e0fd5a5 Import translations. DO NOT MERGE
Change-Id: I4e17f973073f0e5cbb1c8d8bae6e087cb8147b81
Auto-generated-cl: translation import
2015-04-29 13:46:26 +00:00
Geoff Mendal
ad95ff8178 Import translations. DO NOT MERGE
Change-Id: Iaef4f34aafd86ac42c650536601d67dad67f73f1
Auto-generated-cl: translation import
2015-04-29 13:46:25 +00:00
Geoff Mendal
82bf4a6aee Merge "Import translations. DO NOT MERGE" 2015-04-29 13:32:04 +00:00
Geoff Mendal
ca40954d9d Merge "Import translations. DO NOT MERGE" 2015-04-29 13:31:48 +00:00
Geoff Mendal
7b741fa666 Import translations. DO NOT MERGE
Change-Id: I48ca4bdfb8c0dded8af8412146b7902a34d88161
Auto-generated-cl: translation import
2015-04-29 06:19:13 -07:00
Geoff Mendal
3cc8ecb95f Import translations. DO NOT MERGE
Change-Id: I4e17f973073f0e5cbb1c8d8bae6e087cb8147b81
Auto-generated-cl: translation import
2015-04-29 06:18:06 -07:00
Geoff Mendal
8588e52379 Import translations. DO NOT MERGE
Change-Id: Iaef4f34aafd86ac42c650536601d67dad67f73f1
Auto-generated-cl: translation import
2015-04-29 06:17:25 -07:00
Chieu Nguyen
6441faa610 am 767c0bf7: Restore preference change update to show app icon setting.
* commit '767c0bf71b9c0af7f8451d7d355f6efad21a6e5b':
  Restore preference change update to show app icon setting.
2015-04-27 21:55:38 +00:00
Chieu Nguyen
767c0bf71b Restore preference change update to show app icon setting.
Bug: 20544640
Change-Id: I6e2a26a8a5e43360dfefcc85bb46eae28f5e3867
2015-04-27 13:53:17 -07:00
Geoff Mendal
ee10cceb52 Import translations. DO NOT MERGE
Change-Id: I5ad6f6abd6d40b1dea68441bca18851461ed6fd4
Auto-generated-cl: translation import
2015-04-27 06:29:58 -07:00
Geoff Mendal
e9b52401a2 Merge "Import translations. DO NOT MERGE" 2015-04-25 09:26:04 +00:00
Geoff Mendal
b6ced82d3b Import translations. DO NOT MERGE
Change-Id: I9964b966c2cf45db046bf295cc7d9051eb6ae023
Auto-generated-cl: translation import
2015-04-25 01:24:27 -07:00
Geoff Mendal
5617af7363 Import translations. DO NOT MERGE
Change-Id: I9ae307bf3567fa52a6fbb6f17de26de9274eff9c
Auto-generated-cl: translation import
2015-04-25 01:20:01 -07:00
Geoff Mendal
b42f85c8ca Import translations. DO NOT MERGE
Change-Id: I5eedc967208ea3d92d4d73b536281040106d7591
Auto-generated-cl: translation import
2015-04-25 01:19:20 -07:00
Dan Zivkovic
0108a51731 am 784233db: Specify fileName argument as Nullable.
* commit '784233dbc6dda7e702228fc831f3255bb4963f04':
  Specify fileName argument as Nullable.
2015-04-23 21:32:32 +00:00
Dan Zivkovic
784233dbc6 Specify fileName argument as Nullable.
Bug 20526371.

Change-Id: If53a81f925fbb1b29ad945ba0ec2192d92ae1eff
2015-04-23 14:12:33 -07:00
Chieu Nguyen
9d95f80e70 am a2376cd2: Restore switch for showing app icon.
* commit 'a2376cd2b4fea6b655fdcdf794cf16b7bbe1a161':
  Restore switch for showing app icon.
2015-04-22 23:17:40 +00:00
Chieu Nguyen
a2376cd2b4 Restore switch for showing app icon.
Bug: 20307420
Change-Id: I95969de40936d2ea992669324d0c4df7e8de2bd9
2015-04-22 15:46:40 -07:00
Geoff Mendal
fece743fee Merge "Import translations. DO NOT MERGE" 2015-04-22 12:49:11 +00:00
Geoff Mendal
987ce53937 Merge "Import translations. DO NOT MERGE" 2015-04-22 12:48:08 +00:00