Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
239,143 Commits 3 Branches 0 Tags
ef894f24ea2563ddb4865be94c12f756c45fac28
Commit Graph

239143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
ef894f24ea Merge "Set QS edit overflow bg" into nyc-dev am: 18fafa4be7 
am: 1b1480f27c

* commit '1b1480f27cdd28ea9ba7346bef88e318f6bb5a9a':
  Set QS edit overflow bg
 2016-03-11 16:11:02 +00:00
Jason Monk
1b1480f27c Merge "Set QS edit overflow bg" into nyc-dev 
am: 18fafa4be7

* commit '18fafa4be7de36cb319afe2d0faf258b24c39d1c':
  Set QS edit overflow bg
 2016-03-11 16:07:06 +00:00
Jason Monk
18fafa4be7 Merge "Set QS edit overflow bg" into nyc-dev 2016-03-11 16:00:48 +00:00
Jason Monk
a8321e6ab7 Set QS edit overflow bg 
Bug: 27396825
Change-Id: I656e49f66518f23bd05d59392f43fc1227207666
 2016-03-11 11:00:20 -05:00
Steve McKay
a238074f4e Merge "More snazzy animation for UX happiness." into nyc-dev am: a45612b777 
am: ec2e5392ce

* commit 'ec2e5392cef6823262382da35b13454006da88ad':
  More snazzy animation for UX happiness.
 2016-03-11 15:52:49 +00:00
Steve McKay
ec2e5392ce Merge "More snazzy animation for UX happiness." into nyc-dev 
am: a45612b777

* commit 'a45612b7776edd2b8cd516c5ea78247e906d02af':
  More snazzy animation for UX happiness.
 2016-03-11 15:48:51 +00:00
Steve McKay
a45612b777 Merge "More snazzy animation for UX happiness." into nyc-dev 2016-03-11 15:42:02 +00:00
Alan Viverette
146dbea111 Merge "Add temporary logging to SimpleMonthView" into nyc-dev am: d969cc6856 
am: 9f4f4f3962

* commit '9f4f4f39623322776d94b9636ee1e8a16265e89c':
  Add temporary logging to SimpleMonthView
 2016-03-11 15:14:36 +00:00
Alan Viverette
9f4f4f3962 Merge "Add temporary logging to SimpleMonthView" into nyc-dev 
am: d969cc6856

* commit 'd969cc68560bbec8d17c610b9330155ea8c65624':
  Add temporary logging to SimpleMonthView
 2016-03-11 15:12:30 +00:00
Alan Viverette
d969cc6856 Merge "Add temporary logging to SimpleMonthView" into nyc-dev 2016-03-11 15:08:25 +00:00
Derek Sollenberger
698fb3a91c Merge "Make reference to data within SkAutoTUnref unambiguous." 2016-03-11 13:06:29 +00:00
Jorim Jaggi
439affd23c Merge "Add ability to swap docked/fullscreen stack" into nyc-dev am: 95b69f8231 
am: b1e14fc05e

* commit 'b1e14fc05e591856d5f6cfec30a538341aa00f91':
  Add ability to swap docked/fullscreen stack
 2016-03-11 12:08:37 +00:00
Jorim Jaggi
b1e14fc05e Merge "Add ability to swap docked/fullscreen stack" into nyc-dev 
am: 95b69f8231

* commit '95b69f82316220bc40d227bf7208920eb6ed9283':
  Add ability to swap docked/fullscreen stack
 2016-03-11 12:06:04 +00:00
Jorim Jaggi
95b69f8231 Merge "Add ability to swap docked/fullscreen stack" into nyc-dev 2016-03-11 12:02:38 +00:00
Keisuke Kuroyanagi
2b8c98187b Merge "Fix: Context menu can contain obsolete suggestions." into nyc-dev am: 13d66d8456 
am: f6c1149985

* commit 'f6c1149985b6dff5c17af1d8b4eb7a0da3257456':
  Fix: Context menu can contain obsolete suggestions.
 2016-03-11 11:35:03 +00:00
Keisuke Kuroyanagi
f6c1149985 Merge "Fix: Context menu can contain obsolete suggestions." into nyc-dev 
am: 13d66d8456

* commit '13d66d8456ec4661a9eda5f26e72b1d9188bfbe6':
  Fix: Context menu can contain obsolete suggestions.
 2016-03-11 11:31:13 +00:00
Keisuke Kuroyanagi
13d66d8456 Merge "Fix: Context menu can contain obsolete suggestions." into nyc-dev 2016-03-11 11:17:37 +00:00
Yohei Yukawa
e91f669a95 Merge "Make sure to compare subtype language with system language." into nyc-dev am: 0f3647f444 
am: 3e5a1abba0

* commit '3e5a1abba0aaa378ca890fed9adf074342c68bae':
  Make sure to compare subtype language with system language.
 2016-03-11 10:36:46 +00:00
Yohei Yukawa
3e5a1abba0 Merge "Make sure to compare subtype language with system language." into nyc-dev 
am: 0f3647f444

