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

62433 Commits

Author SHA1 Message Date
Todd Kennedy
bfbcf324fe Merge "Allow app downgrades" into nyc-dev am: b0f6e311ce 
am: 52e1a26891

* commit '52e1a2689125a048e027068f31a2145a97de2042':
  Allow app downgrades
 2016-03-11 23:58:23 +00:00
Todd Kennedy
8e3a15b474 Merge "Add minSdk to dumpsys" into nyc-dev am: 1374af2c7b 
am: aa2b0035de

* commit 'aa2b0035de76a44e2624dd2a4a03408b097e7ac5':
  Add minSdk to dumpsys
 2016-03-11 23:58:21 +00:00
Todd Kennedy
52e1a26891 Merge "Allow app downgrades" into nyc-dev 
am: b0f6e311ce

* commit 'b0f6e311ce19add792048db855844e542e808dd6':
  Allow app downgrades
 2016-03-11 23:54:03 +00:00
Todd Kennedy
aa2b0035de Merge "Add minSdk to dumpsys" into nyc-dev 
am: 1374af2c7b

* commit '1374af2c7be265701b9b402b7d4749ffe716ef01':
  Add minSdk to dumpsys
 2016-03-11 23:54:00 +00:00
Todd Kennedy
b0f6e311ce Merge "Allow app downgrades" into nyc-dev 2016-03-11 19:38:35 +00:00
Todd Kennedy
c84d1ab11a Allow app downgrades 
only system apps can do this

Change-Id: If0947f13f5c447f9396690bfda3ad40b07fbbb6b
 2016-03-11 11:37:17 -08:00
Todd Kennedy
1374af2c7b Merge "Add minSdk to dumpsys" into nyc-dev 2016-03-11 19:26:37 +00:00
Todd Kennedy
89d60189cd Add minSdk to dumpsys 
Bug: 27526333
Change-Id: I0148275013ebab899bcb63c07d71a840539c1863
 2016-03-11 11:18:32 -08:00
Alan Viverette
a019841dd1 Merge "Add consistent @NonNull annotations for drawable callbacks" into nyc-dev am: 79936ddda4 
am: a3710fbd27

* commit 'a3710fbd2780fe6decd11d2bc259f0c3b6e28f71':
  Add consistent @NonNull annotations for drawable callbacks
 2016-03-11 18:59:49 +00:00
Eino-Ville Talvala
dccaa2809e Merge "Camera2: Add buffer drop error callback" into nyc-dev am: 95171050e9 
am: e398d06352

* commit 'e398d063523a492c2f3b27a9bc5611e702893efb':
  Camera2: Add buffer drop error callback
 2016-03-11 18:59:46 +00:00
Alan Viverette
a3710fbd27 Merge "Add consistent @NonNull annotations for drawable callbacks" into nyc-dev 
am: 79936ddda4

* commit '79936ddda4c8d1709f736cda013070c3ab32db6f':
  Add consistent @NonNull annotations for drawable callbacks
 2016-03-11 18:49:50 +00:00
Alan Viverette
79936ddda4 Merge "Add consistent @NonNull annotations for drawable callbacks" into nyc-dev 2016-03-11 18:42:43 +00:00
Eino-Ville Talvala
e398d06352 Merge "Camera2: Add buffer drop error callback" into nyc-dev 
am: 95171050e9

* commit '95171050e9877deb9b1f84b4c55aa828229e2809':
  Camera2: Add buffer drop error callback
 2016-03-11 18:18:13 +00:00
Eino-Ville Talvala
95171050e9 Merge "Camera2: Add buffer drop error callback" into nyc-dev 2016-03-11 18:13:01 +00:00
Makoto Onuki
94ae124147 Merge "Test for ShortcutManager.updateShortcuts(), also" into nyc-dev am: 04efe9e5ff 
am: 0408672bcb

* commit '0408672bcbc9a23ff2c83962ceb8399aa0dbc087':
  Test for ShortcutManager.updateShortcuts(), also
 2016-03-11 18:10:04 +00:00
Makoto Onuki
0408672bcb Merge "Test for ShortcutManager.updateShortcuts(), also" into nyc-dev 
am: 04efe9e5ff

* commit '04efe9e5ff56ff6c4db6fe7eb4c35acb5b6f61ac':
  Test for ShortcutManager.updateShortcuts(), also
 2016-03-11 18:06:01 +00:00
Makoto Onuki
04efe9e5ff Merge "Test for ShortcutManager.updateShortcuts(), also" into nyc-dev 2016-03-11 18:00:18 +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
f6d87ec193 Add consistent @NonNull annotations for drawable callbacks 
Bug: 27599515
Change-Id: I33fdc5392302403bfff9cc74a8226173ec962af6
 2016-03-11 10:09:14 -05:00
