Commit Graph

7051 Commits

Author SHA1 Message Date
Filip Gruszczynski
e31aba5ec4 am 3dc18c57: am da992dee: am 844fbff8: Merge "Fix NPE when requesting outsets for detached view." into mnc-dev
* commit '3dc18c57882af97689248450500c30b969ca81cc':
  Fix NPE when requesting outsets for detached view.
2015-06-03 22:22:43 +00:00
Yohei Yukawa
3adf706c2c am fd417eb4: am 5acad932: am 168d38aa: Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev
* commit 'fd417eb40557be9e780e4739d35fb5b2ec62a705':
  Convert subtypes whose locale is "tl" to "fil".
2015-06-03 22:22:31 +00:00
Yoshiki Iguchi
bce3ea3617 am c4c59bc8: am 54da4c98: am 0d8513ad: Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev
* commit 'c4c59bc894f1f1b268072c8387e1faa71b3ff1b1':
  Add a permission annotation to IMM#setCurrentInputMethodSubtype.
2015-06-03 19:23:00 +00:00
Filip Gruszczynski
844fbff80c Merge "Fix NPE when requesting outsets for detached view." into mnc-dev 2015-06-03 17:50:44 +00:00
Filip Gruszczynski
e660d4e96a Fix NPE when requesting outsets for detached view.
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.

Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
2015-06-03 10:43:48 -07:00
Yohei Yukawa
168d38aa3c Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev 2015-06-03 17:41:18 +00:00
Seigo Nonaka
0e96884382 am 12eaf366: am 031aead1: am 2752a149: Merge "Use final in favor of initialization safety." into mnc-dev
* commit '12eaf366f963f883d89d0713b458c698c514ab96':
  Use final in favor of initialization safety.
2015-06-03 17:36:30 +00:00
Yoshiki Iguchi
0d8513adca Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev 2015-06-03 06:05:37 +00:00
Seigo Nonaka
2752a14939 Merge "Use final in favor of initialization safety." into mnc-dev 2015-06-03 04:58:40 +00:00
Seigo Nonaka
92adda2b61 Use final in favor of initialization safety.
Making a member field final would be beneficial not
only for the readability but also for the initialization
safety.
Leaving SpellCheckerSession#mSpellCheckerSessionListener
non-final does not make sense not only because we never
change that member field once SpellCheckerSession object
is created and but also because SpellCheckerSession
instance is designed to be accessed from multiple threads
at the same time, no matter if it has something to do
with Bug 18945456 or not.

Change-Id: I1a7ebb54a5d0beddee8799fc5b0800c6e1059099
2015-06-03 04:53:44 +00:00
Jun Mukai
8acf610a70 am c891bfbb: am 7f0ad420: am 3c134877: Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev
* commit 'c891bfbb11522bbc60451eaa81dabf77f6180170':
  Retire PFLAG_ONLY_DRAWS_BACKGROUND.
2015-06-03 02:36:32 +00:00
Jun Mukai
3c1348773a Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev 2015-06-03 00:59:15 +00:00
Yohei Yukawa
92280cd309 Convert subtypes whose locale is "tl" to "fil".
On Android, "tl" is a historic hack for what should really
be "fil". Now that we properly support 3-letter language codes,
we should be using "fil" throughout. Given this historical usage,
IMEs that really want to support Tagalog (and not Filipino)
should use the ISO-639-3 code for Tagalog, which is "tgl".

For backward compatibility reasons, this CL uses the similar
approach to I26e3aa0333aa3c76c80a3c1c9090cc2b368c8e10.
InputMethodSubtype.getLocale() continues to return the "locale"
string parameter passed to the constructor as is, but in the
Android framework we do normalizations/conversions whenever
we need a valid ISO-639-3 code.

In I26e3aa0333aa3c76c80a3c1c9090cc2b368c8e10, we rely on the
conversion in the Locale constructor.  In this CL, we do replace
"tl" with "fil" by ourselves.

This CL also adds InputMethodSubtype#getLocaleObject() a hidden
API so that we can start relying on the Locale object at least
in the framework.

This CL is based on the investigation by Narayan Kamath and his
patch.

Bug: 20696126
Change-Id: I94f203bddceb9c87710cb187cc3cc0ee6d9092a5
2015-06-02 17:09:50 -07:00
Jun Mukai
3427f57e03 Retire PFLAG_ONLY_DRAWS_BACKGROUND.
Per discussion on another CL, this CL retires
PFLAG_ONLY_DRAWS_BACKGROUND because this is over-optimizing and
misleading.  Also setFlags() needs to care both the background
and the foreground.

Bug: 20734520
Change-Id: I57d63e776b5fbad9effd10ad87e683bbb2a6dacd
2015-06-02 14:27:35 -07:00
Wale Ogunwale
f306ae7260 am be86841c: am 28e00af9: am c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev
* commit 'be86841c64ea0d1b67bd77c0a5687729bc521b27':
  @hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.