* commit '0f3647f444bc6fdade70d91f473d599a53a1778d':
  Make sure to compare subtype language with system language.
 2016-03-11 10:32:45 +00:00
Yohei Yukawa
0f3647f444 Merge "Make sure to compare subtype language with system language." into nyc-dev 2016-03-11 10:25:59 +00:00
Keisuke Kuroyanagi
182f5fec53 Fix: Context menu can contain obsolete suggestions. 
When there are not enough number of suggestions, previously used
suggestions was continue to be used. This fixes it and simplifies code
by always allocating SuggestionInfo array.

Bug: 27602619
Change-Id: I9378315b8c810f126f65fade96ce9f6ff5271957
 2016-03-11 10:08:11 +00:00
Adam Lesinski
0dd5a7c3d5 Merge "AAPT2: Add descriptions of Attributes in Styleables for R.java" into nyc-dev am: 330c57dbd1 
am: 979aa9e6df

* commit '979aa9e6dfc0530593e5eeb285ef19a4f5cab7ad':
  AAPT2: Add descriptions of Attributes in Styleables for R.java
 2016-03-11 09:22:43 +00:00
Adam Lesinski
979aa9e6df Merge "AAPT2: Add descriptions of Attributes in Styleables for R.java" into nyc-dev 
am: 330c57dbd1

* commit '330c57dbd19a064d1f5a4adb3c8ed014711b473f':
  AAPT2: Add descriptions of Attributes in Styleables for R.java
 2016-03-11 09:18:48 +00:00
Adam Lesinski
330c57dbd1 Merge "AAPT2: Add descriptions of Attributes in Styleables for R.java" into nyc-dev 2016-03-11 09:16:44 +00:00
Yohei Yukawa
fe3f45dab3 Merge "Persist isAsciiCapable attribute of additional subtypes." into nyc-dev am: 607c0a0a09 
am: 07f4a3f4d4

* commit '07f4a3f4d4b8398ed6aa1963f711300c4a7af5e7':
  Persist isAsciiCapable attribute of additional subtypes.
 2016-03-11 09:09:17 +00:00
Yohei Yukawa
80861ff1c0 Make sure to compare subtype language with system language. 
This CL addresses a regression introduced by a recent CL [1] that
non-keyboard subtypes are no longer implicitly enabled based on the
system language (a.k.a. "use system language" in the subtype enabler)
due to a type mismatch in comparison.

Here is the original logic:
 if (language.equals(systemLanguage) && systemLocale.startsWith(locale))

