Commit Graph

8301 Commits

Author SHA1 Message Date
Jeff Hao
e1d41fcc0d Merge "Support to pass <uses-library> option through to dex2oat." 2016-04-22 18:20:13 +00:00
Andrei Stingaceanu
203ae48ff7 Merge "Keyboard shortcuts: dismiss when activities start via shortcut" into nyc-dev am: 1a83df8ba7 am: 9e16d11683
am: e0ea2e06ab

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

Change-Id: Ic86b86c3254318d17059b4650a9c7bcb652bddf3
2016-04-22 17:06:50 +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
30d90d1af5 Merge "Add reasons to notifyPackageUse calls" into nyc-dev am: 6894199054 am: eca1026d72
am: 280ca7b83a

* commit '280ca7b83a84f51a80a034c3d28b5185db4c2693':
  Add reasons to notifyPackageUse calls

Change-Id: I89ef19f3278dad1b8dcde147596ec52ef048e5fe
2016-04-22 15:19:59 +00:00
Brian Carlstrom
280ca7b83a Merge "Add reasons to notifyPackageUse calls" into nyc-dev am: 6894199054
am: eca1026d72

* commit 'eca1026d72b0df2d574bd9240940f7cc3ac0a529':
  Add reasons to notifyPackageUse calls

Change-Id: Ifd5510d5016d3735324d9694c4a6c0237c15b678
2016-04-22 15:17:39 +00: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
b0f63057fc Merge "Fixed a bug where notification header could become empty" into nyc-dev am: 57e4a67be1 am: 0aef73a252
am: c93f4b6707

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

Change-Id: Ifb5e38f663973c62211249edcccdd0d72c754f1c
2016-04-22 05:46:40 +00: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
65080a64df Merge "Changed the name of chronometer countdown" into nyc-dev am: 8f32cd4306 am: ba26bf8a47
am: 5e2a3e5872

* commit '5e2a3e5872e8439ad836b5b281e6393ecefb50f4':
  Changed the name of chronometer countdown

Change-Id: Ibce68e45c56e90ee66b7a7d2fbfc0350178885fa
2016-04-22 03:47:25 +00:00
Selim Cinek
5e2a3e5872 Merge "Changed the name of chronometer countdown" into nyc-dev am: 8f32cd4306
am: ba26bf8a47

* commit 'ba26bf8a471275520c8a6d97dccd19e6e6993388':
  Changed the name of chronometer countdown

Change-Id: I8c4970cfd2f0f2c8c56647737e1993de65dc1ec7
2016-04-22 03:45:09 +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
055e661706 Merge "Don\'t worry about an extra weak indirection with callback alarms" into nyc-dev am: 0a7ec886c3 am: 3e9f59e862
am: 1fb59e587f

* commit '1fb59e587f95e0235ec7c0827a1d2e163bc8bd44':
  Don't worry about an extra weak indirection with callback alarms

Change-Id: I0e0d4b03f2a15b12e9bcfc6906e949137e3a380c
2016-04-22 00:55:48 +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
3cddcd63d0 Merge "Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev am: ee4ee262c6 am: e362a65921" into nyc-mr1-dev-plus-aosp
am: 47074ca3ce

* commit '47074ca3cee75fa176055f884faf51b29301d191':
  Move child FragmentManager shutdown for retained fragments

Change-Id: I723dbab01c5fbb93d4d08382e5cdfbb31b4ac86e
2016-04-21 23:35:06 +00:00
Adam Powell
92145a1669 Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev am: ee4ee262c6
am: e362a65921

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

Change-Id: I49d915efafe438c62ae3d29c4826799494d7e4cc
2016-04-21 23:32:35 +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
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
4465add3e1 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev am: 729c640cc8 am: 45b1e14468
am: 0ee7fecd43

* commit '0ee7fecd437b4ba4676985e072c940a819d46114':
  Rename DropPermissions to DragAndDropPermissions

Change-Id: Id978e6f65b915955d1caff4825d89373f248d168
2016-04-21 21:48:10 +00: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
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
c65e3e8331 Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev am: d3589ee715 am: f5f982f014
am: b9362cf633

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

Change-Id: I1ae8d5399470e449947d3ecf57285d39145d0a1e
2016-04-21 16:00:57 +00: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
7f6e30dfdf Merge "Throw better exception when startVoiceActivity fails" into nyc-dev am: 2be4c463bc am: bc25c87c57
am: 13b566915b

* commit '13b566915b31d4ef1537bc5d4460da88074fc7a6':
  Throw better exception when startVoiceActivity fails

Change-Id: I41471adc060db774ed6d7e71819613b3691b85b3
2016-04-21 02:33:46 +00:00
Shreyas Basarge
9dabe94fb6 Merge "Fix logspam by JobInfo" into nyc-dev am: bb9dd3c9fd am: f153182db7
am: b8408d8eb7

* commit 'b8408d8eb755da42db3cf25868920d5b583b77ca':
  Fix logspam by JobInfo

Change-Id: I7bc166a3353b2a3d29719744d4f006662f738d8f
2016-04-21 02:32:12 +00: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
Jeff Hao
7b331b6a8a Support to pass <uses-library> option through to dex2oat.
This change takes an app's shared libraries specified by <uses-library>
and passes it through to dex2oat to be used during compilation.

Part of a multi-project change.

Bug: 26880306
Change-Id: I26ac0e055ee71eb6e2d92598115c46d3ca364d03
2016-04-20 17:49:52 -07: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
Adam Lesinski
604a0a9fc2 Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev am: 1362ae0 am: 40c6118
am: fc2de302f4

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

Change-Id: I9fb7f2df3d37cb4ba6cb8fa9e3fc10a7999c6e36
2016-04-21 00:36:36 +00:00
Christopher Tate
57fe3eea85 Merge "Don\'t back up wallpapers that we\'ve been told not to" into nyc-dev am: 665189f am: 9e92c03
am: cdfe208a99

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

Change-Id: I45e4c3c47e371c3808e5669e2c7af6d8405edb7a
2016-04-21 00:24:55 +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
Trevor Johns
0392182bff Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93 am: 254f1b8
am: e1b5670

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

Change-Id: I8cf43f9ad491c6f23eb5fe0051293267ab2d03bf
2016-04-20 21:32:39 +00:00
Vladislav Kaznacheev
377c32845b Rename DropPermissions to DragAndDropPermissions
Bug: 28296057
Change-Id: Ic95cb4ae9c351d903df78628e983dec2bacd0ad5
2016-04-20 14:22:23 -07:00