Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Unified Diff: ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm

Issue 2956013002: [ios] Workaround error affecting 3rd party keyboards and omnibox. (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/experimental_flags.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm
diff --git a/ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm b/ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm
index 2be9472a98248f10a6d12cbd4faf200506c6ab25..4210f0757101aa6132142080d7b48127e129d692 100644
--- a/ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm
+++ b/ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm
@@ -14,7 +14,9 @@
#include "base/strings/sys_string_conversions.h"
#include "components/grit/components_scaled_resources.h"
#include "components/omnibox/browser/autocomplete_input.h"
+#include "ios/chrome/browser/application_context.h"
#include "ios/chrome/browser/autocomplete/autocomplete_scheme_classifier_impl.h"
+#include "ios/chrome/browser/experimental_flags.h"
#import "ios/chrome/browser/ui/animation_util.h"
#include "ios/chrome/browser/ui/omnibox/omnibox_util.h"
#import "ios/chrome/browser/ui/reversed_animation.h"
@@ -458,7 +460,15 @@ NSString* const kOmniboxFadeAnimationKey = @"OmniboxFadeAnimation";
[self clearAutocompleteText];
}
- self.attributedText = fieldText;
+ BOOL updateText = YES;
+ if (experimental_flags::IsThirdPartyKeyboardWorkaroundEnabled() &&
+ GetApplicationContext()->GetApplicationLocale() == "ja") {
rohitrao (ping after 24h) 2017/06/27 13:48:47 This should check the primaryLanguage of the curre
+ updateText =
+ (!self.editing || ![self.text isEqualToString:fieldText.string]);
rohitrao (ping after 24h) 2017/06/27 13:48:47 I think I'm ok with this, for two reasons: 1) We s
+ }
+ if (updateText) {
+ self.attributedText = fieldText;
+ }
// iOS changes the font to .LastResort when some unexpected unicode strings
// are used (e.g. 𝗲𝗺𝗽𝗵𝗮𝘀𝗶𝘀). Setting the NSFontAttributeName in the
« no previous file with comments | « ios/chrome/browser/experimental_flags.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698