2015-06-02 21:26:41 +00:00
Svet Ganov
ad602c3c82 am 0f7f72da: am a332605f: am 8fa8b95c: Merge "Respect accessibility importance for before/after node ordering." into mnc-dev
* commit '0f7f72dae6fc6cdae5a668baff16d605fd140c7b':
  Respect accessibility importance for before/after node ordering.
2015-06-02 20:32:35 +00:00
Alan Viverette
88dba6c893 am e18cfd39: am 0693b7c4: am 54310008: Merge "Remove strict mode violation from value to string coercion" into mnc-dev
* commit 'e18cfd3954ccc75b9c881528c5468d99c9f242f1':
  Remove strict mode violation from value to string coercion
2015-06-02 20:32:30 +00:00
Adam Powell
536b6a8147 am 3fe0c565: am 3e033267: am fa3f17f1: Merge "Don\'t take the compatibility path for non-primary ActionModes" into mnc-dev
* commit '3fe0c56559e305e0dabb899f171f5ef4996ddcae':
  Don't take the compatibility path for non-primary ActionModes
2015-06-02 19:22:28 +00:00
Svetoslav
64f0090286 am f53f3c24: am fcec13f0: am 4982e7b4: Merge "Don\'t add real children for a view with a node provider" into mnc-dev
* commit 'f53f3c24324967e1eb055b0944a2f11acfcfe625':
  Don't add real children for a view with a node provider
2015-06-02 19:22:23 +00:00
Wale Ogunwale
c9a0452244 Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev 2015-06-02 18:54:55 +00:00
Wale Ogunwale
3540f93654 @hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.
Bug: 21572285
Change-Id: Iff56a8ee5b91e02bd20afb7891bd94a0ec1abba9
2015-06-02 11:07:07 -07:00
Svet Ganov
8fa8b95c9d Merge "Respect accessibility importance for before/after node ordering." into mnc-dev 2015-06-02 16:49:47 +00:00
Alan Viverette
5431000830 Merge "Remove strict mode violation from value to string coercion" into mnc-dev 2015-06-02 16:47:53 +00:00
Svet Ganov
2dca7ca9bf Respect accessibility importance for before/after node ordering.
One can set a view to be visited before/after another one for
accessibility but the before/after target views were always added
to the node info for the view regardless if they are included
for accessiilbity. Now the target viwes are reported only if they
should be included for accessibility.

Change-Id: Iba64e6f0ee0dc090c8c3e6a0a940df8c7ecd49d9
2015-06-02 09:45:19 -07:00
Yoshiki Iguchi
00d5122b2b Add a permission annotation to IMM#setCurrentInputMethodSubtype.
Bug: 19477686
Change-Id: I97cb9b57fd0182ee479f4e7dea34801d7b168b9f
2015-06-02 08:52:49 +00:00
Adam Powell
fa3f17f117 Merge "Don't take the compatibility path for non-primary ActionModes" into mnc-dev 2015-06-02 01:00:06 +00:00
Svetoslav
762621ced7 Don't add real children for a view with a node provider
Change-Id: I1dd43fa5ff93e8eb76e2c7587fb13cd1ef097678
2015-06-01 17:21:59 -07:00
Alan Viverette
069767717a Remove strict mode violation from value to string coercion
The legitimate uses of value to string coercion, including the
interaction between lax attribute formatting and AAPT type inference,
combined with the low likelihood of unintentional coercion and low cost
of most string coercions, makes the value to string coercion violation
overkill.

Bug: 21563086
Change-Id: I7892e776d3e5479fcba507749b074c2abdf1b781
2015-06-01 15:18:37 -07:00
Alan Viverette
b5c87cb27e am b88314ad: am 508b6d2d: am 242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev
* commit 'b88314ad72669c2b91f2e5c6edf73f8ed02f0024':
  Fix row/column order when unparcelling CollectionItemInfo
2015-06-01 19:04:51 +00:00
Mady Mellor
2177544c1a am fae785fc: am 8de52276: am 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev
* commit 'fae785fccf151aab7fba0daa701915f9e223fdfe':
  Update button to BUTTON_STYLUS_PRIMARY
2015-06-01 19:04:27 +00:00
Mady Mellor
793933903f am ee8ac623: am 8c189479: am ef24bc00: Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev
* commit 'ee8ac623edee9352fdbf2f653af564a9df8514d2':
  Update stylus button press recognition in View to use new MotionEvent APIs
2015-06-01 19:04:22 +00:00
Mady Mellor
c837fdace7 am 36ffd6d6: am ed836dec: am cac7b2b1: Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev
* commit '36ffd6d6b68d577903a3a71f8742779379e6d54c':
  Update stylus button press recognition in GestureDetector to use new APIs
2015-06-01 19:04:15 +00:00
Filip Gruszczynski
36f5c7dd42 am 183f8fa4: am 21605b33: am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev
* commit '183f8fa450ededc74dad717664e02ec804e8fe76':
  Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""
2015-06-01 19:03:59 +00:00
Adam Powell
e9fd6d29f4 Don't take the compatibility path for non-primary ActionModes
Action modes that are not of type PRIMARY currently go through some
compatibility gymnastics so that the non-typed startActionModeForChild
ViewParent method has an opportunity to process them. Unfortunately, a
lot of apps in the wild use AppCompat, which intercepts these and
presents its own contextual action bar UI.

