Commit Graph

5359 Commits

Author SHA1 Message Date
Seigo Nonaka
70125f70dc Merge "Move buildInputMethodsAndSubtypesString to InputMethodUtils" 2015-09-17 06:01:13 +00:00
Seigo Nonaka
2a099bcd6f Move buildInputMethodsAndSubtypesString to InputMethodUtils
This CL is mechanical code moving and does not change any existing
behavior.

buildInputMethodsAndSubtypesString is introduced by
If0104151b3526da6ecc669adde3119a239ecafeb for addressing Bug 19822542.
This code moving is one of the TODOs in above change.

Bug: 22285167
Change-Id: Ie63cf593794c9062919887e04a64208a900b1b8b
2015-09-17 12:30:00 +09: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
Andres Morales
3dee67f35c am 3b715ce8: am 8d9ba684: am 5b78fda9: am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev
* commit '3b715ce887d01845b3da7d8c1212dae60da231a5':
  reset lockout deadline on device reboot
2015-09-16 16:33:59 +00:00
Andres Morales
3b715ce887 am 8d9ba684: am 5b78fda9: am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev
* commit '8d9ba684982cb2e1d2d86e77484bc8772c8ff328':
  reset lockout deadline on device reboot
2015-09-16 16:27:09 +00:00
Andres Morales
5b78fda91e am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev
* commit '38e6e4ef98ea1f116902725c282df9fb061a224e':
  reset lockout deadline on device reboot
2015-09-16 16:12:03 +00:00
Andres Morales
38e6e4ef98 Merge "reset lockout deadline on device reboot" into mnc-dr-dev 2015-09-16 16:04:56 +00:00
Filip Gruszczynski
640a3909a3 Fix leaking the first activity while preserving windows.
Preserving decor view across activity relaunches would leak the first
activity, because the decor view would hold onto into in the form of the
context. This CL fixes that by having DecorView and NonClientDecorView
use application context instead.

Another source of a leak is DecorView being inner, non static class.
This would keep the orignal, first PhoneWindow around, which in turn
holds a reference to the activity. DecorView is now static and has
explicit reference to the PhoneWindow.

Change-Id: I3df58755d65d3d36ea2157908b0000b2d5c4ab70
2015-09-15 18:28:03 -07:00
Oren Blasberg
ba630dba88 Merge "Fix broken popup menu in Shelf (andromeda)." 2015-09-15 18:11:19 +00:00
Oren Blasberg
9916282bac Fix broken popup menu in Shelf (andromeda).
This addresses a few oversights from an earlier CL:
1. In MenuPopupHelper#show() make sure to create a new MenuPopup in
   case the earlier one was dismissed.
2. Ensure the on-dismiss listener gets called even if the MenuPopupHelper's
   MenuPopup was previously closed and if a new one is opened.
3. Handle global layout changes properly by having the MenuPopup
   re-drawing/positioning itself.

Bug: 23973158
Change-Id: Iee866079770026f0fe17814892abc9825f9760a2
2015-09-14 16:18:50 -07: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
Xiaohui Chen
6b56ae59f8 Merge "Cleanup USER_OWNER in backup service" 2015-09-14 16:31:48 +00: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
Stefan Kuhne
59876c3ed5 Merge "Adding user resizability by dragging shadow outsets" 2015-09-11 23:49:42 +00:00
Adam Powell
b1e6e010d9 Merge "Handle single-choice ChooserActivities and bound ChooserTargetServices" 2015-09-11 21:32:27 +00:00
Oren Blasberg
96b22a98ce Merge "Add Cascading submenus implementation." 2015-09-10 16:58:01 +00:00
Oren Blasberg
8e12f8df07 Add Cascading submenus implementation.
This change adds a new Cascading implementation of MenuPopup. When
enabled, submenus will show up in a cascading side by side fashion
when opened next to popup menus.

Bug: 20127825
Change-Id: Ie3c797fb5dbada7521cd93dc4171950af2be2ff7
2015-09-10 09:54:17 -07:00
Jorim Jaggi
00cd47a2d2 resolved conflicts for 0fb3f695 to master.
Change-Id: I679920313a872f8eb81cf00ffb6ffe037b8d0a3a
2015-09-09 18:40:05 -07:00
Jorim Jaggi
0fb3f695cc am 17076cc2: am 5a9bb951: resolved conflicts for 5d0e02b6 to cw-e-dev
* commit '17076cc262ff7e6b384bcb7354983c21ac33a8e9':
  Add double-tap power button to open camera 1/2
