235855 Commits

Author SHA1 Message Date
Narayan Kamath
298d83f016 Merge "Track libcore change 2c423c81bfa731df2577a." am: a1fd14328e
am: b47dc2032b

* commit 'b47dc2032bf247e3764254ba1409a1b081953986':
  Track libcore change 2c423c81bfa731df2577a.
2016-03-03 11:52:38 +00:00
Narayan Kamath
b47dc2032b Merge "Track libcore change 2c423c81bfa731df2577a."
am: a1fd14328e

* commit 'a1fd14328e990bc23dc5b8447bfe9839a3c7f137':
  Track libcore change 2c423c81bfa731df2577a.
2016-03-03 11:49:15 +00:00
Narayan Kamath
a1fd14328e Merge "Track libcore change 2c423c81bfa731df2577a." 2016-03-03 11:43:49 +00:00
Calin Juravle
44a39b00ac Merge "Better handling of various types of compilation in DexOptimizer" into nyc-dev
am: 0c9ef61944

* commit '0c9ef61944e883219dd167f765a504ab8cdb7710':
  Better handling of various types of compilation in DexOptimizer
2016-03-03 10:58:44 +00:00
Calin Juravle
0c9ef61944 Merge "Better handling of various types of compilation in DexOptimizer" into nyc-dev 2016-03-03 10:54:02 +00:00
Diego Perez
11c031ff0b Merge "Implement native methods in VectorDrawable" into nyc-dev
am: a38b7c180d

* commit 'a38b7c180df47f88904ad6a11fda605235f6c91c':
  Implement native methods in VectorDrawable
2016-03-03 09:57:15 +00:00
Diego Perez
a38b7c180d Merge "Implement native methods in VectorDrawable" into nyc-dev 2016-03-03 09:55:05 +00:00
Yohei Yukawa
536d7e737b Merge "Fix a regression in InputMethodUtils." into nyc-dev
am: 488727f8c0

* commit '488727f8c0b03a6067d9927af75f1d76bec5d640':
  Fix a regression in InputMethodUtils.
2016-03-03 09:53:12 +00:00
Yohei Yukawa
488727f8c0 Merge "Fix a regression in InputMethodUtils." into nyc-dev 2016-03-03 09:30:37 +00:00
Neil Fuller
6f5df889ac Merge "Change libraries needed by layoutlib to "host" libs" into nyc-dev
am: 44be5f0ed7

* commit '44be5f0ed70eb1643b49a492a78dd652613e2a95':
  Change libraries needed by layoutlib to "host" libs
2016-03-03 09:15:19 +00:00
Neil Fuller
44be5f0ed7 Merge "Change libraries needed by layoutlib to "host" libs" into nyc-dev 2016-03-03 09:11:09 +00:00
Yohei Yukawa
42275bc8b3 Fix a regression in InputMethodUtils.
It turns out that my previous CL [1] unexpectedly changed the behavior
of InputMethodUtils#getImplicitlyApplicableSubtypesLocked() in terms of
when "EnabledWhenDefaultIsNotAsciiCapable" extra value is taken into
account.

Suppose if an IME X has the following three subtypes:
 A. locale: en_US
    mode: handwriting
    extraValue:
 B. locale: hi
    mode: keyboard
    extraValue:
 C. locale: en_US
    mode: keyboard
    extraValue: AsciiCapable
 D. locale: zz
    mode: keyboard
    extraValue: AsciiCapable, EnabledWhenDefaultIsNotAsciiCapable

Given the above subtypes, here are results of what subtypes are enabled
by InputMethodUtils#getImplicitlyApplicableSubtypesLocked() I) before
the CL [1] and II) after the CL [1].

  - system language: hi:
      I:  B, D
     II:  B, D
  - system language: hi-IN:
      I:  B, D
     II:  B, D
  - system language: en-US
      I:  A, C
     II:  A, C
  - system language: en-GB
      I:  A, C
     II:  A, C
  - system language: ja-JP
      I:  B
     II:  D

What my previous CL actually broke is the the last one, and it's broken
because we accidentally started using
"EnabledWhenDefaultIsNotAsciiCapable" even when there is no subtype that
matches to the requested language.  Previously that attribute was used
if and only if 1) there is a subtype that matches the requested language
and 2) that subtype is not marked to be AsciiCapable.

