Commit Graph

64008 Commits

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

* commit '50d08f81d7c9e614f2a3f23fd815bbc183419874':
  Disallow disable of the system shared libs.

Change-Id: I689b99c36e7037ef4efbcbccea04be33e442c84e
2016-04-22 21:09:55 +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
Andres Morales
2e9c311abd Merge "FrameMetricsListener API council changes" into nyc-dev
am: 82ee675330

* commit '82ee6753305b484d778743882fb827c6b73d82c1':
  FrameMetricsListener API council changes

Change-Id: I8ea921d0f7d4658ee0b9827e9b38637c9d370922
2016-04-22 16:34:17 +00:00
Andres Morales
82ee675330 Merge "FrameMetricsListener API council changes" into nyc-dev 2016-04-22 16:31:21 +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
Bo Liu
07901c7d1f Merge "webview: canInvokeDrawGlFunctor should always return true" into nyc-dev
am: 79ec08248a

* commit '79ec08248afca69f02e53a2123517fc272e4a27c':
  webview: canInvokeDrawGlFunctor should always return true

Change-Id: I54bfb01a138d68275fd182ee7970b342562adfc8
2016-04-22 15:40:29 +00:00
Bo Liu
79ec08248a Merge "webview: canInvokeDrawGlFunctor should always return true" into nyc-dev 2016-04-22 15:36:38 +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
TreeHugger Robot
6894199054 Merge "Add reasons to notifyPackageUse calls" into nyc-dev 2016-04-22 15:00:37 +00:00
Philip P. Moltmann
dde611dcd6 Merge "Rename \'thousands of an inch\' to \'thousandths of an inch\'in the docs." into nyc-dev
am: 10a1a656e2

* commit '10a1a656e2769ce3227db1001a4e69eebe99e6ac':
  Rename 'thousands of an inch' to 'thousandths of an inch'in the docs.

Change-Id: If260e10e9adc7a9ae892008865fec21490f53739
2016-04-22 14:20:38 +00:00
Philip P. Moltmann
10a1a656e2 Merge "Rename 'thousands of an inch' to 'thousandths of an inch'in the docs." into nyc-dev 2016-04-22 14:08:08 +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
Tobias Thierer
28532d0026 frameworks/base: Avoid Long object allocations in Long.valueOf()
Replace usages where the Long is immediately unboxed or thrown
away with Long.parseLong().
In TaskRecord.java, I also fixed up similar uses of
{Boolean,Integer}.valueOf()

Tested: built frameworks/base successfully.

Bug: 28289401
(cherry picked from commit 4bd017d6a5)

Change-Id: Icfa4708946e774f4a1bacf185c3fd11a7087017e
2016-04-22 13:36:53 +01:00
Hugo Benichi
06de560179 Merge "Split network monitoring and portal probe events" into nyc-dev
am: 784c93e372

* commit '784c93e372ff8ba8ca59499a8e35d83e5bd71c1a':
  Split network monitoring and portal probe events

Change-Id: I1e9208a9c8cd178ec31edf1755cc82db980b9071
2016-04-22 09:51:01 +00:00
Rubin Xu
66bbd99c66 Merge "Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast" into nyc-dev
am: b40667eccd

* commit 'b40667eccdd797d08560c33e696625509f90d52b':
  Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast

Change-Id: I3113934145e7bdf044e731e75295782d1c535f14
2016-04-22 09:50:58 +00:00
TreeHugger Robot
784c93e372 Merge "Split network monitoring and portal probe events" into nyc-dev 2016-04-22 09:41:06 +00:00
Rubin Xu
b40667eccd Merge "Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast" into nyc-dev 2016-04-22 09:25:03 +00:00
Hugo Benichi
cc92c6e877 Split network monitoring and portal probe events
This patches changes how captive portal tests and network lifecycle
events are logged as connectivity events:
  - it splits NetworkMonitorEvent into two event classes:
      - ValidationProbeEvent for logging individual probe events.
      - NetworkEvent for logging network connection, validation,
        lingering, and disconnection.
  - it removes the redundant CaptivePortalCheckResultEvent class.
    The information logged in CaptivePortalCheckResultEvent was already
    logged by NetworkMonitorEvent, but missing the evaluation durations.
    It is now logged by ValidationProbeEvent.
  - it removes the CaptivePortalStateChangeEvent class, which is now
    redundant with NetworkEvent, but missing evaluation durations.

In addition, it adds event logging when ConnectivityService puts a
network into lingering or removes a network from lingering.

Bug: 28204408
Change-Id: I8f9752e4d36175ecfcbd1545a01a41bad6e06ea4
2016-04-22 17:08:56 +09: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
Selim Cinek
832775b7f3 Merge "Switched the notification time to relative time" into nyc-dev
am: 037235d83e

* commit '037235d83edcc78aab8798a0b221b6f14d9e15f3':
  Switched the notification time to relative time

Change-Id: I599b7e0c7e4576e04f9409b464fc7b9a3b96c72c
2016-04-22 00:12:16 +00:00
TreeHugger Robot
037235d83e Merge "Switched the notification time to relative time" into nyc-dev 2016-04-21 23:47:23 +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
John Reck
59311fb7c9 Merge "Fix flag value collision" into nyc-dev
am: e5cebf7aaa

* commit 'e5cebf7aaa1a1eaa16bbb8b039a572e19e0a5542':
  Fix flag value collision

Change-Id: I7efb08917bbab1c3594b23fd256ba6fa2e68ba6e
2016-04-21 23:30:10 +00:00
Philip P. Moltmann
823715d656 Rename 'thousands of an inch' to 'thousandths of an inch'in the docs.
Fixes: 28268203
Change-Id: I4246bc7431d1e0ecb75a6d101ba6ccd548567704
2016-04-21 16:29:43 -07:00
Adam Powell
ee4ee262c6 Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev 2016-04-21 23:05:03 +00:00
Tim Murray
e5cebf7aaa Merge "Fix flag value collision" into nyc-dev 2016-04-21 22:59:42 +00:00
John Reck
60e885f672 Fix flag value collision
Bug: 28314544
Change-Id: If73c1e8fd0e7b313bccbeffa172bdc3ab9496a43
2016-04-21 15:40:45 -07: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
Selim Cinek
36d570863a Switched the notification time to relative time
The time is now displayed in a relative manner instead
of absolute.

Change-Id: Idcc4411ed07991b6e176c4890a0d804394d8598a
Fixes: 27435284
2016-04-21 15:07:06 -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
Hyunyoung Song
84e85f2e56 Merge "Fix broken build due to @RemotableViewMethod" into nyc-dev
am: 44157a4abf

* commit '44157a4abf36250f259eca4cdaa346be15d47738':
  Fix broken build due to @RemotableViewMethod

Change-Id: Iad3e7a73952046d00e533ddb0ccabe28d3d646c6
2016-04-21 21:43:04 +00:00
Vladislav Kaznacheev
729c640cc8 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev 2016-04-21 21:34:26 +00:00