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

62401 Commits

Author SHA1 Message Date
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
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
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
Adam Lesinski
3283e02a45 Merge "Cache per-Activity Resources objects" into nyc-dev 
am: 58f1018c56

* commit '58f1018c56a88e7864c7ff85f5b85129e790ffd2':
  Cache per-Activity Resources objects
 2016-03-10 20:53:54 +00:00
Adam Lesinski
58f1018c56 Merge "Cache per-Activity Resources objects" into nyc-dev 2016-03-10 20:50:40 +00:00
Steve McKay
6ce903d7b7 Delete downloads activity. 
Delete "MANAGE_ROOT" activity.
Add intent filter for "BROWSE_DOWNLOADS".
Open by default on Downloads directory.

Bug: 27563427
Change-Id: I1f85dc17a0bc94b439a272847e4ab3bb347ead23
 2016-03-10 11:34:03 -08:00
Adam Lesinski
082614c6a5 Cache per-Activity Resources objects 
Each Activity has a Resources object whose underlying state changes
when a configuration change occurs, both global and for that activity only (multi-window).
Views and other clients of the Resources object can safely cache it knowing that
they always have a reference to the most up-to-date resources.

This applies to Resources.Theme objects as well.

Bug:26854894
Change-Id: Ifd3da5a1086e17f747dfc265a447fe92a3a5c692
 2016-03-10 11:30:18 -08:00
Kenny Guy
25ed2ead62 Merge "Update docs to make suspend then uninstall clear." into nyc-dev am: ab750d283a 
am: fd1ce2b9e2

* commit 'fd1ce2b9e27eec3b1b017ab23cd08729d4cc2063':
  Update docs to make suspend then uninstall clear.
 2016-03-10 19:26:08 +00:00
Kenny Guy
fd1ce2b9e2 Merge "Update docs to make suspend then uninstall clear." into nyc-dev 
am: ab750d283a

* commit 'ab750d283aca3dcfa8178589ca64e8be819f848b':
  Update docs to make suspend then uninstall clear.
 2016-03-10 19:23:42 +00:00
Kenny Guy
ab750d283a Merge "Update docs to make suspend then uninstall clear." into nyc-dev 2016-03-10 19:19:08 +00:00
George Mount
619f2ebf32 Merge "Fix ArcMotion path creation in some quadrants." into nyc-dev am: fdce57b6dc 
am: 28f3738335

* commit '28f3738335d4fb09da1e1580a480a011bdd2bf74':
  Fix ArcMotion path creation in some quadrants.
 2016-03-10 18:26:56 +00:00
George Mount
28f3738335 Merge "Fix ArcMotion path creation in some quadrants." into nyc-dev 
am: fdce57b6dc

* commit 'fdce57b6dc931c6d038117d34b70e97a22de2b27':
  Fix ArcMotion path creation in some quadrants.
 2016-03-10 18:24:47 +00:00
George Mount
fdce57b6dc Merge "Fix ArcMotion path creation in some quadrants." into nyc-dev 2016-03-10 18:19:10 +00:00
Todd Kennedy
0ef1569f17 Merge "fix docs" into nyc-dev am: 23ca16865a 
am: 08651fb868

* commit '08651fb86876711b5de8f22b2c9904c02b99aab9':
  fix docs
 2016-03-10 18:17:59 +00:00
Todd Kennedy
08651fb868 Merge "fix docs" into nyc-dev 
am: 23ca16865a

* commit '23ca16865ae63a482f8725f663231389a7984202':
  fix docs
 2016-03-10 18:15:57 +00:00
Todd Kennedy
23ca16865a Merge "fix docs" into nyc-dev 2016-03-10 18:11:31 +00:00
Todd Kennedy
1ed6b87634 fix docs 
No code change; just doc clarification per API Review Council suggestions

Bug: 27531045
Change-Id: Ib1eef9635d68d44be596888b46de0650883d118c
 2016-03-10 10:07:00 -08:00
Christopher Tate
f1dd9d9e2f Merge "Improve AlarmManager docs" into nyc-dev am: 4206bde4d7 
am: c097e6eb93