If there there is no subtype that matches to the requested language,
what we had relied on is actually the result of
InputMethodUtils#findLastResortApplicableSubtypeLocked() called with
  canIgnoreLocaleAsLastResort = true,
which means that we had just picked up the first keyboard subtype as the
last fallback candidate regardless of it's locale.  This is why the
subtype B should be picked up in the last case where system language is
ja-JP.

This CL fixes the above unexpected behavior change regarding
"EnabledWhenDefaultIsNotAsciiCapable" so that the previous behavior can
be preserved.

  [1] Iaf179d60c12b9a98b4f097e2449471c4184e049b
      e985c240e3feb62ea38d5b4e386be083ca0f215b

Bug: 27129703
Bug: 27425459
Change-Id: Icd86cad955bf827a1eb41255f57fdf4ec315b93b
2016-03-03 09:05:11 +00:00
Lorenzo Colitti
9c129cccac Support 464xlat on Ethernet. am: 853d741ce7
am: 3921a90ec6

* commit '3921a90ec6762092ce8086fecc0d2f9a236ebb8f':
  Support 464xlat on Ethernet.
2016-03-03 08:53:24 +00:00
Lorenzo Colitti
3921a90ec6 Support 464xlat on Ethernet.
am: 853d741ce7

* commit '853d741ce739e0562e8b5386b8165e3d560fe7d4':
  Support 464xlat on Ethernet.
2016-03-03 08:39:16 +00:00
Lorenzo Colitti
853d741ce7 Support 464xlat on Ethernet.
Bug: 26991160
Change-Id: I848c9e86e1ed337e95cfddda46723a9a1dcaed30
2016-03-03 17:31:57 +09:00
Ricky Wai
7f378b1bc9 Merge "Fix clearDeviceOwner() not working in split-user mode" into nyc-dev
am: 8bbace3afc

* commit '8bbace3afcae7ca614fd8c8d86c4d48d47ded392':
  Fix clearDeviceOwner() not working in split-user mode
2016-03-03 06:25:14 +00:00
Ricky Wai
8bbace3afc Merge "Fix clearDeviceOwner() not working in split-user mode" into nyc-dev 2016-03-03 06:02:31 +00:00
Ryan Bavetta
e2e8824861 Merge "Fix soundtrigger test, adds null pointer check" into nyc-dev
am: 840c617c38

* commit '840c617c3869222132748fb54f4126f19605de0e':
  Fix soundtrigger test, adds null pointer check
2016-03-03 03:50:52 +00:00
Ryan Bavetta
840c617c38 Merge "Fix soundtrigger test, adds null pointer check" into nyc-dev 2016-03-03 03:46:10 +00:00
Steve McKay
78b377246e Merge "Correctly determine when to show details cell." into nyc-dev
am: 3b8db2dc0e

* commit '3b8db2dc0e4bab06b5cde373c3e10bb5f61e7149':
  Correctly determine when to show details cell.
2016-03-03 03:24:12 +00:00
Steve McKay
3b8db2dc0e Merge "Correctly determine when to show details cell." into nyc-dev 2016-03-03 03:21:27 +00:00
mukesh agrawal
d5d05a711c Merge "add configuration knob for WifiLogger ringbuffers" into mm-wireless-dev am: 2cdf03fe35
am: 3896412dd4

* commit '3896412dd4889fdfa4b48082e977dbc6f7bfb6d4':
  add configuration knob for WifiLogger ringbuffers
2016-03-03 03:16:23 +00:00
mukesh agrawal
3896412dd4 Merge "add configuration knob for WifiLogger ringbuffers" into mm-wireless-dev
am: 2cdf03fe35

* commit '2cdf03fe3547e4d30f46463bca1bfe4e0a54ee04':
  add configuration knob for WifiLogger ringbuffers
2016-03-03 03:12:46 +00:00
Ryan Bavetta
ea04e8fe75 Fix soundtrigger test, adds null pointer check
BUG:27461735
Change-Id: I95ea641e41bcaefce15004f508ddb4bed0b5f2a8
2016-03-03 03:10:40 +00:00
Mukesh Agrawal
2cdf03fe35 Merge "add configuration knob for WifiLogger ringbuffers" into mm-wireless-dev 2016-03-03 03:09:23 +00:00
Christopher Tate
06cfa553e3 Merge "Add API to clear a specific wallpaper" into nyc-dev
am: d493ed6c0c