And here is the logic replaced by [1]:
 if (locale != null && locale.equals(systemLanguage)) {

The new logic is simply broken, because locale is a Locale object while
systemLanguage is a String object.  It never matches.

With this CL we will compare the system language with the locale
language again, with several test cases that should have been included
in [1], as a temporary solution until we start relying on
LocaleUtils#filterByLanguage() for non-keyboard subtypes.

  [1]: Iaf179d60c12b9a98b4f097e2449471c4184e049b
       e985c240e3

Bug: 27560993
Change-Id: If2d1710174853180465832e6ecbbb91235b76210
 2016-03-11 01:08:52 -08:00
Yohei Yukawa
07f4a3f4d4 Merge "Persist isAsciiCapable attribute of additional subtypes." into nyc-dev 
am: 607c0a0a09

* commit '607c0a0a09e6543609f70eb27cc06ff44857252e':
  Persist isAsciiCapable attribute of additional subtypes.
 2016-03-11 09:05:20 +00:00
Yohei Yukawa
607c0a0a09 Merge "Persist isAsciiCapable attribute of additional subtypes." into nyc-dev 2016-03-11 09:02:22 +00:00
Martijn Coenen
83f7c39757 Merge "NFC antenna location asset." into nyc-dev am: 262a8f2a0f 
am: 1847a6c406

* commit '1847a6c406186246b275e7a6b6f05dcebaf2cbdd':
  NFC antenna location asset.
 2016-03-11 08:47:56 +00:00
Martijn Coenen
1847a6c406 Merge "NFC antenna location asset." into nyc-dev 
am: 262a8f2a0f

* commit '262a8f2a0f1d1d8e0ea3401d4b3d91a36b0754df':
  NFC antenna location asset.
 2016-03-11 08:45:28 +00:00
Martijn Coenen
262a8f2a0f Merge "NFC antenna location asset." into nyc-dev 2016-03-11 08:39:00 +00:00
Adam Lesinski
7656554f91 AAPT2: Add descriptions of Attributes in Styleables for R.java 
Change-Id: I69e7b73cbdfe4baf502348397435c501ae29ff5e
 2016-03-11 00:22:52 -08:00
Yohei Yukawa
1e1a447000 Persist isAsciiCapable attribute of additional subtypes. 
This was somehow missed in the previous commit [1] that added
isAsciiCapable attribute to InputMethodSubtype.

For devices from API level 14 to 23, IME developers might be able to
work around this issue by specifying "AsciiCapable" [2] in
imeSubtypeExtraValue, which is not coverted by CTS though.

  [1]: Ic3ace4b6e0432d56696bcbc0be336aec1dc744a5
       dc8abf6cee
  [2]: I0bc9954f163a3ec38d08b9ba842a8a31176eb6a6
       8e303cc5dd

Bug: 27603986
Change-Id: Ifb6bc83e782ac05df180dfe0d689897d07441a0c
 2016-03-10 23:46:07 -08:00
Keisuke Kuroyanagi
7ee08071ee Merge "Reset mWordIteratorWithText when SpellChecker locale is changed." into nyc-dev am: 01ef02d785 
am: 5b47ae745f

* commit '5b47ae745fd0e2e3ad176912b18701974274e074':
  Reset mWordIteratorWithText when SpellChecker locale is changed.
 2016-03-11 05:51:22 +00:00
Keisuke Kuroyanagi
5b47ae745f Merge "Reset mWordIteratorWithText when SpellChecker locale is changed." into nyc-dev 
am: 01ef02d785

* commit '01ef02d7853fd2996eae3d139f02d190f3c174a2':
  Reset mWordIteratorWithText when SpellChecker locale is changed.
 2016-03-11 05:48:42 +00:00
Keisuke Kuroyanagi
01ef02d785 Merge "Reset mWordIteratorWithText when SpellChecker locale is changed." into nyc-dev 2016-03-11 05:43:19 +00:00
Joe Fernandez
a2fbe47d64 Merge "docs: Fix reference docs build to indicate N changes" into nyc-dev am: 093889409b 
am: 60d139cc09

* commit '60d139cc09fb8d76f12fd1ce9d02647ff6db03b6':
  docs: Fix reference docs build to indicate N changes
 2016-03-11 04:57:12 +00:00
Joe Fernandez
60d139cc09 Merge "docs: Fix reference docs build to indicate N changes" into nyc-dev 
am: 093889409b

* commit '093889409b011b9ace3c188c311e3d63583038cd':
  docs: Fix reference docs build to indicate N changes
 2016-03-11 04:54:29 +00:00
Joe Fernandez
093889409b Merge "docs: Fix reference docs build to indicate N changes" into nyc-dev 2016-03-11 04:50:19 +00:00
Bill Yi
6d882e9d5c Merge "Import translations. DO NOT MERGE" into nyc-dev am: f7a410f599 -s ours 
am: 88ce243e9a  -s ours

* commit '88ce243e9aca3791a6e40f4657e70add48cac141':
  Import translations. DO NOT MERGE
 2016-03-11 04:49:22 +00:00
Bill Yi
155f5f762c Merge "Import translations. DO NOT MERGE" into nyc-dev am: 21f90460ff -s ours 
am: 716cfc3bf9  -s ours

* commit '716cfc3bf956d5ff9050789c7627ef55aa2bf204':
  Import translations. DO NOT MERGE
 2016-03-11 04:49:22 +00:00
Bill Yi
b28862686e Merge "Import translations. DO NOT MERGE" into nyc-dev am: c40bc5298b -s ours 
am: 0a40141216  -s ours

* commit '0a40141216361188fe9497dd5bd665d9189a8a9a':
  Import translations. DO NOT MERGE
 2016-03-11 04:49:22 +00:00
Bill Yi
8b24056046 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 8a9b6827c3 -s ours 
am: 07613482ce  -s ours

* commit '07613482cebb8f5c46c03530d7536a6b4100880d':
  Import translations. DO NOT MERGE
 2016-03-11 04:49:22 +00:00
Bill Yi
a77738661b Merge "Import translations. DO NOT MERGE" into nyc-dev am: 810404861b -s ours 
am: c70f545797  -s ours

* commit 'c70f5457973acd1dc33bcd594b0b6d195fe12f2a':
  Import translations. DO NOT MERGE
 2016-03-11 04:49:21 +00:00
Bill Yi
88ce243e9a Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: f7a410f599  -s ours

* commit 'f7a410f5999647a9563aed90c8e7961532a1875c':
  Import translations. DO NOT MERGE
 2016-03-11 04:46:26 +00:00
Bill Yi
716cfc3bf9 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 21f90460ff  -s ours

* commit '21f90460ff5e08480a68c04c7d0de2b81aa8fa86':
  Import translations. DO NOT MERGE
 2016-03-11 04:46:25 +00:00
Bill Yi
0a40141216 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: c40bc5298b  -s ours

* commit 'c40bc5298b94425635aa672f49d3acb06630200b':
  Import translations. DO NOT MERGE
 2016-03-11 04:46:25 +00:00
Bill Yi
07613482ce Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 8a9b6827c3  -s ours

* commit '8a9b6827c35ddfa1d9feabdbaa1423b302917d79':
  Import translations. DO NOT MERGE
 2016-03-11 04:46:24 +00:00
Bill Yi
c70f545797 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 810404861b  -s ours

* commit '810404861b73610705b54e7197b8f37505a8ffd0':
  Import translations. DO NOT MERGE
 2016-03-11 04:46:24 +00:00
Bill Yi
f7a410f599 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-11 04:42:36 +00:00