2015-09-10 01:06:47 +00:00
Jorim Jaggi
5a9bb9516d resolved conflicts for 5d0e02b6 to cw-e-dev
Change-Id: Id974d29581304dc644659d1c470b5413d847944b
2015-09-09 17:49:57 -07:00
Jorim Jaggi
c76925031d am 35a88c06: am f27035d9: am 131d541a: am 16093fe3: Revert "Disable fingerprint after force lock"
* commit '35a88c065e24248ff6036eb3c5a581a1a520f8fe':
  Revert "Disable fingerprint after force lock"
2015-09-10 00:29:11 +00:00
Jorim Jaggi
5d0e02b64e Merge "Add double-tap power button to open camera 1/2" into mnc-dr-dev 2015-09-10 00:25:59 +00:00
Jorim Jaggi
35a88c065e am f27035d9: am 131d541a: am 16093fe3: Revert "Disable fingerprint after force lock"
* commit 'f27035d9ee506e4f817ccd49ab60df541c25bbe7':
  Revert "Disable fingerprint after force lock"
2015-09-10 00:21:30 +00:00
Jorim Jaggi
131d541ae1 am 16093fe3: Revert "Disable fingerprint after force lock"
* commit '16093fe3f0d824731a53a264a132504deb08421a':
  Revert "Disable fingerprint after force lock"
2015-09-10 00:05:38 +00:00
Jorim Jaggi
16093fe3f0 Revert "Disable fingerprint after force lock"
Bug: 23827042
This reverts commit 0cb50efdc2.

Change-Id: I40251500b2dcf95e63ce39a768e11a50b26fb923
2015-09-10 00:00:29 +00:00
Adrian Roos
5941c98c64 Add double-tap power button to open camera 1/2
Bug: 23787555
Change-Id: I052b64748f155c59fbb649b32265f559423a8845
2015-09-09 16:57:14 -07:00
Andres Morales
a4e2337566 reset lockout deadline on device reboot
Gatekeeper retains lockouts after reboot, but framework
doesn't. This causes odd behavior on a reboot after a lockout
as gatekeeper refuses to check the password and the framework
thinks it's an invalid attempt. Reset the lockout deadline
if we notice the clock reset in the framework.

Bug: 23681267

Change-Id: I3127ccd8f205494af5a8ed2b44d4370c37cc2f8f
2015-09-09 15:45:31 -07:00
Adam Powell
9761ab2a64 Handle single-choice ChooserActivities and bound ChooserTargetServices
Fix cases where we could try to unbind from a ChooserTargetService
that is not connected. This could happen if we still had stale replies
coming back after the activity was destroyed.

Always offer users an explicit choice in ChooserActivity, don't
auto-start a single option.

Make sure we don't allow a wedged ChooserTargetService to hold a hard
reference to the ChooserActivity via its internal result callback.

Bug 23152483

Change-Id: I7c8b1fc9559dcd477702ef582011b088b07d646b
2015-09-09 16:50:30 +00:00
Alan Viverette
c6c28731e5 Merge "Invalidate when Drawable.setState() returns true" 2015-09-08 14:08:19 +00:00
Xiaohui Chen
4cfe29bdf2 Cleanup USER_OWNER in backup service
This is just a straight constant replace.  The feature is tracked in a
separate bug b/22388012.

Bug: 19913735
Change-Id: I7ae0953558bfdb77441e9efd749f1bb1cc77050c
2015-09-04 13:57:20 -07:00
Yasuhiro Matsuda
f9fba98025 am e651ee9b: am 10191dd9: am 53f1a815: Merge "Remove unnecessary finally blocks for tracing."
* commit 'e651ee9bef73c00c3ca1f1ed57485a6c06b802fd':
  Remove unnecessary finally blocks for tracing.
2015-09-04 14:28:49 +00:00
Alan Viverette
ad0020f807 Invalidate when Drawable.setState() returns true
Ensures views that manage drawables follow the contract set forth in
the Drawable.setState() documentation.

Bug: 23792020
Change-Id: I4e5a449cd6535487873fd8443da50555c38e8ed9
2015-09-04 10:10:42 -04:00
Yasuhiro Matsuda
e651ee9bef am 10191dd9: am 53f1a815: Merge "Remove unnecessary finally blocks for tracing."
* commit '10191dd9d20f589fd6f7868a350c104372a57687':
  Remove unnecessary finally blocks for tracing.