In practice this now means that the new floating toolbars for
TextViews and similar components don't show up in the majority of
existing apps. While this may be more correct from a compatibility
standpoint, it presents a poor user experience.

Only take the compatibility code path that calls through the older,
untyped startActionModeForChild method when the type is PRIMARY. The
tradeoff is that apps that previously would use parent views to modify
a text selection action mode will now no longer be able to do so.

Change-Id: I8c892a7a84ec36e6a484a5cba0c95281ea6beafb
2015-06-01 11:26:32 -07:00
Yohei Yukawa
38f59f80a6 am 64f5d4f0: am d9597642: am 512234f1: Merge "Close input session when the view is detached from the window." into mnc-dev
* commit '64f5d4f0311d9ac61a432d4a37948c55ae42bc2c':
  Close input session when the view is detached from the window.
2015-06-01 17:24:47 +00:00
Jeff Brown
4363875b8f am 19d50b8f: am 82f7affa: am cb81d183: Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev
* commit '19d50b8f796df8e547b6c72662ab6086971b480e':
  Tell PhoneWindowManager when we start/finish interactive changes.
2015-06-01 17:24:27 +00:00
Doris Liu
80ba46a585 am 82b45589: am dab83061: am 1501da4b: Merge "Fix calls to Rect.intersect() in package android.view" into mnc-dev
* commit '82b455892c6a7f228cf444f6cd949f0edeade113':
  Fix calls to Rect.intersect() in package android.view
2015-06-01 17:24:20 +00:00
Alan Viverette
242b9c4eee Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev 2015-06-01 16:39:10 +00:00
Mady Mellor
3aa33b3da0 Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev 2015-06-01 16:17:37 +00:00
Mady Mellor
ef24bc0039 Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev 2015-06-01 16:16:20 +00:00
Mady Mellor
cac7b2b175 Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev 2015-06-01 16:16:00 +00:00
Alan Viverette
faeac960cc Fix row/column order when unparcelling CollectionItemInfo
Bug: 21527853
Change-Id: I02a75b9395a4d573f5fd49abcbd282b35e2c8f3c
2015-06-01 09:03:27 -07:00
Yohei Yukawa
a6c4c80cc7 am 1d95daf3: am 4ad0161a: am 650a9135: Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev
* commit '1d95daf37dd492ae3f7c1ea0a35114ae32dcaecf':
  Revert "Rely on IMM#focusOut() to close input session."
2015-06-01 15:47:43 +00:00
Doris Liu
626e3fa160 am 0040c7d2: am c2713141: am f042cd84: Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev
* commit '0040c7d2bab147d4ea88aa7d0299bd51420b799f':
  Update doc to include how clipToPadding affects EdgeEffect
2015-06-01 15:47:38 +00:00
James Cook
fe114c68bb am fcce03b6: am 3c668bac: am 63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev
* commit 'fcce03b6085b3faaaa2c95a6c32343be07cce2a3':
  assist: Fix reported colors/styles for TextView/Switch
2015-06-01 15:46:20 +00:00
Yohei Yukawa
9b039ef2a9 am 47d691ba: am 92086e06: am 5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev
* commit '47d691baf79f863f9ad3091642c7f9944eed3b21':
  Rely on IMM#focusOut() to close input session.
2015-06-01 15:43:59 +00:00
Filip Gruszczynski
99bcc3eee2 Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev 2015-06-01 15:42:42 +00:00
Yohei Yukawa
512234f196 Merge "Close input session when the view is detached from the window." into mnc-dev 2015-05-30 00:52:30 +00:00
Yohei Yukawa
b13f015ab5 Close input session when the view is detached from the window.
This is the 3rd trial to fix Bug 20820914.

In followig CLs, we have tried to address a input session
leak when the focused view is detached from the focused
window by relying on IMM#focusOut() but failed because of
regressions like Bug 21508503.
- Ib4bd70ce0305a6bde6a929bcc6ad20a2b8402a97
- I219394178e4172bc47864297f1418e677dba25e5
- Id6afc8fc64512225578c62557b96c7dc2e969adf
- Ib1b037594ebbb4ad4cf2d59e21c7a8ca9d8dc930
- I2228ae0c48ad3d9e0b55875f0dcb5ef8c55b0c5f

What we have learned from Bug 21508503 was that re-enabling
IMM#focusOut() probably requires much more work than we
thought.  Also relying on IMM#focusOut() might be overkill
because the situation in Bug 20820914 is really special where
the focused view is detached from the focused window hence
we should be able to be fix the issue more conservatively
by closing input session when and only when the focused
view is detached from the focused view, rather than
re-enabling IMM#focusOut() globally.

Bug: 20820914
Change-Id: Iaf3fe2c065b5bf91e49a729ba46262114bb6da88
2015-05-29 17:44:51 -07:00
Jeff Brown
cb81d18367 Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev 2015-05-30 00:33:07 +00:00