Commit Graph

52694 Commits

Author SHA1 Message Date
Mikhail Naganov
d7a08926cb Merge "WebView: add a note to the doc of WebView.loadDataWithBaseURL" 2015-09-16 22:32:55 +00:00
Fyodor Kupolov
cf9f751206 am fd464a30: am 71b4b738: am d20f2106: am bfc584df: Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev
* commit 'fd464a301fea9395ad2b882dc90b0fee6515e9d1':
  Use app directory as apkPath for cluster installs
2015-09-16 21:26:25 +00:00
Fyodor Kupolov
fd464a301f am 71b4b738: am d20f2106: am bfc584df: Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev
* commit '71b4b738a611565659df33fe56635d75a25e6f19':
  Use app directory as apkPath for cluster installs
2015-09-16 21:19:57 +00:00
Fyodor Kupolov
d20f210650 am bfc584df: Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev
* commit 'bfc584df683a84dffd8e04b7b13f619606a0a42a':
  Use app directory as apkPath for cluster installs
2015-09-16 21:02:53 +00:00
Oren Blasberg
ca33b3547c Merge "Cascading popup menus: open submenu on mouse hover." 2015-09-16 20:59:11 +00:00
Oren Blasberg
23087be779 Cascading popup menus: open submenu on mouse hover.
When the cascading feature is enabled, users can mouseover a
submenu item in a popup menu to expand and open the new submenu
(after a short timeout). Similarly, if a user mouseovers a
different menu item in the original menu, the submenu gets closed
(again, after a short timeout).

This should complete the implementation of cascading submenu
functionality.

Also fix two other issues:

(1) Update some oudated code in PopupMenu that was still opening
the submenu when a user clicks on a submenu item; this
responsibility now lives within the MenuPopupHelper's delegate
MenuPopup class, so it doesn't need to live in PopupMenu anymore.

(2) Fix an issue where icons would be force-set on a submenu when they
should not be. Instead, decide whether to show icons in a submenu
based on whether to show them in the top level menu, as intended.

Bug: 20127825
Change-Id: Ia46852c7f99436065ab4bc234de94dffc0019666
2015-09-16 13:47:03 -07:00
Mikhail Naganov
b29e0f6960 WebView: add a note to the doc of WebView.loadDataWithBaseURL
Add a note that the base URL can be sent to servers in
the 'Referer' HTTP header.

Bug: crbug.com/506592
Change-Id: Idf77e898645fe130ad569bd266b61257c4f0e3b3
2015-09-16 13:05:53 -07:00
Fyodor Kupolov
bfc584df68 Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev 2015-09-16 19:37:47 +00:00
Alan Viverette
8de78eba5d Merge "Ensure AM/PM buttons are at least 48x48dp" 2015-09-16 19:34:22 +00:00
Jim Kaye
f8d1e21e16 Eliminate false error messages when removing all fingerprints
When removing "all" fingerprints, the request is for ID 0, but
the responses are for the actual IDs being removed. When the
requested ID is 0, don't complain if the response ID doesn't match.

Change-Id: I1c8b5b567ea6164c9e0ce6d436ca3b7a6ba22825
2015-09-16 18:25:54 +00:00
Alan Viverette
f86bbd04b9 Ensure AM/PM buttons are at least 48x48dp
Also cleans up imports.

Bug: 24057304
Change-Id: I95e8e7c49247bcf51aabcb656d76c0bfa0f0865c
2015-09-16 14:19:21 -04:00
Xiaohui Chen
eecb98197c Refactor UserHandle.java
Remove the "final" keyword on methods, since the class is already
"final".

Change-Id: Ided5813d8a5417c492fd2bf73f9d8018140e5594
2015-09-16 18:07:19 +00:00
Rob Carr
3acde12254 Merge "Correct ActivityInfo constructors." 2015-09-16 17:51:21 +00:00
Chris Tate
ceca822966 am 9bf4d765: am e46bf3f7: am ee16be69: am 3290f5dd: Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev
* commit '9bf4d76579152fce4c045c78347a164d1b7305cd':
  Do not back up/restore the "pulse LED for notifications" setting
2015-09-16 17:47:01 +00:00
Chris Tate
9bf4d76579 am e46bf3f7: am ee16be69: am 3290f5dd: Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev
* commit 'e46bf3f7f25610a8839542af44eecbaf961892f6':
  Do not back up/restore the "pulse LED for notifications" setting
2015-09-16 17:25:06 +00:00
Chris Tate
ee16be69f1 am 3290f5dd: Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev
* commit '3290f5dd067557727f166ff7a51ad2b5209622f6':
  Do not back up/restore the "pulse LED for notifications" setting
