Commit Graph

8002 Commits

Author SHA1 Message Date
Svetoslav Ganov
599bf728de Merge "Disallow disable of the system shared libs." into nyc-dev
am: 5a91b61

* commit '5a91b615232374084a45752d7c09c25265e263ed':
  Disallow disable of the system shared libs.

Change-Id: I111c0285b73ffa64594c39b54d18d5d3ff670953
2016-04-22 21:07:11 +00:00
Svetoslav Ganov
5a91b61523 Merge "Disallow disable of the system shared libs." into nyc-dev 2016-04-22 21:03:30 +00:00
Robert Carr
6ce373a4c8 Merge "Force pinned windows to always be scaleable." into nyc-dev
am: e67960e

* commit 'e67960ecae2ba008a7d1d364b5fdb1b95a179e52':
  Force pinned windows to always be scaleable.

Change-Id: Ie5faf56b2f9ad25d0d9977970fedb681ca72c628
2016-04-22 19:18:53 +00:00
TreeHugger Robot
e67960ecae Merge "Force pinned windows to always be scaleable." into nyc-dev 2016-04-22 19:13:23 +00:00
Alex Hills
7bdd6a5c87 Merge "Changes Message from using parcels to bundles" into nyc-dev
am: 9ef0ce1

* commit '9ef0ce1749e626a47d669a3f4b059ba748d2e69e':
  Changes Message from using parcels to bundles

Change-Id: If39af54393915b539a7724deda9404cf4d795f36
2016-04-22 19:01:15 +00:00
Winson
b5726c5963 Merge changes I222e50f6,I9832874d into nyc-dev
am: 6c83c7a

* commit '6c83c7aa5f84680ffd53d3e318279cbead8b1af5':
  Removing legacy calculation of Recents visibility.
  Adding additional dump logging to track down bugs.

Change-Id: I20c8aeb4b943284b2bee2b7d45d3530a5d6dfa06
2016-04-22 18:37:02 +00:00
Alex Hills
a6bc9fa6c2 Merge "Adds a BigPicAmbient flag to WearableExtender" into nyc-dev
am: cb1f9da

* commit 'cb1f9da55b2960f7cabd9c50632f2ac9d8a3311a':
  Adds a BigPicAmbient flag to WearableExtender

Change-Id: I37e02f365854200f34a4d6cad52300e4e0ccd253
2016-04-22 18:36:57 +00:00
Alexander Hills
9ef0ce1749 Merge "Changes Message from using parcels to bundles" into nyc-dev 2016-04-22 18:32:49 +00:00
Winson Chung
6c83c7aa5f Merge changes I222e50f6,I9832874d into nyc-dev
* changes:
  Removing legacy calculation of Recents visibility.
  Adding additional dump logging to track down bugs.
2016-04-22 18:22:02 +00:00
Alexander Hills
cb1f9da55b Merge "Adds a BigPicAmbient flag to WearableExtender" into nyc-dev 2016-04-22 18:11:46 +00:00
Andrei Stingaceanu
9e16d11683 Merge "Keyboard shortcuts: dismiss when activities start via shortcut" into nyc-dev
am: 1a83df8ba7

* commit '1a83df8ba716d027ac26c9198ed3d3b8d2b98ad1':
  Keyboard shortcuts: dismiss when activities start via shortcut

Change-Id: I90368ac50ef49535bda0f4babfc80e120fe72f89
2016-04-22 17:01:46 +00:00
Andrei Stingaceanu
1a83df8ba7 Merge "Keyboard shortcuts: dismiss when activities start via shortcut" into nyc-dev 2016-04-22 16:46:31 +00:00
Andrei Stingaceanu
0bf096f1b4 Keyboard shortcuts: dismiss when activities start via shortcut
* introduced a new intent DISMISS_KEYBOARD_SHORTCUTS and
and new public API in Activity (which sends a broadcast
to KeyboardShortcutsReceiver) which applications can
use to dismiss the keyboard shortcuts.

