Commit Graph

5393 Commits

Author SHA1 Message Date
Adam Lesinski
d548da7991 am 112c1dc6: am 6a8d1fd6: am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
* commit '112c1dc63adbc36b1bd50dac24d1ea39959ef0f2':
  Fix Array Index Out of Bounds in BatteryStatsImpl
2015-09-22 20:57:50 +00:00
Andreas Gampe
bc68463602 resolved conflicts for 5d7b68d4 to master
Change-Id: I6f56e8e11c35733f8d84346ca2b9a201784552e1
2015-09-22 13:41:39 -07:00
Elliott Hughes
cdda4f1070 am 776fa57b: am aa311698: am 0361b18e: Merge "WrapperInit: remove dead execStandalone method"
* commit '776fa57b2da75fb508d66cf0339dc7c4df9a5e55':
  WrapperInit: remove dead execStandalone method
2015-09-22 20:04:29 +00:00
Adam Lesinski
112c1dc63a am 6a8d1fd6: am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
* commit '6a8d1fd62f73a241e7962b3baa3720a6dcd0767b':
  Fix Array Index Out of Bounds in BatteryStatsImpl
2015-09-22 18:58:50 +00:00
Andreas Gampe
5d7b68d491 am 53ed452e: am 9ce68b24: am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
* commit '53ed452e86aa186b5903b65057b4473629292f0d':
  Frameworks/base: Propagate boot status to installd
2015-09-22 18:54:19 +00:00
Adam Lesinski
dbca76cda1 am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev
* commit '1b57758a1bb814c3a00ec864fe164bfe7861a9ab':
  Fix Array Index Out of Bounds in BatteryStatsImpl
2015-09-22 18:42:33 +00:00
Andreas Gampe
9ce68b2444 am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev
* commit 'b49245f96233b7f89fb5d4ba52576131ca6fb47a':
  Frameworks/base: Propagate boot status to installd
2015-09-22 18:36:43 +00:00
Adam Lesinski
1b57758a1b Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev 2015-09-22 18:33:14 +00:00
Elliott Hughes
776fa57b2d am aa311698: am 0361b18e: Merge "WrapperInit: remove dead execStandalone method"
* commit 'aa31169804dffa3b36654ccffe67a53f6ff4cdaf':
  WrapperInit: remove dead execStandalone method
2015-09-22 15:50:09 +00:00
Elliott Hughes
aa31169804 am 0361b18e: Merge "WrapperInit: remove dead execStandalone method"
* commit '0361b18ea10aa7987dbf8c4217d5f4c7e3a4a610':
  WrapperInit: remove dead execStandalone method
2015-09-22 15:42:36 +00:00
Alan Viverette
31cb4bb41f Merge "SubMenuBuilder.getRootMenu() should return root menu, not parent" 2015-09-22 13:48:04 +00:00
Adam Lesinski
52290c9c4f Fix Array Index Out of Bounds in BatteryStatsImpl
If the power profile was not set yet, the default sizes of
cpu freq arrays could have been too small.

Bug:24244089
Change-Id: Ic17a1e8f2058c51fbdda14db35b7b62f4880be00
2015-09-21 17:38:52 -07:00
Andreas Gampe
06bb908b78 Frameworks/base: Propagate boot status to installd
Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.

Bug: 23898216
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
2015-09-21 15:16:13 -07:00
Daniel Micay
13eac10a26 WrapperInit: remove dead execStandalone method
This became dead with the removal of support for the non-runtime-init
code path in f48029f00a.

Change-Id: Id68e0da4658e83f0d3bfd8645152165faacac5fa
2015-09-21 18:14:56 -04:00
Adam Lesinski
ee5584cd3c am eb1356cc: am 3bdbda78: am dd0238ec: am e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev
* commit 'eb1356cc15d4c07e152b5dbc545701c496d7b50f':
  Fix crash when no power_profile is specified
2015-09-19 15:35:09 +00:00
Adam Lesinski
eb1356cc15 am 3bdbda78: am dd0238ec: am e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev
* commit '3bdbda780613e1701e4e3e567be8a743a8dedb8f':
  Fix crash when no power_profile is specified
2015-09-19 00:23:02 +00:00
Adam Lesinski
dd0238ec7d am e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev
* commit 'e54253bdd317cbe806225081ad9ebe64f2b50b9a':
  Fix crash when no power_profile is specified
2015-09-18 22:21:31 +00:00
Adam Lesinski
e54253bdd3 Merge "Fix crash when no power_profile is specified" into mnc-dr-dev 2015-09-18 22:15:19 +00:00
Adam Lesinski
8057133d49 Fix crash when no power_profile is specified
Always connected devices don't have power_profiles,
so handle the case where the default cpu speed count of
1 is used on a device with more cpu speeds.