2015-09-16 17:11:19 +00:00
Chris Tate
3290f5dd06 Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev 2015-09-16 17:05:07 +00:00
Xiaohui Chen
a6d602dff5 Merge "Cleanup USER_OWNER in various services" 2015-09-16 16:57:48 +00:00
Xiaohui Chen
7c69636c9a Cleanup USER_OWNER in various services
Bug: 19913735
Change-Id: I980370bab18e1b9ccf4043eed2b9fd721a940f72
2015-09-16 09:56:14 -07:00
Doris Liu
29a526695a Merge "Fix Spinner not restoring selection when set to GONE" 2015-09-16 16:45:12 +00:00
Jim Miller
7876646249 am 4d3e0f8b: am f84e0535: am 0dd1163a: am dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev
* commit '4d3e0f8b33572345e58e41f8540a9d3e3a9d7a35':
  Add logging to track fingerprint reco but not unlocking
2015-09-15 22:30:03 +00:00
Jim Miller
4d3e0f8b33 am f84e0535: am 0dd1163a: am dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev
* commit 'f84e0535aee45874cf022628c4959dd15c4b1bc5':
  Add logging to track fingerprint reco but not unlocking
2015-09-15 21:38:11 +00:00
Christopher Tate
9cecf14783 Do not back up/restore the "pulse LED for notifications" setting
Bug 24103790

Change-Id: I69a6a85e5282f9ca50fc2655bda4695757b92e74
2015-09-15 14:26:12 -07:00
Jim Miller
0dd1163af0 am dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev
* commit 'dca3b2f74f7979e87e2654baf83df42483ef4388':
  Add logging to track fingerprint reco but not unlocking
2015-09-15 21:22:50 +00:00
Robert Carr
3e2e011785 Correct ActivityInfo constructors.
ActivityInfo was missing initialization for the
documentLaunchMode flag in the copy-constructor
and the Parcel constructor. The copy-constructor
is used in multi-user/profile mode to create a
seperate instance of the ActivityInfo per uid
and this was manifesting in the linked bug.

Bug: 21590915
Change-Id: I6f71d94ec32ec6326d23c9b62e9d8d319e2fa25e
2015-09-15 20:58:32 +00:00
Filip Gruszczynski
b34939afef Merge "Preserve window during resize triggered relaunches." 2015-09-15 15:16:05 +00:00
Jim Miller
1adb4a7693 Add logging to track fingerprint reco but not unlocking
Bug 23940153

Change-Id: Idb01802ba68449370e8f3cbede0e2fe6d0b977ce
2015-09-14 19:12:35 -07:00
Toni Barzic
09d7c16747 Merge "Introduce settings for Automatic click when mouse pointer stops" 2015-09-15 00:28:01 +00:00
Filip Gruszczynski
a59ac9cd64 Preserve window during resize triggered relaunches.
This changes application code behavior when the activity relaunches due
to configuration change. It only applies to scenarios, where the
configuration change was triggered by a user generated resize of an
activity (i.e. user drags a corner of an activity and thus changes its
size).

Preserving a window means that we will keep the decor view and non
client decor view around, but remove all children views when the
activity gets destroyed. When the activity gets created again, it will
attach its new content to the preserved view hierarchy. Mind, we
actually recreate application side Window object, since some of its
features might changed, but we retain its elevation (to not trigger
relayout with new layout params).

Preserving the window also means that we don't call the window manager
service to remove and later add the window. Instead, we continue using a
single window state throughout the resize operation.

Change-Id: Ie3d2878ed09c99ff343044bfe7a29a0ba07a265e
2015-09-14 15:59:32 -07:00
Wale Ogunwale
ca9f413b70 Merge changes Id8d6f639,Iedc9e21b
* changes:
  Support creating docked stack at top/left/bottom/right half of screen
  Display dim layer when task is dragged to screen edge
2015-09-14 22:56:33 +00:00
Vinod Krishnan
0f07424dc5 am f274e325: am aae9c4ab: am 74c3a0e7: Merge "Add some constants for Wear MNC Perms" into cw-e-dev
* commit 'f274e3252b263d9e001a8de9d55c065f353ad02f':
  Add some constants for Wear MNC Perms
2015-09-14 22:43:51 +00:00
Wale Ogunwale
59a73ca331 Support creating docked stack at top/left/bottom/right half of screen
Change-Id: Id8d6f639ed67baadb856ce84a20af8929e04cb2e
2015-09-14 15:37:47 -07:00
Vinod Krishnan
f274e3252b am aae9c4ab: am 74c3a0e7: Merge "Add some constants for Wear MNC Perms" into cw-e-dev
* commit 'aae9c4ab35ac98e8106d6a57d9d094780fbb0189':
  Add some constants for Wear MNC Perms
2015-09-14 22:36:29 +00:00
Vinod Krishnan
74c3a0e7b4 Merge "Add some constants for Wear MNC Perms" into cw-e-dev 2015-09-14 22:23:25 +00:00
Toni Barzic
386f834970 Introduce settings for Automatic click when mouse pointer stops
Settings in question are:
- accessibility_autoclick_enabled -> Whether the feature is enabled
- accessibility_autoclick_delay -> Amount of time mouse pointer has to
    stay still before performing click