* plumbing and implementation for a new call to dismiss
keyboard shortcuts from PhoneWindowManager and used it:
** when starting activities invoked via Search+key
** when starting activities invoked via META
** when starting activities via application launch keys

* removed unused variable in
Activity#onProvideKeyboardShortcuts

Note that for apps started via touch (aka non-shortcut)
like tapping the Settings gear icon from the notification
bar the menu is not automatically dismissed.

Bug: 28012198
Change-Id: I83a8d4f342bb8a08115a648648834d0d2bac19fd
2016-04-22 16:57:25 +01:00
Brian Carlstrom
c762f82d1a Merge "Add reasons to notifyPackageUse calls" into nyc-dev
am: 6894199054

* commit '68941990541498196fd1a08529fc6df56280fe47':
  Add reasons to notifyPackageUse calls

Change-Id: I454dc388f042a9180da1dab07ce8cf4cf8dbe337
2016-04-22 15:15:25 +00:00
Brian Carlstrom
ca82e616d3 Add reasons to notifyPackageUse calls
This is so we can record more specific times in PackageUsage.
If file with only one timestamp per package is found, the value is
copied to all usage slots.

Bug: 27902702
Change-Id: I8affe43c735e54620a9204433aad367cfddfded7
2016-04-22 14:39:53 +01:00
Selim Cinek
0aef73a252 Merge "Fixed a bug where notification header could become empty" into nyc-dev
am: 57e4a67be1

* commit '57e4a67be13eede636608f789d1b88d0889683ec':
  Fixed a bug where notification header could become empty

Change-Id: I5c22f22e67ed60ae441adccf852fc3850c400ad5
2016-04-22 05:42:07 +00:00
Selim Cinek
57e4a67be1 Merge "Fixed a bug where notification header could become empty" into nyc-dev 2016-04-22 05:33:33 +00:00
Selim Cinek
540aa3c8a0 Merge "Changed the name of chronometer countdown" into nyc-dev
am: 8f32cd4306

* commit '8f32cd4306a201c2167c20fc636fe613f1fabd4c':
  Changed the name of chronometer countdown

Change-Id: I2e7040b43c2f46dfc8159d98862e865343df221d
2016-04-22 03:40:33 +00:00
Selim Cinek
8f32cd4306 Merge "Changed the name of chronometer countdown" into nyc-dev 2016-04-22 03:21:52 +00:00
Christopher Tate
3e9f59e862 Merge "Don\'t worry about an extra weak indirection with callback alarms" into nyc-dev
am: 0a7ec886c3

* commit '0a7ec886c35107c1f8d2d1ff3977ac5dd91fddd1':
  Don't worry about an extra weak indirection with callback alarms

Change-Id: Ifd44a119263b68ff6b67679931c579dcef622d0e
2016-04-22 00:50:56 +00:00
Chris Tate
0a7ec886c3 Merge "Don't worry about an extra weak indirection with callback alarms" into nyc-dev 2016-04-22 00:40:44 +00:00
Adam Powell
bc27c869b1 Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev
am: ee4ee262c6

* commit 'ee4ee262c674cf0a20cf294ecfe4b8736cf6c983':
  Move child FragmentManager shutdown for retained fragments

Change-Id: I4e946a45c375c6af680679fc1415f9ff0ff0f5d1
2016-04-21 23:30:14 +00:00
Adam Powell
ee4ee262c6 Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev 2016-04-21 23:05:03 +00:00
Winson
d46b72788e Removing legacy calculation of Recents visibility.
- This was causing us to try and launch the Recents activity again after
  docking because the running task was the newly docked task and not
  Recents.

Bug: 28177001
Change-Id: I222e50f6de00a9d7881da2182eebc61564fd3266
2016-04-21 15:16:42 -07:00
Selim Cinek
b85f36fd48 Fixed a bug where notification header could become empty
Also fixed a few more issues with the header util that could
lead to wrong states.