* commit 'c097e6eb9379f32d850c941ea44fad7a0a05b9c8':
  Improve AlarmManager docs
 2016-03-10 18:03:57 +00:00
Christopher Tate
c097e6eb93 Merge "Improve AlarmManager docs" into nyc-dev 
am: 4206bde4d7

* commit '4206bde4d731a0633f7a4ef778f4d92a4b1adb4a':
  Improve AlarmManager docs
 2016-03-10 18:01:52 +00:00
Chris Tate
4206bde4d7 Merge "Improve AlarmManager docs" into nyc-dev 2016-03-10 17:58:19 +00:00
Chris Wren
6f4157a3ca Merge "revert recent changes around system listener registrations" into nyc-dev am: 46820517e4 
am: a5f9c63402

* commit 'a5f9c634028a85fda77cdda66800c0d25327fae8':
  revert recent changes around system listener registrations
 2016-03-10 17:45:47 +00:00
Chris Wren
a5f9c63402 Merge "revert recent changes around system listener registrations" into nyc-dev 
am: 46820517e4

* commit '46820517e449de678ac103a39b69276efe412eed':
  revert recent changes around system listener registrations
 2016-03-10 17:43:44 +00:00
Chris Wren
46820517e4 Merge "revert recent changes around system listener registrations" into nyc-dev 2016-03-10 17:39:52 +00:00
Muyuan Li
e7a4731d12 Merge "Added shortcut key to dock windows" into nyc-dev am: 2f14bb31ae 
am: 7ed17fbde2

* commit '7ed17fbde2d6bdcbf7e47e212e35c1d524346e59':
  Added shortcut key to dock windows
 2016-03-10 17:39:34 +00:00
Muyuan Li
7ed17fbde2 Merge "Added shortcut key to dock windows" into nyc-dev 
am: 2f14bb31ae

* commit '2f14bb31aeb2a736b5120e8b89abeb260d513e37':
  Added shortcut key to dock windows
 2016-03-10 17:35:51 +00:00
Muyuan Li
2f14bb31ae Merge "Added shortcut key to dock windows" into nyc-dev 2016-03-10 17:33:44 +00:00
Jesse Hall
858d833621 Merge "Refer to hasSystemFeature(String, int) in Vulkan feature docs" into nyc-dev am: a3fc34c71d 
am: 9a38ba89e5

* commit '9a38ba89e58f7ba6d78801dda015d77740cdb534':
  Refer to hasSystemFeature(String, int) in Vulkan feature docs
 2016-03-10 17:25:41 +00:00
Jesse Hall
9a38ba89e5 Merge "Refer to hasSystemFeature(String, int) in Vulkan feature docs" into nyc-dev 
am: a3fc34c71d

* commit 'a3fc34c71dd57ae3b7ac4972453ce7fab0dc62bb':
  Refer to hasSystemFeature(String, int) in Vulkan feature docs
 2016-03-10 17:23:15 +00:00
Jesse Hall
39ceeb5472 Refer to hasSystemFeature(String, int) in Vulkan feature docs 
Bug: 27531286
Change-Id: Ifb32ae519fc8118923d6216e1d574cbbf83dfd23
 2016-03-10 09:04:26 -08:00
Chris Wren
b7c810957f revert recent changes around system listener registrations 
also guard against the ranker calling the self-service registration functions.
"why do we even have that lever?"

Bug: 27577115
Change-Id: I8a01cfdd801320e53d56bcbf515b9ba17e677166
 2016-03-10 11:41:10 -05:00
Daniel Micay
b9e8f4602a Merge "fix SeekBarPreference support for summaries" am: 06ce16a54c 
am: b562aaaa4c

* commit 'b562aaaa4c484682d5ae46ebfed04062fa7e13c2':
  fix SeekBarPreference support for summaries
 2016-03-10 15:35:50 +00:00
Daniel Micay
b562aaaa4c Merge "fix SeekBarPreference support for summaries" 
am: 06ce16a54c

* commit '06ce16a54c971e922d9e34cc5a57f012614db20f':
  fix SeekBarPreference support for summaries
 2016-03-10 15:33:51 +00:00