227505 Commits

Author SHA1 Message Date
Eino-Ville Talvala
d351e29b8e Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am: 7417f70ac6 am: e2d516fd4b am: 5794dbb1a5
am: dd00ed1554

* commit 'dd00ed1554113d52c8b07ee36d5b0b912d74a268':
  Camera: codegen doc update
2015-12-05 00:45:33 +00:00
Yorick Henning
48e0445620 Merge "Added 46654* to fee-free US short codes." 2015-12-05 00:37:41 +00:00
Eino-Ville Talvala
dd00ed1554 Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am: 7417f70ac6 am: e2d516fd4b
am: 5794dbb1a5

* commit '5794dbb1a5f54b116911526c1086efda5dfb63f7':
  Camera: codegen doc update
2015-12-04 16:36:06 -08:00
Eino-Ville Talvala
5794dbb1a5 Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am: 7417f70ac6
am: e2d516fd4b

* commit 'e2d516fd4b77352919d1c40971678909e3f4a15d':
  Camera: codegen doc update
2015-12-05 00:28:38 +00:00
Yorick Henning
5ef596effc Added 46654* to fee-free US short codes.
This change excludes the Google Wallet dedicated short code (being used
    by the Google Wallet team to send notifications to users) from
premium phone numbers. Users may answer the text message free of charge
(e.g. answering HELP). Google internal reference b/25675421.

Change-Id: Ic022ccc19151224b53c8a35c9568e9b943d8220d
2015-12-04 16:27:04 -08:00
Eino-Ville Talvala
e2d516fd4b Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41
am: 7417f70ac6

* commit '7417f70ac6aa6a59ab67bac959ce39aa3372e0ef':
  Camera: codegen doc update
2015-12-04 16:20:47 -08:00
Yohei Yukawa
0894319162 Add subtypeId for SpellCheckerSubtype.
What this CL actually does is just copying the existing concept
"subtypeId" from InputMethodSubtype to SpellCheckerSubtype.

To recap, the underlying problem is that the system has stored only the
return value of SpellCheckerSubtype#hashCode() to track the set of
enabled subtypes, and SpellCheckerSubtype#hashCode() has been
implemented as Arrays.hashCode(new Object[] {locale, extraValue}), which
is problematic because:
  - Spell checker developers cannot change "locale" and/or 'extraValue'
    if they want to keep enabled subtypes enabled.
  - Android Framework developers cannot change the hash function even
    when new fields are added if they want to keep enabled subtypes
    enabled.
InputMethodSubtype has had the same issue, and what we did was
introducing a concept "subtypeId", which allows IME developers to
specify the return value of #hashCode().

For instance, suppose that a subtype X has already been used in
production with the following attributes:
  - locale: "tl_PH"
  - extraValues: "key1=value1,key2=value2"

With "subtypeId", you can change the attributes of subtype X without
losing the enabled state of subtype X on devices as follows.
  - locale: "fil_PH"
  - extraValues: "key1=value1,key2=value2,key3=value3"
  - subtypeId: Arrays.hashCode(new Object[] {
            "tl_PH", "key1=value1,key2=value2"})

This CL also deprecates existing public constructor of
SpellCheckerSubtype, which was probably published as a public API by
mistake.  Note that the constructor of SpellCheckerInfo class is @hide.
Also there is no public API that receives SpellCheckerSubtype object
instantiated by developers with custom data.  Making developers to be
able to instantiate SpellCheckerSubtype does not make sense right now.

Bug: 11736916
Bug: 22858221
Change-Id: I98f05c1e9421c47a93769bc4a6fe11b678bc2509
2015-12-04 16:16:47 -08:00
Eino-Ville Talvala
7417f70ac6 Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d
am: add4b91d41

* commit 'add4b91d41d3ba810b6b25c14d7c13050394f201':
  Camera: codegen doc update
2015-12-05 00:11:43 +00:00
Christopher Wiley
80fd1208b9 Rethrow remote's ServiceSpecificException
Certain system services would like to throw exceptions
with specific error codes, so that the framework can catch
these specific conditions and express them appropriately.

Bug: 25800533
Change-Id: I94b3d30fa131f5e14bba893c971615840085459f
2015-12-04 16:06:08 -08:00
Eino-Ville Talvala
add4b91d41 Merge "Camera: codegen doc update" into mnc-dev
am: 69c5e7143d

* commit '69c5e7143dd308e8db9b6055b428b7ad3964c1ff':
  Camera: codegen doc update
2015-12-04 16:03:23 -08:00
Eino-Ville Talvala
69c5e7143d Merge "Camera: codegen doc update" into mnc-dev 2015-12-04 23:54:05 +00:00
Sandra Kwan
db9df39992 Merge "AccountManager: add finishSession(...) API." 2015-12-04 23:35:20 +00:00
Elliott Hughes
be5474da4b Track rename from base/ to android-base/.
Change-Id: I31be831de812052d1c0d4c0781178d0756124bcf
2015-12-04 15:33:35 -08:00
Sandra Kwan
920f6ef983 AccountManager: add finishSession(...) API.
Adding finishSession API to AccountManager and
AbstractAccountAuthenticator.