* commit 'd493ed6c0c37b3d70087ea0512811526e41bb8b8':
  Add API to clear a specific wallpaper
2016-03-03 01:49:26 +00:00
Aga Wronska
7289c02961 Merge "Force show keyboard when presenting FragmentDialogs with EditText." into nyc-dev
am: 8755301017

* commit '87553010172e84feb952c2130f0aba734cdc4f44':
  Force show keyboard when presenting FragmentDialogs with EditText.
2016-03-03 01:47:03 +00:00
Lifu Tang
b11601fa53 Merge "Addressed the review comments from API Council" into nyc-dev
am: 99a4966ed7

* commit '99a4966ed710eddc6b79b7b1d0a5a63547078cbd':
  Addressed the review comments from API Council
2016-03-03 01:32:51 +00:00
Vadim Tryshev
dfe2f7ce30 Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev
am: c9f0a1103e

* commit 'c9f0a1103ea307e5e157e63e7915b38f83d27ca3':
  Adding getManagedUserBadgedDrawableForDensity() to PackageManager.
2016-03-03 01:31:18 +00:00
Chris Tate
d493ed6c0c Merge "Add API to clear a specific wallpaper" into nyc-dev 2016-03-03 01:30:35 +00:00
Selim Cinek
f78f8345ca Merge "Adjusted the behavior when expanding the notification panel" into nyc-dev
am: 8316fac9c0

* commit '8316fac9c0772b1908d45b2286298b5b791d3ca7':
  Adjusted the behavior when expanding the notification panel
2016-03-03 01:29:21 +00:00
Chris Craik
884d3fbe10 Merge "Fix merged bitmap mesh generation and reenable merging" into nyc-dev
am: 3f445f0eee

* commit '3f445f0eeea0c856916bd1170b5f09c0a3acc99f':
  Fix merged bitmap mesh generation and reenable merging
2016-03-03 01:27:32 +00:00
Renat Aksitov
6bfc3bd8f8 Merge "Voice Messaging Intent API." into nyc-dev
am: 8351ff25a1

* commit '8351ff25a1ef25dad69cf45431ba8aa82487bcd5':
  Voice Messaging Intent API.
2016-03-03 01:25:56 +00:00
Doris Liu
1763519a08 Merge "Handle multiple animation actions within one frame" into nyc-dev
am: 352fcaeb20

* commit '352fcaeb2067ee488d69e4da192fa4b96ee78bd8':
  Handle multiple animation actions within one frame
2016-03-03 01:24:21 +00:00
Yohei Yukawa
c4759151c4 Merge "Add more JavaDoc to InputConnectionWrapper." into nyc-dev
am: 3d68c9d30f

* commit '3d68c9d30fa9c95b49a9d6c8ba6db12dac47c2d7':
  Add more JavaDoc to InputConnectionWrapper.
2016-03-03 01:22:45 +00:00
Jeff Sharkey
b0eda79209 Merge "More protected broadcasts!" into nyc-dev
am: be3c6041ad

* commit 'be3c6041ad9a07822f0e83d60387b040eb569fdb':
  More protected broadcasts!
2016-03-03 01:21:12 +00:00
Steve McKay
8020fecc40 Merge "Use device model and name for internal storage." into nyc-dev
am: d53f0df7df

* commit 'd53f0df7dfb1eee22f7953870ed9d24688596712':
  Use device model and name for internal storage.
2016-03-03 01:19:13 +00:00
Jim Miller
f0060709ff Merge "Attempt to fix bug where OwnerInfo gets lost." into nyc-dev
am: 042a68ae32

* commit '042a68ae3297db27c4bd6aca7f1c39001261b85e':
  Attempt to fix bug where OwnerInfo gets lost.
2016-03-03 01:17:35 +00:00
Hyunyoung Song
477e1c6124 Merge "Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a" into nyc-dev
am: 5d634d7828

* commit '5d634d7828ed345c1cca46818a6beab1de0ab626':
  Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a