Enable/disabled AutoclickController event stream transformation (which
implements the feature) based on the accessibiilty_autoclick_enabled
value

BUG=23113412

Change-Id: I8178d10c09d86713bb4c725c95268a7c5f432eb4
2015-09-14 14:59:26 -07:00
Alex Hills
d04c6d19a5 resolved conflicts for 693e11e5 to mnc-dr-dev-plus-aosp
Change-Id: I701841759a80f434a09b086492e817ca23a6a2e6
2015-09-14 17:03:58 -04:00
Alan Viverette
96d9953f74 Merge "Include window type in relevant BadTokenExceptions" 2015-09-14 20:55:22 +00:00
Tenghui Zhu
f247ea6d4e Merge "Fix implicit lineTo issue" 2015-09-14 20:32:23 +00:00
Vinod Krishnan
61665cc4ae Add some constants for Wear MNC Perms
- Add an API for getting list of apps that has runtime perms

Change-Id: I4ebfc01033ea96efaac062fd34982fbd0d081073
2015-09-14 13:16:18 -07:00
Alan Viverette
73f6d60543 Include window type in relevant BadTokenExceptions
Bug: 23980921
Change-Id: Idb0f2d1fd0fd0c8525c6566c538c4cc6b5bb148b
2015-09-14 16:01:19 -04:00
Alexander Hills
6a261fd653 Merge "Cherry-pick system theme rebase to fix square UI on round watches" into cw-e-dev 2015-09-14 18:34:32 +00:00
George Mount
99c2760ed0 Merge "Ensure entering and exiting views don't match in Fragment Transitions." 2015-09-14 18:16:54 +00:00
George Mount
dd46ac3ae2 Merge "Ensure feature flags are set prior to checking Activity Transition." 2015-09-14 18:16:18 +00:00
Alan Viverette
3d2337eeb5 Cherry-pick system theme rebase to fix square UI on round watches
Our system themes were based on configurations that were added post-
init of the system theme.

I96e695441543379e4d5fdf3cc6f18d9e6cf953b4 broke this, because there
was a race condition in the code for rebasing themes

If8fecde76d62738a8e55eddf898eafc468afdba2 (the cherry-picked commit)
fixes the race condition and adds the rebasing back in.

This change cherry picks If8fecde76d62738a8e55eddf898eafc468afdba2.

Bug:23387146
Change-Id: I0725028e48599fc6cd9731ae16c71474dd5827e5
2015-09-14 10:56:02 -04:00
Alan Viverette
92539d5c75 Avoid OOBE when AbsListView layout is out of sync with adapter
Views are not synchronized with adapter state until a layout pass
occurs, which may cause an OOBE if a list item is removed and an
accessibility node is obtained before the next layout pass.

This CL caches the item's enabled state on the bound view's layout
params, which allows us to avoid relying on the adapter to populate
accessibility nodes. It also aborts actions if the target position
is no longer valid.

Updates the documentation on AdapterView to reflect that the result
of getPositionForView() may not be synchronized with the adapter.

Bug: 23943664
Change-Id: Ic79eaa2e26bec9cd8d90fdab434271bc4f3d8a68
2015-09-14 10:49:25 -04:00
Yohei Yukawa
686e03454b Merge "Mechanical merge of nested if statements." 2015-09-14 03:50:22 +00:00
Yohei Yukawa
24182f3dac Remove redundant casts.
This Cl is just a mechanical removal of redundant casts.
Nothing is changed logically.

Bug: 22285167
Change-Id: I460b781753553c002b6cd232ae5918b7acd616d9
2015-09-11 18:33:33 -07:00
Yohei Yukawa
ac8bdd203c Mechanical merge of nested if statements.
This is just a mechanical merge of nested if statements with a dead code
removal.  Nothing is changed logically.

Bug: 22285167
Change-Id: I28c1de84635b68108b25ec32ec58de2128758512
2015-09-11 18:17:11 -07:00
Doris Liu
b7714ae157 Fix Spinner not restoring selection when set to GONE
This CL restores the selected position when AdapterView
gets restored, rather than wait until the next measure/layout
pass to do it. After the change, even when the AdapterView
is set to GONE (i.e. no measure/layout pass), the selection
will still be kept up to date.

Bug: 23619366

Change-Id: I09a31b6e2a61ca0edf129af8fe634b83784f9167
2015-09-11 18:03:28 -07:00
Chong Zhang
8e89b31a62 Move window moving and resizing handling to WindowManager
- add a startMoving API to initiate a window move from app, once
  the move starts WindowManager will take over the event handling.

- detect touch events along window's outside border and start
  a resize if necessary

Change-Id: Ic7e8baba34e0aa27a43173e044ffb46e93e219e0
2015-09-11 17:15:19 -07:00