Commit Graph

59229 Commits

Author SHA1 Message Date
Chris Wren
bdf3376616 use importance instead of score
Change-Id: Id3b0a074671943b4fcabb63fe990cbfd1e46bdfd
2015-12-11 16:09:18 -05:00
Wale Ogunwale
5f986095be APIs for activity to know when its windowing/pip modes change
Added APIs that allow activities to ask the system if they are currently
in multi-window or picture-in-picture mode and also get notified when
their modes change.

Bug: 25509834
Bug: 25683717
Change-Id: I4b8c316a49940bd6a8b31a93b345f9fd725a4721
2015-12-07 07:40:56 -08:00
Todd Kennedy
c72b3101ee Merge "Add ephemeral installs" 2015-12-07 15:33:05 +00:00
Chris Banes
f2a7e9712f Fix possibility of ScrollView not allowing clicks after a fling
The reason that manifests is because SV's
onInterceptTouchEvent checks if it's scroller.isFinished()
returns true. The result of Scroller.isFinished() is only
valid if it has had computeScrollOffset() called on it before.

ScrollView currently posts a invalidation after a computeScroll()
call, which means that isFinished() *should* be valid, but it's
better to be explicit which CL adds.

BUG: 26051101
Change-Id: If78f48dc855de1776011cb7b0f95cb0a80d9b777
2015-12-07 11:53:26 +00:00
Filip Gruszczynski
3696301ada Merge "Update client configuration when resizing without crossing size threshold." 2015-12-07 02:17:47 +00:00
Tyler Gunn
2c3f36de14 Merge commit 'd40a83543a67a911b5dcfbb8d164cea0c5285a78' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 21:04:03 -08:00
Tyler Gunn
c87a3a2c0a Merge commit '109e9c449d5a0070df793c63383e474a03242ba5' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 21:00:24 -08:00
Tyler Gunn
26a43d1570 Merge commit '6cb5fcaad143227002bd4d00b1974e126d9a8090' into tgunn-mncvtdev-to-master-2015-12-04 2015-12-04 21:00:00 -08:00
Filip Gruszczynski
ca66481244 Update client configuration when resizing without crossing size threshold.
Even though the activity won't be relaunched and won't receive a
callback about the resize, we still need to update it's configuration.
Otherwise when the application queries for it, it will receive wrong
data.

Bug: 23904868
Change-Id: I601e91b8e71691c1cb5edb2734894441c4fde8e2
2015-12-04 17:14:52 -08:00
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
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
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
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
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
Sandra Kwan
db9df39992 Merge "AccountManager: add finishSession(...) API." 2015-12-04 23:35:20 +00: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).
  - 92280cd309 [1]
  - ed65bc0c62 [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
Yohei Yukawa
80a918c3bd Revert "Add @hide SpellCheckerSubtype#getLocaleObject()."
This reverts commit e3c761c87e.

Previous CL unintentionaly contained behavior change.

Change-Id: I1e350f224df815e991d9f42ac4145ecfc5c1c8b0
2015-12-04 22:26:41 +00:00
Yohei Yukawa
ab004d5ad8 Merge "Add @hide SpellCheckerSubtype#getLocaleObject()." 2015-12-04 22:17:32 +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
Rob Carr
6a935af378 Merge "Restore exception behavior of getLocationInWindow." 2015-12-04 21:08:54 +00: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
Filip Gruszczynski
ae5fe6abb3 Merge "Remove some sized based resource (match support lib removal)." 2015-12-04 20:09:31 +00:00
George Mount
0b2664913f Merge "Revert "Revert "Choose the correct Fragment to pull a Transiton from.""" 2015-12-04 18:02:28 +00:00
George Mount
ac97ba0c4c Merge "Revert "Revert "Give transitioning fragment a context prior to retrieving transition""" 2015-12-04 18:02:18 +00:00
George Mount
233c97c26f Revert "Revert "Choose the correct Fragment to pull a Transiton from.""
This reverts commit c30d875c7f.

Change-Id: Ica7c9b6d1dc6553aae893d2ce07bedef7da7dfe5
2015-12-04 18:00:55 +00:00
Jeff Sharkey
0534ac90e5 Merge "Handle non-encryption-aware accounts and sync." 2015-12-04 16:50:38 +00:00
Filip Gruszczynski
abd1ea4b2b Merge "Run activity visibility adjustment even if there is no top running." 2015-12-04 16:42:49 +00:00
Jeff Sharkey
9d8a1048bb Handle non-encryption-aware accounts and sync.
The system can now boot in a "locked" state where only encryption
aware (EA) components can be safely started.  When in this state,
PackageManager already filters away non-EA components, but system
services like AccountManager and SyncManager need to carefully handle
these temporarily "missing" components.

As a guiding principle, all known Accounts are still present when
the device is locked, but communication with underlying non-EA
authenticators is blocked.

To keep things simple for now, all SyncManager requests are kept
dormant until the user enters the unlocked state.

The core of this logic is that RegisteredServicesCache now works
with all components regardless of EA status, which prevents us from
accidentally thinking a service was removed when the user is locked.

Bug: 25945136
Change-Id: I8714121f6236b00821769023c4df7de1c8a99944
2015-12-04 09:36:39 -07:00
Ricky Wai
ccf15a45cf Merge "Change Contacts.CORP_CONTENT_FILTER_URI to enterprise API" 2015-12-04 16:35:33 +00:00
Ricky Wai
36220e3ed1 Merge "Make Work Directory API as Enterprise API" 2015-12-04 16:34:49 +00:00
Victor Chang
9d7670b466 Merge "Add ENTERPRISE_CONTENT_FILTER_URI to Callable and Phone" 2015-12-04 16:31:57 +00:00
George Mount
128690c07a Revert "Revert "Give transitioning fragment a context prior to retrieving transition""
This reverts commit 214f6749fc.

Change-Id: Iced45f42251a82448e4dc4392315c3864494a31a
2015-12-04 07:39:41 -08:00
Tomasz Mikolajewski
a51878d386 Merge "Add a FLAG_ARCHIVE flag to DocumentsContract." 2015-12-04 11:43:17 +00:00
Neil Fuller
1d4775fbb2 Merge "Add thread safety documentation" 2015-12-04 11:09:53 +00:00
Tomasz Mikolajewski
a4c338aea6 Add a FLAG_ARCHIVE flag to DocumentsContract.
Bug: 20176812
Change-Id: I4bf7c4f228682a68ca5106bfc757fb533e281a86
2015-12-04 19:16:28 +09:00
Tony Mak
b3523c45dd Merge "Introduce ONLY_IF_NO_MATCH_FOUND in CrossProfileIntentFilter" 2015-12-04 09:26:35 +00:00
Filip Gruszczynski
b635fdaf22 Remove some sized based resource (match support lib removal).
Bug: 25394588
Change-Id: I5b5b446667fc6ec028ec259da236967d3b2d22d2
2015-12-03 18:37:38 -08:00