Bug:23776983
Change-Id: Ifdddad2f28eea5b730833622a6b6043b3086efd2
2015-09-18 14:56:34 -07:00
Adam Lesinski
36743412ac am 4092eeb7: am 069594f9: am 4e86aae6: am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
* commit '4092eeb7f7b079a87c4583c713c0e6d2e208b3c4':
  BatteryStats: Better big-little CPU accounting
2015-09-18 21:08:52 +00:00
Adam Lesinski
4092eeb7f7 am 069594f9: am 4e86aae6: am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
* commit '069594f96a3c70b01119f689f2195e0d933c0700':
  BatteryStats: Better big-little CPU accounting
2015-09-18 21:02:27 +00:00
Adam Lesinski
4e86aae667 am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
* commit '680553957e4ff47343334881c34de6969b2ed977':
  BatteryStats: Better big-little CPU accounting
2015-09-18 20:38:02 +00:00
Adam Lesinski
680553957e Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev 2015-09-18 20:26:07 +00:00
Alan Viverette
53023ffdea SubMenuBuilder.getRootMenu() should return root menu, not parent
Also fixes incorrect call from MenuItemImpl to dispatchMenuSelected,
which should according to the documentation be passing the direct
parent menu of the menu item.

Bug: 23725571
Change-Id: I2d1f04b80ce05d141ba2dfd77f62bb13b2268625
2015-09-18 13:20:20 -04:00
Adam Powell
a2d44ea016 am 9546d5a2: am 96c95ba5: am 5f22c0b2: am 1b67a6b8: Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev
* commit '9546d5a2ec2598849c2faaa6de998887df9b62f3':
  Badge ChooserActivity choices with their app icon for disambig
2015-09-18 17:00:41 +00:00
Adam Powell
9546d5a2ec am 96c95ba5: am 5f22c0b2: am 1b67a6b8: Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev
* commit '96c95ba59658708c3214b93ace4bb2835ac62863':
  Badge ChooserActivity choices with their app icon for disambig
2015-09-18 16:52:21 +00:00
Adam Powell
5f22c0b27a am 1b67a6b8: Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev
* commit '1b67a6b84d133e1fdac352d0821034ceca739a71':
  Badge ChooserActivity choices with their app icon for disambig
2015-09-18 16:33:57 +00:00
Adam Powell
00f4aad704 Badge ChooserActivity choices with their app icon for disambig
When two or more activities with the same user-visible label are
shown, we have traditionally shown the app name or package name if the
app names also match. This was to help the user tell the difference
between multiple apps publishing similar activities and avoid
unintentionally starting the wrong one. However, in the case of
explicit choosers (e.g. ACTION_SEND sharing) a few common collisions
occur in practice and falling all the way back to package name isn't
very helpful.

Instead, we now assume that the app icon, which the user has seen
before at install time, is unique enough on its own to disambiguate
these cases and avoid user confusion. We no longer show the app name
or package name as secondary text in the chooser.

In cases where an activity has a different icon from its containing
app, we now badge the activity icon with the app icon so that the user
knows which app a potentially ambiguous choice belongs to.

Bug 24113937

Change-Id: Ie54fbf77bfcc86e50768f93be2be0e53cf2ce7b5
2015-09-17 20:56:00 +00:00
Vladislav Kaznacheev
03b56c228a Merge "Handle content URI permissions on drop" 2015-09-17 20:41:44 +00:00
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
Vladislav Kaznacheev
ede5f5480e Handle content URI permissions on drop
Change-Id: I846071f01ecd1eff8e3a54a1806e68e1a4b335d2
2015-09-16 17:35:10 -07:00
Adam Powell
4e6e12c88e am 1ac37924: am 4873c549: am 39e94ebe: Handle single-choice ChooserActivities and bound ChooserTargetServices
* commit '1ac3792491743ead048e0a85a5656cf33956da64':
  Handle single-choice ChooserActivities and bound ChooserTargetServices
2015-09-16 21:20:04 +00:00
Adam Powell
4873c549f7 am 39e94ebe: Handle single-choice ChooserActivities and bound ChooserTargetServices
* commit '39e94ebe22d4959facea4c3621a0a5377242a570':
  Handle single-choice ChooserActivities and bound ChooserTargetServices
2015-09-16 21:02:58 +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
Adam Powell
39e94ebe22 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
(cherry picked from commit 9761ab2a64)
2015-09-16 19:54:24 +00: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