Change-Id: I95c3479f5d9e5221ee9e91120271e7957b887607
Fixes: 28295743
2016-04-21 15:07:10 -07:00
Selim Cinek
c3b752e712 Changed the name of chronometer countdown
Change-Id: Ie0339205b26f2dff40e0c19760750a0ce6aaf7da
Fixes: 28295825
2016-04-21 15:07:08 -07:00
Christopher Tate
d0cca79f3c Don't worry about an extra weak indirection with callback alarms
Bug 27995384

Change-Id: Ie9cf3e05dca4af7085b479fb65d4cf45ee0239ba
2016-04-21 15:05:34 -07:00
Vladislav Kaznacheev
45b1e14468 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev
am: 729c640cc8

* commit '729c640cc887da9fe7a1b57121167a7bf83fee97':
  Rename DropPermissions to DragAndDropPermissions

Change-Id: I4a43cc10586d548befffa182d89382071ba412e7
2016-04-21 21:43:08 +00:00
Vladislav Kaznacheev
729c640cc8 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev 2016-04-21 21:34:26 +00:00
Robert Carr
1b5ea72b3c Force pinned windows to always be scaleable.
Otherwise we have a race when switching it off at the end
of the animation when we don't move to fullscreen. Ensure
SCALE_TO_WINDOW is always enabled for windows while they
are in the pinned stack.

Bug: 27793381
Change-Id: Ia92465fd0d854f799caa8ed31edb4621af9fdecd
2016-04-21 13:01:57 -07:00
Adam Powell
a9bab98d70 Move child FragmentManager shutdown for retained fragments
Some apps out there do some creative things in terms of calling their
own onDetach methods from elsewhere. Perform the child FragmentManager
shutdown for retained fragments in a package-level perform method
instead of in onDetach itself.

Also mark all existing fragment methods with @CallSuper.

Bug 28293847

Change-Id: I343b610f8d427fe5cabd523a78fbf0e6f3b34c57
2016-04-21 11:04:41 -07:00
Tony Mak
f5f982f014 Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev
am: d3589ee715

* commit 'd3589ee715e397e61025265adc883c9ed3be4f56':
  Fix wrong app is launched after solving challenge from tapping notification

Change-Id: Id0e6e3cbc8cbea4e87625f479eb0d83dbf22266e
2016-04-21 15:53:57 +00:00
Tony Mak
646fe9913e Fix wrong app is launched after solving challenge from tapping notification
PendingIntent.FLAG_ONE_SHOT is needed to prevent the PendingIntent being
reused.

Also, flag and activity option of credential intent in BaseStatusBar
is not same as the one in ActivityStarter. Added a new
function startConfirmDeviceCredentialIntent in AM to centralize it.

Change-Id: I2d9e5923ad5d4d012f10057c409c666c8ca299a3
Fix: 28309964
2016-04-21 16:43:08 +01:00
Amith Yamasani
bc25c87c57 Merge "Throw better exception when startVoiceActivity fails" into nyc-dev
am: 2be4c463bc

* commit '2be4c463bc6411cf6fb9e2a4be0cbb90c485d0de':
  Throw better exception when startVoiceActivity fails

Change-Id: Ie8dfd6ed1f366e24418f352c810281ca687c70fb
2016-04-21 00:50:10 +00:00
Shreyas Basarge
f153182db7 Merge "Fix logspam by JobInfo" into nyc-dev
am: bb9dd3c9fd

* commit 'bb9dd3c9fdef30ed4bf776fbf8cb74c7eed2e87e':
  Fix logspam by JobInfo

Change-Id: I58ec5ed68dad8df8c5f73c3e313181c36f0d27dd
2016-04-21 00:50:04 +00:00
TreeHugger Robot
2be4c463bc Merge "Throw better exception when startVoiceActivity fails" into nyc-dev 2016-04-21 00:46:32 +00:00
Dianne Hackborn
bb9dd3c9fd Merge "Fix logspam by JobInfo" into nyc-dev 2016-04-21 00:39:43 +00:00
Shreyas Basarge
b0c83ec062 Fix logspam by JobInfo
Print interval clamp message
only for periodic jobs having
period/flex less than the minimum value.