2015-09-04 02:47:52 +00:00
Yasuhiro Matsuda
10191dd9d2 am 53f1a815: Merge "Remove unnecessary finally blocks for tracing."
* commit '53f1a815b4401f10cd833217143da44ab0408dcc':
  Remove unnecessary finally blocks for tracing.
2015-09-04 02:34:58 +00:00
Adrian Roos
c0c140a136 am 5b92de04: am 6bd2f87e: am bd2ad550: am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
* commit '5b92de04b7ff9954a50e54a86f11443a904fa547':
  Don't disable fingerprint when entering wrong credential
2015-09-03 22:06:08 +00:00
Adrian Roos
5b92de04b7 am 6bd2f87e: am bd2ad550: am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
* commit '6bd2f87ee4eac554646c5b04c44b6e3402bac84e':
  Don't disable fingerprint when entering wrong credential
2015-09-03 20:07:30 +00:00
Adrian Roos
bd2ad550c5 am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
* commit '34411e8fecab310a0402bd77e8fe5a5a488a783a':
  Don't disable fingerprint when entering wrong credential
2015-09-03 19:46:45 +00:00
Adrian Roos
34411e8fec Merge "Don't disable fingerprint when entering wrong credential" into mnc-dr-dev 2015-09-03 19:42:39 +00:00
Adrian Roos
af4ab3e2d3 Don't disable fingerprint when entering wrong credential
Bug: 23748205
Change-Id: I0ee2a0562d5ef2992a6a4b40d235601b19dcef16
2015-09-03 12:34:12 -07:00
Yasuhiro Matsuda
25878b2888 Remove unnecessary finally blocks for tracing.
BUG: 22207144
Change-Id: I2b15bb7c4055a1ad589b433d4f253868813ab311
2015-09-03 16:27:13 +09:00
Clara Bayarri
13612c332a am 3b60f72f: am 9b126882: am 01232c50: am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev
* commit '3b60f72fbaaeb7c52f5e86ff9f8d5dade0d0b444':
  Fix Custom action mode menu item onclick is not working
2015-09-03 06:39:13 +00:00
Clara Bayarri
3b60f72fba am 9b126882: am 01232c50: am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev
* commit '9b126882e61f2a1c3b0d1876c2bea3b38bbbafed':
  Fix Custom action mode menu item onclick is not working
2015-09-03 06:21:25 +00:00
Oren Blasberg
c2dde0ae78 Merge "MenuPopupHelper: Factor out a MenuPopup interface." 2015-09-02 19:25:30 +00:00
Oren Blasberg
b23976efdd MenuPopupHelper: Factor out a MenuPopup interface.
Move much of the responsibility into implementations of this interface.
Delegate functionality to it where appropriate.
Provide a standard (non-cascading) implementation for this interface.

This CL should have NO BEHAVIOR CHANGES.

A follow-up CL will provide a cascading implementation, whereby a
config variable will enable submenus to open side by side with their
parent menus. That CL will be the first with functional/ actual behavior
changes.

Bug: 20127825
Change-Id: Iecac2d340dd8750ebe4e99162d447c9411f09227
2015-09-02 11:52:24 -07:00
Yasuhiro Matsuda
6d444185e5 resolved conflicts for merge of fcf9ab5a to master
Change-Id: I69ad6e525430c5c4fc3c274b8bf6ebf653716124
2015-09-03 00:12:30 +09:00
Yasuhiro Matsuda
fcf9ab5ab3 am ebf9465d: resolved conflicts for merge of ef57e5e0 to stage-aosp-master
* commit 'ebf9465d213336819b15e3b21d02afce64470d4f':
  Add trace code to system server.
2015-09-02 14:31:26 +00:00
Yasuhiro Matsuda
ebf9465d21 resolved conflicts for merge of ef57e5e0 to stage-aosp-master
Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
2015-09-02 22:57:53 +09:00
Clara Bayarri
01232c508e am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev
* commit '582b186cd3b41c5c67649ae2ba9176c3860ab1ec':
  Fix Custom action mode menu item onclick is not working
2015-09-02 10:10:47 +00:00
Clara Bayarri
582b186cd3 am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev
* commit 'f7b220ab9f62be3d279e3fa7923c249ff0fa09f3':
  Fix Custom action mode menu item onclick is not working
2015-09-02 09:59:36 +00:00