summaryrefslogtreecommitdiff
path: root/java/src/com/android/inputmethod/keyboard/KeyboardId.java
Commit message (Collapse)AuthorAgeFilesLines
* Unicode 8.0 emoji additions to Google Keyboard.Chieu Nguyen2015-11-111-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 8e86347b024e2460a17264fbcaa20cd6e5fd6018 Author: Chieu Nguyen <cvnguyen@google.com> Date: Tue Nov 10 11:29:44 2015 -0800 Remove check for version code. This was unnecessary and caused multi-codepoint emoji to not show up on any device. Bug: 25369504 Change-Id: Ia1e61c052444aaab824b18463c26b5a8066c65ed commit 1b924816665a3a2c48307dbdd1078f61dd3179f2 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 18:12:58 2015 -0800 Fix Material icons for new tab. Bug: 25369504 Bug: 16185905 Change-Id: I873eb9e8fc1259ac94a974c04a80a4f0d005f9c2 commit 956d5f86d2552d90d2c3240a85d5c1cddf05eda9 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 17:16:10 2015 -0800 Remove extraneous TalkBack descriptions. Bug: 25369504 Bug: 16185905 Change-Id: Iec4f0f46cf9dda169c5827168ef207e56d619096 commit 07357bdec69b5fc118c82401d59b61ad7b802c22 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 16:01:34 2015 -0800 Better checking of whether to display new emoji. Bug: 25369504 Bug: 16185905 Change-Id: I61f1b428e5a805f66eb4e9db346be8756fc84b8f commit 666a92f17034f5a1948e70f40226ed995c72d81f Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 12:54:53 2015 -0800 Fix shading on emoji category icons. Bug: 25369504 Bug: 16185905 Change-Id: I217af3d97120e7910e9850de7ea331a461ae7e56 commit 2712432c0e7a1b90ebb7ed6bde8f87eec7bf1094 Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 19:06:57 2015 -0800 Add new emoji categories to Holo Blue. Bug: 25369504 Bug: 16185905 Change-Id: Ie32af93e68e08b36a4a5861a06de511b2b190dca commit 04c79b1f53912b263d7f7eb8b71ac802ed960a8a Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 18:06:35 2015 -0800 Fix default category, remove xxxhdpi Holo icons. Bug: 25369504 Bug: 16185905 Change-Id: I9bca795675297dceb93777d998e8f2935f7031a6 commit 15c0b578343db2baa873096891a69305398eb830 Merge: 77bc6fc 8604ce3 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 00:59:08 2015 +0000 Merge changes into jb-ub-latinimegoogle commit 77bc6fcfd760232757b5751993c0046f2a43626a Merge: b0380a0 8604ce3 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 00:59:04 2015 +0000 Merge "Remove Kosovo from flags (no glyph)." into jb-ub-latinimegoogle commit b0380a0744647039278ad6648b7a1bc94eeab623 Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 16:42:24 2015 -0800 Add icons for new emoji categories. Bug: 25369504 Bug: 16185905 Change-Id: I1182e031994332b2e618406ad1cd467cb050766e commit 8604ce3a34b65598101cac37a3ed3e8087fe38ca Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 16:29:33 2015 -0800 Remove Kosovo from flags (no glyph). Bug: 25369504 Bug: 16185905 Change-Id: I92c9ace19d3600cfa1f27678ada0cf45af42d8f5 commit e0489eab47d3a6d138bfa00a668f02bcb473cf88 Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 14:30:58 2015 -0800 Update emoji set to blacklist non-color glyphs. Bug: 25369504 Bug: 16185905 Change-Id: I8b54217fa68da8ddaa1bbcd1845e0123ed106463 commit 9ffdcdff058d6b44cab70e4fb0bb301e39699483 Author: Chieu Nguyen <cvnguyen@google.com> Date: Wed Nov 4 17:18:22 2015 -0800 Add Unicode 8.0 emoji to emoji palette. Currently all emoji category tabs use the flower icon. A future CL will update these once the icons are finalized. If glyphs do not exist for new emoji, the old categories will be shown. Bug: 25369504 Bug: 16185905 Change-Id: Ie3759bfc4c8469a17f3205b45609ce6ef7510121 commit 4a4a042072790b19048a14d2ddab655b1be31a6e Author: Chieu Nguyen <cvnguyen@google.com> Date: Sun Nov 1 18:38:20 2015 -0800 Add description strings for Unicode 8.0 new emoji. Bug: 16185905 Bug: 25369504 Change-Id: I6048609ace715a23db5f82d47fefe4868ccb3d17 Change-Id: I30a043554b14531ab9cf89a1f663b6970d7d6863
* Revert "Unicode 8.0 emoji changes to Google Keyboard."Ian Pedowitz2015-11-101-21/+1
| | | | | | This reverts commit 9cc42549d18f1e28ffc8dae94ff36728933f53f1. Change-Id: Ia3b037160e55bc54ef55194b967d9c91f6814ff8
* Unicode 8.0 emoji changes to Google Keyboard.Chieu Nguyen2015-11-061-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 1b924816665a3a2c48307dbdd1078f61dd3179f2 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 18:12:58 2015 -0800 Fix Material icons for new tab. Bug: 25369504 Bug: 16185905 Change-Id: I873eb9e8fc1259ac94a974c04a80a4f0d005f9c2 commit 956d5f86d2552d90d2c3240a85d5c1cddf05eda9 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 17:16:10 2015 -0800 Remove extraneous TalkBack descriptions. Bug: 25369504 Bug: 16185905 Change-Id: Iec4f0f46cf9dda169c5827168ef207e56d619096 commit 07357bdec69b5fc118c82401d59b61ad7b802c22 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 16:01:34 2015 -0800 Better checking of whether to display new emoji. Bug: 25369504 Bug: 16185905 Change-Id: I61f1b428e5a805f66eb4e9db346be8756fc84b8f commit 666a92f17034f5a1948e70f40226ed995c72d81f Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 12:54:53 2015 -0800 Fix shading on emoji category icons. Bug: 25369504 Bug: 16185905 Change-Id: I217af3d97120e7910e9850de7ea331a461ae7e56 commit 2712432c0e7a1b90ebb7ed6bde8f87eec7bf1094 Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 19:06:57 2015 -0800 Add new emoji categories to Holo Blue. Bug: 25369504 Bug: 16185905 Change-Id: Ie32af93e68e08b36a4a5861a06de511b2b190dca commit 04c79b1f53912b263d7f7eb8b71ac802ed960a8a Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 18:06:35 2015 -0800 Fix default category, remove xxxhdpi Holo icons. Bug: 25369504 Bug: 16185905 Change-Id: I9bca795675297dceb93777d998e8f2935f7031a6 commit 15c0b578343db2baa873096891a69305398eb830 Merge: 77bc6fc 8604ce3 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 00:59:08 2015 +0000 Merge changes into jb-ub-latinimegoogle commit 77bc6fcfd760232757b5751993c0046f2a43626a Merge: b0380a0 8604ce3 Author: Chieu Nguyen <cvnguyen@google.com> Date: Fri Nov 6 00:59:04 2015 +0000 Merge "Remove Kosovo from flags (no glyph)." into jb-ub-latinimegoogle commit b0380a0744647039278ad6648b7a1bc94eeab623 Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 16:42:24 2015 -0800 Add icons for new emoji categories. Bug: 25369504 Bug: 16185905 Change-Id: I1182e031994332b2e618406ad1cd467cb050766e commit 8604ce3a34b65598101cac37a3ed3e8087fe38ca Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 16:29:33 2015 -0800 Remove Kosovo from flags (no glyph). Bug: 25369504 Bug: 16185905 Change-Id: I92c9ace19d3600cfa1f27678ada0cf45af42d8f5 commit e0489eab47d3a6d138bfa00a668f02bcb473cf88 Author: Chieu Nguyen <cvnguyen@google.com> Date: Thu Nov 5 14:30:58 2015 -0800 Update emoji set to blacklist non-color glyphs. Bug: 25369504 Bug: 16185905 Change-Id: I8b54217fa68da8ddaa1bbcd1845e0123ed106463 commit 9ffdcdff058d6b44cab70e4fb0bb301e39699483 Author: Chieu Nguyen <cvnguyen@google.com> Date: Wed Nov 4 17:18:22 2015 -0800 Add Unicode 8.0 emoji to emoji palette. Currently all emoji category tabs use the flower icon. A future CL will update these once the icons are finalized. If glyphs do not exist for new emoji, the old categories will be shown. Bug: 25369504 Bug: 16185905 Change-Id: Ie3759bfc4c8469a17f3205b45609ce6ef7510121 Change-Id: Ia5a5879cea828ea4cb4c678765fe5d9e5ecbfcd2
* Remove ALS from LatinIME.Dan Zivkovic2015-03-111-3/+3
| | | | | | This fixes unit tests and brings us closer to a green build. Change-Id: Iffcc392eda4a7671a238b79cc7367320ca648725
* Move Constants.java to the latin.common packageKen Wakasa2014-10-231-1/+1
| | | | | | | Our intention is to have classes of latinime-common under the common package as much as we can. Change-Id: I76efbbbe7bebf1a4aa943715cdff64f91675e20d
* Fix some compiler warningsTadashi G. Takaoka2014-10-211-1/+0
| | | | | | | | | | | | | | | | | | | | | This CL fixes the following compiler warnings. - Indirect access to static member - Access to a non-accessible member of an enclosing type - Parameter assignment - Method can be static - Local variable declaration hides another field or variable - Value of local variable is not used - Unused import - Unused private member - Unnecessary 'else' statement - Unnecessary declaration of throw exception - Redundant type arguments - Missing '@Override' annotation - Unused '@SuppressWarning' annotations Bug: 18003991 Change-Id: Icfebe753e53a2cc621848f769d6a3d7ce501ebc7
* [ML14] Forward the locale list to relevant places, againJean Chalard2014-10-061-3/+6
| | | | | | | | | | | | | | | | Diff: +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java @@ -735,7 +735,7 @@ public class KeyboardBuilder<KP extends KeyboardParams> { private boolean matchLocaleCodes(TypedArray caseAttr, final Locale[] locales) { // TODO: adujst this for multilingual input - return matchString(caseAttr, R.styleable.Keyboard_Case_languageCode, locales[0].toString()); + return matchString(caseAttr, R.styleable.Keyboard_Case_localeCode, locales[0].toString()); } private boolean matchLanguageCodes(TypedArray caseAttr, Locale[] locales) { Change-Id: Icefac18dd6d5fea97f591177cf8df1ba6de7f4f0
* Revert "[ML14] Forward the locale list to relevant places"Ken Wakasa2014-10-031-6/+3
| | | | | | | | | | This reverts commit 15dbd38283fc9c8fdfd2540f1d94d4dbf2eabcb5. Bug: 11230254 Reverting due to unit test breakage. Change-Id: Icf29ba5c808c754515aef2d1b4162d72f606acfe
* [ML14] Forward the locale list to relevant placesJean Chalard2014-10-031-3/+6
| | | | | Bug: 11230254 Change-Id: Idf3ed27b396d63ade9800c72c5ce0ed613f5f669
* Start showing the split keyboard layoutSandeep Siddhartha2014-09-171-3/+2
| | | | | | | | | | | Change [3/3] Added tests for Qwerty/en-US/split Parse the switch-case statement from KeyboardBuilder to use the right layout. Bug: 4968173 Change-Id: If4d6d71d5900525290268d8affa55dccf1ebd4f2
* Add a canSplitKeyboard attribute for specifying split keyboard layoutsSandeep Siddhartha2014-09-121-5/+11
| | | | | | | | | Change [1/3] This'll be used in conjunction with a user preference to split the keyboard when possible. Bug: 4968173 Change-Id: I7a05948d67b94a55024790115ae261d7fef7941a
* Revert "Revert "[ML1] Introduce RichInputMethodSubtype""Jean Chalard2014-08-251-2/+2
| | | | | | | | This reverts commit a63d0a8ee6cb05bcddb69bf9a6018853d89d886a. This patch seems to be fine after all, but was submitted without its companion [ML1.1] patch causing a build breakage. Reverting the revert and submitting both at the same time seems like the right thing to do. Change-Id: Ib8fefa40b74dcee0edb025a52dac9b35c82d49df
* Revert "[ML1] Introduce RichInputMethodSubtype"Jean Chalard2014-08-221-2/+2
| | | | | | This reverts commit 8ffe4bc9321e582a4d882f21e465d5886616f489. Change-Id: I9d4c98b0adfdb78b0f4d376f7691e50d1bd2228f
* [ML1] Introduce RichInputMethodSubtypeJean Chalard2014-08-221-2/+2
| | | | | Bug: 11230254 Change-Id: Ic7a1bf938a5a186dcff527b556295aba2406e8b9
* Remove unused supportsSwitchingToShortcutIme attributeTadashi G. Takaoka2014-06-061-7/+2
| | | | Change-Id: I51c5247ac925a158facb79057f704b763b903552
* Remove unnecessary reference to LatinIMETadashi G. Takaoka2014-04-251-1/+1
| | | | Change-Id: Idbb45c504499d39bbf272fae84ea71a83bf4dd69
* Reset to 9bd6dac4708ad94fd0257c53e977df62b152e20cKen Wakasa2013-12-131-21/+13
| | | | | | The bulk merge from -bayo to klp-dev should not have been merged to master. Change-Id: I527a03a76f5247e4939a672f27c314dc11cbb854
* Revert "Remove symbols shifted layout related code"Satoshi Kataoka2013-09-041-0/+2
| | | | | | | | This reverts commit 1cd027850bb07cd3fe2c1ec43b8a594d2f8ad313. Bug: 9059539 Change-Id: I1880b799e2d0f148ae913f13cffa1b8cac48be60
* Add emoji keyboard element idsTadashi G. Takaoka2013-08-261-0/+14
| | | | | Bug: 6370846 Change-Id: I0ac55bc06e1527bafad395f4a2b5059e1fed4b5d
* Remove symbols shifted layout related codeTadashi G. Takaoka2013-08-241-3/+0
| | | | | | | This is a follow up of I7fe6520e4e. Bug: 9059539 Change-Id: Idb39906ddb1e2234a0d1c7c4d5e6fc728090e79e
* Remove symbols shifted layoutTadashi G. Takaoka2013-08-231-0/+1
| | | | | Bug: 9059539 Change-Id: I7fe6520e4eafcb7e1748b8bf011333c7e0da7ac2
* Add ResouceUtils.getDefaultKeyboardHeightTadashi G. Takaoka2013-08-071-1/+0
| | | | Change-Id: I377f6a83ec86b0345b170e7ad995d4577220d0ad
* Remove orientation member from KeyboardIdTadashi G. Takaoka2013-08-071-12/+4
| | | | Change-Id: I2c16134a24088dbc30b74ae7c5bc578a9d84a960
* Move subtype related utility class to utils packageTadashi G. Takaoka2013-07-241-2/+2
| | | | Change-Id: I3564796531ea85f2ebafde40cd822b806b8741df
* Move util classes to the latin/utils directoryKen Wakasa2013-06-241-1/+1
| | | | Change-Id: I1c5b27c8edf231680edb8d96f63b9d04cfc6a6fa
* Use Locale.ROOT for locale neutral operationsTadashi G. Takaoka2013-05-241-1/+1
| | | | | Bug: 9112465 Change-Id: I6cd63007287b5a1a57cfbabff35d53f66fc5620e
* Remove unused device form factor valuesTadashi G. Takaoka2013-05-071-20/+3
| | | | Change-Id: I1ed88b842a3d45e5460dd387bfad4276c844096a
* Remove {max,min}keyboardHeight attribute from KeyboardTadashi G. Takaoka2013-01-291-3/+11
| | | | | | This change removes a DisplayMetrics reference from KeyboardBuilder. Change-Id: I512694274e69e5281d5be47c3f938bcfd6571152
* Fix Apache license commentTadashi G. Takaoka2013-01-211-8/+8
| | | | Change-Id: Ic56167f952a7f4449da366e1e81610e72c966086
* Stop relying on the soft keyboard to get the editor action.Jean Chalard2013-01-161-6/+1
| | | | | Bug: 7969231 Change-Id: I9848c63c4c51550b5dc53c981eafa74e7fa95197
* Move a method to a utility class (C1)Jean Chalard2013-01-091-12/+3
| | | | | | This is a preparatory change to fix bug 7969231 Change-Id: I44604ae75192a17b4e75a01f3e3d679d4901299e
* Fix label of switch to symbols key when symbols has shortcut keyTadashi G. Takaoka2012-12-131-30/+40
| | | | | | | This change fixes the labels of switch to symbols key and switch back from more symbols key when symbols layout has shortcut key. Change-Id: I3fbbef2d929486d0f0542f4d89cb086d9f5bad82
* Cleanup: Make some classes as finalTadashi G. Takaoka2012-09-271-1/+1
| | | | Change-Id: I6009b3c1950ba32b7f1e205a3db2307fe0cd688e
* Add device form factor to KeyboardIdTadashi G. Takaoka2012-07-301-6/+23
| | | | | | | This is a groundword for optimizing keyboard parsing. Bug: 6860259 Change-Id: Ie65aa502b18c920e25cf2998b79120b3cc835952
* Fix tab key's navigation behaviorTadashi G. Takaoka2012-07-051-2/+4
| | | | | Bug: 6435484 Change-Id: Iffe459c117ad438e96ec6f5c7e64fb80b32d227e
* Add Constants class to hold public constantsTadashi G. Takaoka2012-04-191-2/+3
| | | | | | This change also gets rid of compiler warnings about "deprecations". Change-Id: Id9b83483c453a81ebac34b684656db05e3599657
* Utilize InputMethodSubtype and additional subtypeTadashi G. Takaoka2012-04-131-6/+12
| | | | | | | * Remove de_QY and fr_CH from supported subtypes * Add de-qwerty and fr-qwertz predefined additional subtypes instead. Change-Id: I49e8ba0299529302f2b91b4d018b07304cdd6897
* Cleanup InputTypeCompatUtils to InputTypeUtilsTadashi G. Takaoka2012-04-031-3/+3
| | | | | Bug: 6129704 Change-Id: I45e19e456ef7c6e61fe877ea544fef1b9f896e95
* Cleanup EditorInfoCompatUtilsTadashi G. Takaoka2012-04-031-2/+2
| | | | | Bug: 6129704 Change-Id: I5b9964f2ad52e7cd60c63acca93d0241a1e729ef
* Add missing Word.hashCode()Ken Wakasa2012-03-231-28/+28
| | | | | | | Some cleanups too. bug: 6209651 Change-Id: I94e2e29c92e90e554e4952d277d590e093766c4f
* Add language switch key only to the phone layoutsTadashi G. Takaoka2012-03-071-2/+7
| | | | | Bug: 5759092 Change-Id: Ic7d7d4812976654c0e85fecabd1128eadfc52c5c
* Support time, date, and datetime keyboardTadashi G. Takaoka2012-03-021-25/+6
| | | | | Bug: 6030364 Change-Id: I2bd4daf264757d8f3fa7c946d10a39c36ccf5905
* Add next/prev navigate action more keys and remove tab keyTadashi G. Takaoka2012-02-211-12/+22
| | | | | | Bug: 6037537 Bug: 5961814 Change-Id: I9c6dedf953452a180fcd5bce7bfadfd3c821f224
* Settings key always exists in more keys of shortcut/f1 keyTadashi G. Takaoka2012-02-171-43/+3
| | | | | | | | | This change also * Fix comman/f1 key for Arabic keyboard. * Removes "show settings key option" and related stuff. * Renames and simplifies F2 key to shortcut key on 7 inch tablet. Change-Id: Ib1cf99ad00d9780a2f0d170260e756771e161521
* Custom action label should be a part of keyboard identifierTadashi G. Takaoka2012-02-081-0/+2
| | | | Change-Id: Ia14cabc3d49fbdcb11dd00225d225fbb91cc4012
* Shift+Smiley key will register newline character of textMultiLineTadashi G. Takaoka2012-02-081-16/+33
| | | | | | | | | | | | | | This change also * Honors the custom action label in EditorInfo.actionLabel. * Invokes InputConnection.performeEditorAction if action is specifed at EditorInfo.imeOptions or actionLabel/actionId. * Stops using InputMethodService.sendKeyChar. Implements sendKeyCodePoint instead. Bug: 2498607 Bug: 5961809 Bug: 5368408 Change-Id: If4cd5eb3dacfc6b6a7ea434b0617c2438e06e42d
* Fix obvious bugTadashi G. Takaoka2012-02-081-4/+1
| | | | Change-Id: I3a0e5c699bbe4e9274dacdbdf92dff14148bd2c1
* Move long press shift handling from PointerTracker to KeyboardStateTadashi G. Takaoka2012-02-011-4/+4
| | | | | | | | | | | | | This change also * Rename phone shift keyboard to phone symbols keyboard. Use CODE_SWITCH_ALPHA_SYMBOL code to switch between phone and phone symbols keyboard. * Remove phone symbols keyboard from tablet. * Introduces enableLongPress flag of Key.keyActionFlags attribute. * Remove clumsy long press code from PointerTracker. * Remove CODE_CAPSLOCK handling from LatinIME. * Make KeyboardSwitcher to invoke haptic and audio feedback. Change-Id: I00e1f697a10ab5112aec75e36853b96246ff5054
* Auto generate various shift states alphabet keyboard automaticallyTadashi G. Takaoka2012-01-311-0/+16
| | | | | | | | | | | | | | | | | | If any shift state variants of alphabet keyboard layout is not specified in KeyboardSet.Element, it will be automatically generated from base alphabet keyboard definition. This change also * Eliminates KeyboardShiftState object from Keyboard. * Removes various set shift state methods from Keyboard. * Removes KeyboardSet.Element.elementAutoGenerate attribute. * Separates "sticky" Key.backgroundType to "stickyOff" and "stickyOn" * Add preserveCase flag to smiley, .com, and labeled special keys. * Rename KeyboardShiftState class to AlphabetShiftState. * Rename some attributes from *UppercaseLetter* to *ShiftedLetterHint*. * Introduce shiftedLetterActivated to Key.keyLabelFlags Change-Id: I01a0a8efeeaa76820ae728a5bdfa8d02b6ce74b7
* Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboardTadashi G. Takaoka2012-01-251-28/+24
| | | | | | | This is the first step to support separate Keyboard for elementName. This change is the second attempt of Icef66564. Change-Id: I78ea6cb9ea3d965ff89e0ff5d896a6b11ba5c670