Change-Id: I153dd2bb6fe01d2e4b10b41e8b553f59da26bd29
2015-12-04 15:32:47 -08:00
Robert Carr
12701f64d9 Fix build by making docs match params.
Change-Id: Id5bb5161514be372b709ecbb5d56e86554d3ec64
2015-12-04 15:18:40 -08:00
Chong Zhang
75b3720c50 Fix app over lockscreen being cropped by docked stack
When secure apps are launched over lockscreen, the bounds should always
be fullscreen. Also docked stack and divider shouldn't be visible while
lockscreen is shown.

bug: 25837786
Change-Id: I0bc681cdb46404fb79e9332d1f82fee51f338da9
2015-12-04 15:06:47 -08:00
Yohei Yukawa
bd2b4aa3f6 Merge changes I0af0f520,I51be014c
* changes:
  Rewrite a fake language code "tl" in SpellChecker.
  retry: Add @hide SpellCheckerSubtype#getLocaleObject().
2015-12-04 22:49:49 +00:00
Jeff Sharkey
65196ee28b Merge "Add tagging variants for DatagramSocket." 2015-12-04 22:44:40 +00:00
Yohei Yukawa
eae60ba5a4 Rewrite a fake language code "tl" in SpellChecker.
With following CLs, we already have a special rewrite rule of "tl" to
"fil" for IMEs that are targeting older versions of Android earlier than
Lollipop that did not support three letter language codes and used
"tl" (Tagalog) as the language string for "fil" (Filipino).
  - 92280cd309b0f5967dd253280962d8581844db89 [1]
  - ed65bc0c62ca99a118057db7ad54c4ccc14d52d0 [2]

  [1]: I94f203bddceb9c87710cb187cc3cc0ee6d9092a5
  [2]: Ica9cd2baac002c406f92331aadd7725d7424046a

With this CL, we have the same rewrite rule for spell checker services.

Bug: 20696126
Change-Id: I0af0f520a15337e33973391c9965364e3ae1ee4c
2015-12-04 14:43:17 -08:00
Yohei Yukawa
658c29e86e retry: Add @hide SpellCheckerSubtype#getLocaleObject().
This is the 2nd try of I39dc0c310158ad23ba6c987efce07deaf30ce693.

This is a mechanical refactoring with no behavior change.

With this CL, InputMethodSubtype and SpellCheckerSubtype have the same
getLocaleObject() hidden API, which makes it easy to share the logic in
subsequent CLs.

No behavior change is intended.

Bug: 11736916
Bug: 20696126
Bug: 22858221
Change-Id: I51be014c752b736a808e2b0d56e664941a218a2f
2015-12-04 14:43:01 -08:00
Jeff Sharkey
f0d7633bdc Add tagging variants for DatagramSocket.
Oops, we missed these along the way.

Bug: 25799174
Change-Id: I4ad368f9faee4b1996d605534dce4c2b23dbe200
2015-12-04 15:32:07 -07:00
Yohei Yukawa
8687b42463 Merge "Revert "Add @hide SpellCheckerSubtype#getLocaleObject()."" 2015-12-04 22:30:45 +00:00
Steve McKay
5a24749237 Merge "Fix broken copy after recent copy related chagnes." 2015-12-04 22:29:43 +00:00
Fyodor Kupolov
6bccb76a64 Allow --user current in dpm command
dpm command now accepts current user as an argument.

Bug: 25974105
Change-Id: I5335a2fc2159f9574e319697dcf5e0485233d8f2
2015-12-04 14:28:46 -08:00
Yohei Yukawa
80a918c3bd Revert "Add @hide SpellCheckerSubtype#getLocaleObject()."
This reverts commit e3c761c87efdee7c28461559015fa76602d4605a.

Previous CL unintentionaly contained behavior change.

Change-Id: I1e350f224df815e991d9f42ac4145ecfc5c1c8b0
2015-12-04 22:26:41 +00:00
Suprabh Shukla
35de4aa0ca Merge "Added default config to enable adding users from lockscreen" 2015-12-04 22:26:20 +00:00
Steve McKay
8fd086a18d Fix broken copy after recent copy related chagnes.
Also, add a label to Downloads app, and enabled drag and drop by default.
Cleanued up menu handling in BaseActivity (use switch statement).