2016-03-03 01:15:52 +00:00
Aga Wronska
8755301017 Merge "Force show keyboard when presenting FragmentDialogs with EditText." into nyc-dev 2016-03-03 01:06:44 +00:00
Christopher Tate
79a2457e19 Add API to clear a specific wallpaper
There was previously no public API for clearing the keyguard wallpaper
versus the system wallpaper, or both.  Now there is.

Bug 27400185

Change-Id: If1789dd430040acdf16d77413c0e4b46bf3789f3
2016-03-02 17:05:25 -08:00
Lifu Tang
99a4966ed7 Merge "Addressed the review comments from API Council" into nyc-dev 2016-03-03 00:48:39 +00:00
Lifu Tang
76a620f048 Addressed the review comments from API Council
Following are the review comments from API Council:

(Places below that reference "s/foo/bar/" below are suggesting that "foo" be
 replaced with "bar".)

GnssClock
-- Class docs should not refer to "GPS" at the top level
-- s/InNs/Nanos/
-- s/Sec/Second/

GnssMeasurement
-- s/In// for "InUnitname"
-- s/Sec/Second/
-- s/Ms/Millis/
-- s/Deg/Degrees/
-- STATUS_GPS_LOCATION_DISABLED -> STATUS_GNSS_LOCATION_DISABLED

GnssMeasurementsEvent.Callback
-- "returns" -> "reports" in the method docs as the methods return void

LocationManager
-- register/unregisterGnssMeasurementEventCallback ->
   register/unregisterGnssMeasurementsEventCallback (plural)

GnssNavigationMessage
-- MESSAGE_TYPE_ constants -> change to just TYPE_; the "MESSAGE" is redundant
   with the class name
-- is a signed byte/short ok based on the standard here? If not consider using
   int in the public api

GnssStatus
-- Make sure @IntDef exists for the constellation type
-- Please append unit types for values returned to match GnssMeasurement methods

GnssStatusCallback
-- Please document time base/units for the time parameter of onFirstFix

Bug: 27385557
Change-Id: Ifed6a2eca3fd7ba89b3ded6964a70376235af8f4
2016-03-02 16:41:47 -08:00
Aga Wronska
02c532fb54 Force show keyboard when presenting FragmentDialogs with EditText.
Bug: 26823589
Change-Id: I593ed0e7ef40c9c95c311ca529d3826d73496458
2016-03-02 16:32:00 -08:00
Vadim Tryshev
c9f0a1103e Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev 2016-03-03 00:28:17 +00:00
Shasidhar Ganiga
7010387500 Merge "Fix for framework reboot on connecting to TV through HDMI." am: 7585cbfd34
am: d3747baad2

* commit 'd3747baad2d90fcbc375eb53fe3ec1015f1d2aab':
  Fix for framework reboot on connecting to TV through HDMI.
2016-03-03 00:09:49 +00:00
Shasidhar Ganiga
d3747baad2 Merge "Fix for framework reboot on connecting to TV through HDMI."
am: 7585cbfd34

* commit '7585cbfd34a46bc8332bf066a5d0f69677d3a7e1':
  Fix for framework reboot on connecting to TV through HDMI.
2016-03-02 23:57:28 +00:00
Selim Cinek
8316fac9c0 Merge "Adjusted the behavior when expanding the notification panel" into nyc-dev 2016-03-02 23:55:31 +00:00
Chris Craik
3f445f0eee Merge "Fix merged bitmap mesh generation and reenable merging" into nyc-dev 2016-03-02 23:55:28 +00:00
Selim Cinek
d1ad9ab312 Adjusted the behavior when expanding the notification panel
The topmost notification is now not collapsed anymore but slides in
expanded from the top. Therefore it's layout doesn't need to animate
anymore. This also cleans up a lot of code in the algorithm which was
depending on this resizing which isn't needed anymore.
In order to have that transition working perfectly, the padding when
collapsing a card is now the same as the slowdown length.
Also improved the logic when notification contents are allowed to
animate and when not.
Also fixed a bug where the top notification was cut off when QS was
expanded.

Bug: 27402534
Bug: 18434284
Change-Id: I31afa199d38d94e74fd45500c2236ffdb51d989d
2016-03-02 23:54:38 +00:00