Alan Viverette
d969cc6856 Merge "Add temporary logging to SimpleMonthView" into nyc-dev 2016-03-11 15:08:25 +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
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
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
Selim Cinek
78f6971660 Merge changes I8c1cd4d4,I5ed13c17,If603049c,I5cb7937c into nyc-dev am: 00e61f5a64 
am: 00fdea7e14

* commit '00fdea7e14841c516dea884cd28bb5cfa0272c9d':
  Fixed a bug where text would still not animate
  Reseting user expansions when the shade is collapsed
  Added more spacing around notifications
  Fixed an bug with the notification backgrounds
 2016-03-11 02:30:41 +00:00
Selim Cinek
00fdea7e14 Merge changes I8c1cd4d4,I5ed13c17,If603049c,I5cb7937c into nyc-dev 
am: 00e61f5a64

* commit '00e61f5a6455ba0ae90859acdd76e54efc849c3c':
  Fixed a bug where text would still not animate
  Reseting user expansions when the shade is collapsed
  Added more spacing around notifications
  Fixed an bug with the notification backgrounds
 2016-03-11 02:27:55 +00:00
Selim Cinek
00e61f5a64 Merge changes I8c1cd4d4,I5ed13c17,If603049c,I5cb7937c into nyc-dev 
* changes:
  Fixed a bug where text would still not animate
  Reseting user expansions when the shade is collapsed
  Added more spacing around notifications
  Fixed an bug with the notification backgrounds
 2016-03-11 02:20:15 +00:00
Makoto Onuki
7a6a05f0cc Test for ShortcutManager.updateShortcuts(), also 
... fix bugs

Bug 27548047

Change-Id: Ia55d35521912dcba2fb1bb9c20588a83d1a2d004
 2016-03-10 18:01:06 -08:00
Raph Levien
9593c1334e Merge "Invalidate TextView on change of elegantTextHeight" into nyc-dev am: a4750fd71d 
am: 8c8e942b50

* commit '8c8e942b50de7e3a765e339b30adbe2d43443874':
  Invalidate TextView on change of elegantTextHeight
 2016-03-11 01:37:35 +00:00
Raph Levien
8c8e942b50 Merge "Invalidate TextView on change of elegantTextHeight" into nyc-dev 
am: a4750fd71d

* commit 'a4750fd71d2a87e02b666590537a0ba026b331ec':
  Invalidate TextView on change of elegantTextHeight
 2016-03-11 01:33:14 +00:00
Aga Wronska
eb77f7da8b Merge "Display file names in Media libraries in grid mode" into nyc-dev am: 8800f2d314 
am: dfd8ef3a63

* commit 'dfd8ef3a63c1f1f24ac5c6c54822b61544f7a0af':
  Display file names in Media libraries in grid mode
 2016-03-11 01:30:14 +00:00
Raph Levien
a4750fd71d Merge "Invalidate TextView on change of elegantTextHeight" into nyc-dev 2016-03-11 01:26:52 +00:00
Aga Wronska
dfd8ef3a63 Merge "Display file names in Media libraries in grid mode" into nyc-dev 
am: 8800f2d314

* commit '8800f2d314793b3a97d27b96c0d2faef9e2efbd1':
  Display file names in Media libraries in grid mode
 2016-03-11 01:26:40 +00:00
Aga Wronska
8800f2d314 Merge "Display file names in Media libraries in grid mode" into nyc-dev 2016-03-11 01:23:20 +00:00
Steve McKay
44085d45fd Merge "Delete downloads activity." into nyc-dev am: 4064f60831 
am: 412f1c9e58

* commit '412f1c9e58459b68016b2ca9d39788f530166452':
  Delete downloads activity.
 2016-03-11 00:23:22 +00:00
Steve McKay
412f1c9e58 Merge "Delete downloads activity." into nyc-dev 
am: 4064f60831

* commit '4064f60831faf30a1ceced3b08c61ee945f79bfb':
  Delete downloads activity.
 2016-03-11 00:15:24 +00:00
Steve McKay
4064f60831 Merge "Delete downloads activity." into nyc-dev 2016-03-11 00:04:00 +00:00
Aga Wronska
09c07bdf37 Display file names in Media libraries in grid mode 
Bug: 26829518
Change-Id: If9e2f331df0233ef114c4147ffbc16214558b5ce
 2016-03-10 15:56:43 -08:00
Adam Lesinski
5199141263 Merge "Cache per-Activity Resources objects" into nyc-dev am: 58f1018c56 
am: 3283e02a45

* commit '3283e02a45431d92689e92ba683a05b4fc457541':
  Cache per-Activity Resources objects
 2016-03-10 20:56:36 +00:00