Bug: 28296128
Change-Id: Id0d7c3b56048582a490bb8214eca491ec2bbdc93
2016-04-21 00:44:58 +01:00
Adam Lesinski
40c611853e Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev
am: 1362ae0

* commit '1362ae062a196c8450a0b649dd0c5af66d1f05a1':
  ResourcesManager: Throw exception if failed to load asset path

Change-Id: I59a5eeb3502d12382e30faceb769eaef719b65d1
2016-04-20 22:56:11 +00:00
Adam Lesinski
1362ae062a Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev 2016-04-20 22:46:05 +00:00
Christopher Tate
9e92c03991 Merge "Don\'t back up wallpapers that we\'ve been told not to" into nyc-dev
am: 665189f

* commit '665189f92646d34bf02082120cba3c62aa718770':
  Don't back up wallpapers that we've been told not to

Change-Id: I45d037436e349445f091a7dad5abad4b7421ad8e
2016-04-20 22:13:17 +00:00
Chris Tate
665189f926 Merge "Don't back up wallpapers that we've been told not to" into nyc-dev 2016-04-20 22:10:40 +00:00
Christopher Tate
d7faf53605 Don't back up wallpapers that we've been told not to
In addition, now that the full uncropped wallpaper image is being
backed up, we now handle that via the full-data backup path instead
of key/value.  Restore still knows about legacy data that gets
delivered via the older key/value mechanism.

This change also has the effect of removing the size limitations
around wallpaper restore acceptance.  Any size source imagery is
valid, as crop & scale are rerun in a device-appropriate way
after the restore.

Bug 25453848
Bug 25727875

Change-Id: Idc64a2eaab97a8ecc9d2b8ca5dc011f29cab324d
2016-04-20 14:34:07 -07:00
Vladislav Kaznacheev
377c32845b Rename DropPermissions to DragAndDropPermissions
Bug: 28296057
Change-Id: Ic95cb4ae9c351d903df78628e983dec2bacd0ad5
2016-04-20 14:22:23 -07:00
Trevor Johns
c0d2c43a22 Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
am: 59c9a93

* commit '59c9a93fc268e226495d4ee8cf7c507c2ea2c433':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: Iddc9419069d8f5d555baf0c1ef4b2f2ebf75c370
2016-04-20 21:12:38 +00:00
Adam Lesinski
3477927db4 ResourcesManager: Throw exception if failed to load asset path
Previously if we failed to load an asset path, we would return a
null AssetManager which would lead to an immediate NPE.

Throw a proper exception instead, detailing which path failed to load.

Bug:28216288
Change-Id: I491b9316b837bf333b5ae78d4eb1ee31741617ec
2016-04-20 13:36:19 -07:00
Trevor Johns
59c9a93fc2 Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
* changes:
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev
2016-04-20 18:35:57 +00:00
Rubin Xu
48cef81f6e Merge "Kill foreground apps when turning off work" into nyc-dev
am: 49425d6

* commit '49425d612cee3864a316e9ecb6ec3faeae519b1e':
  Kill foreground apps when turning off work

Change-Id: Ie8ea1ec98232437623c83f7d32c1f05c47580b35
2016-04-20 09:40:38 +00:00
Rubin Xu
49425d612c Merge "Kill foreground apps when turning off work" into nyc-dev 2016-04-20 09:33:52 +00:00
Kenny Guy
75d4db49d9 Merge "Add test method to remove admins." into nyc-dev
am: 3c5ceae

* commit '3c5ceae1d35de476644e4d5db5978149311e63e6':
  Add test method to remove admins.

Change-Id: Icff7bb03ca1c2bc987d46450a2dd2f49edcfb60b
2016-04-19 21:53:23 +00:00