Bug: 26033335
Change-Id: I3cef89a4a9f9e30b4e926411e94cf06bc2dc0f8d
2015-12-04 14:24:48 -08:00
Yohei Yukawa
ab004d5ad8 Merge "Add @hide SpellCheckerSubtype#getLocaleObject()." 2015-12-04 22:17:32 +00:00
Felipe Leme
5662dd8379 Merge "Refactoring: pulled ServiceHandler methods to its parent class." 2015-12-04 22:14:05 +00:00
Yohei Yukawa
34e284acce Merge "Add SpellCheckerSubtypeTest." 2015-12-04 22:12:36 +00:00
Felipe Leme
62607a4de0 Merge "Changed workflow so max progress can be dynamically updated." 2015-12-04 22:12:20 +00:00
Yohei Yukawa
e3c761c87e Add @hide SpellCheckerSubtype#getLocaleObject().
This is a mechanical refactoring with no behavior change.

With this CL, InputMethodSubtype and SpellCheckerSubtype have the same
getLocaleObject() hidden API, which makes it easy to share the logic in
subsequent CLs.

Bug: 11736916
Bug: 20696126
Bug: 22858221
Change-Id: I39dc0c310158ad23ba6c987efce07deaf30ce693
2015-12-04 22:07:39 +00:00
Felipe Leme
923afa9fe1 Refactoring: pulled ServiceHandler methods to its parent class.
Now ServiceHandler only have 2 methods:

- handleMessage(): part of its interface.
- poll(): delegates work to parent, but sends a delayed message
  so it keeps polling.

Also changed hardcoded "N/A" to a resource.

BUG: 25794470
Change-Id: I486fff46c1532685bfd6f5903349d14e55059219
2015-12-04 14:05:17 -08:00
Felipe Leme
5d70aebc28 Merge "Improved phrasing for "in progress" message." 2015-12-04 21:48:14 +00:00
Dianne Hackborn
371baee4d3 Merge "Add package command to print resolve activity." 2015-12-04 21:28:59 +00:00
Dianne Hackborn
894ce60a9f Fix issue #25656837: Static initialization order bug in ArrayMap leading to NPEs
Change-Id: Iec3532ba167b5a09a5e505997e9e6035033f713f
2015-12-04 13:25:48 -08:00
Rob Carr
6a935af378 Merge "Restore exception behavior of getLocationInWindow." 2015-12-04 21:08:54 +00:00
Yohei Yukawa
9534ae1858 Add SpellCheckerSubtypeTest.
Before introducing behavior changes, this CL adds
SpellCheckerSubtypeTest to make the current behavior clear.

Bug: 11736916
Bug: 20696126
Bug: 22858221
Change-Id: Ied18580f31497156510e1b785adfc248683ba94d
2015-12-04 13:05:20 -08:00
Filip Gruszczynski
8294f82562 Merge "Put PIP windows above transition animations." 2015-12-04 20:50:23 +00:00
Filip Gruszczynski
114d5ca711 Put PIP windows above transition animations.
PIP activities are already on top of everything else, but during
animation we increase the layer of the animated window for the duration
of the animation and it may cover the PIP. By forcing the same
adjustment on PIP windows we will keep them above animating windows.

Bug: 26015827
Change-Id: I8f7a87f41fed24b3e520fb599a94cf24cc2eeb50
2015-12-04 12:49:42 -08:00
Robert Carr
b948014e3e Restore exception behavior of getLocationInWindow.
Restore exception throwing behavior on invalid arguments
for getLocationInWindow. This is tested by CTS.
Tweak some variable names to make the exception string readable.

Change-Id: I069d63b354d90ce74d156362b223765a5c2da2f0
2015-12-04 12:48:55 -08:00
Julia Reynolds
c030986883 Merge "Topics can now have an Importance." 2015-12-04 20:37:28 +00:00
Julia Reynolds
5d25ee7a00 Topics can now have an Importance.
Bug: 22451710
Change-Id: I627121da6c4b85492715a8e8a099656dca52b734
2015-12-04 15:20:34 -05:00
Steve McKay
21217af63b Merge "Followup changes to ag/810782." 2015-12-04 20:14:34 +00:00
Steve McKay
27fd7c6727 Followup changes to ag/810782.
Note, one of the requested changes already happened.

Change-Id: I253cbc2b3b7f2091ca80f43c90e951263fc50ad2
2015-12-04 12:13:25 -08:00
Filip Gruszczynski
ae5fe6abb3 Merge "Remove some sized based resource (match support lib removal)." 2015-12-04 20:09:31 +00:00
Jun Mukai
b68d1639c6 Merge "Reset mPointerIconShape properly on window manager." 2015-12-04 20:08:02 +00:00
Vinit Deshpande
0dfd4faf01 Merge "Mark WIFI_AP_STATE_CHANGED_ACTION and extras @SystemApi." 2015-12-04 19:58:58 +00:00
Felipe Leme
719aaae3c1 Changed workflow so max progress can be dynamically updated.
BUG: 25794470
Change-Id: I75dfdabf9febf54f2fb714441d48b339f8d3d293
2015-12-04 11:50:58 -08:00
Amit Mahajan
28be2bdbe4 Merge "Cleanup related to files removed in Phone refactor." 2015-12-04 19:40:38 +00:00