Commit Graph

246497 Commits

Author SHA1 Message Date
Jason Monk
ab629fcc85 Merge "Add strings for quick settings accessibility" into nyc-dev 2016-04-22 18:13:19 +00:00
Alexander Hills
cb1f9da55b Merge "Adds a BigPicAmbient flag to WearableExtender" into nyc-dev 2016-04-22 18:11:46 +00:00
Jason Monk
3e4a99c382 Add strings for quick settings accessibility
Bug: 15696340
Change-Id: Ie775c90c9fed8078f4db4bde5752a2f2d7f94f25
2016-04-22 14:11:04 -04:00
Diego Perez
d7d2119fe3 Add missing delegate in Bitmap_Delegate
New nativeCopyAshmemConfig

Change-Id: I8aedb0df827ac8d8091a9457bc341c1047b5a539
2016-04-22 19:00:39 +01:00
Dongwon Kang
aec6d542ff Merge "TIF: Address API review comments" into nyc-dev
am: b0df08598c

* commit 'b0df08598c9005938a8315a76c148967e6e06fc4':
  TIF: Address API review comments

Change-Id: Iae2978318d4611fccabd916bd047cd60b3d9ca6e
2016-04-22 18:00:34 +00:00
Hui Shu
b5f554a25d WebView downgrade prevention logic
Prevent *any* WebView provider packages to be downgraded lower than MonoChrome
Stable on the system image.

Assuming that all (and future) WebView provider packages follow the same
versionCode scheme, we can compare the subsection of Chromium versionCode that
contains branch number, which is done by ignoring the least significant 5
digits.

Note this CL is a follow-up to go/ag/895502.

BUG: 27469181
Change-Id: Iffe3c4b7f912d48c034f107079e065e54130713f
2016-04-22 10:56:55 -07:00
Dongwon Kang
b0df08598c Merge "TIF: Address API review comments" into nyc-dev 2016-04-22 17:54:34 +00:00
Philip P. Moltmann
78eb18983a Merge "Send update notifications when the status of a print job updates and make sure to only access mPrintServicesChangeListenerRecords when locked." into nyc-dev
am: bfce110c63

* commit 'bfce110c63541f514c865fc221047b8101932d58':
  Send update notifications when the status of a print job updates and make sure to only access mPrintServicesChangeListenerRecords when locked.

Change-Id: I311a1f358336620d7e9d3a0b7d27faa17a7ee70a
2016-04-22 17:48:38 +00:00
Garfield, Tan
050f98da0d Merge "DO NOT MERGE: Disable drag n\' drop in DocumentsActivity." into nyc-dev
am: 6e685dc3c5

* commit '6e685dc3c519526a0f38ec5ee9e81e1f57e0fa36':
  DO NOT MERGE: Disable drag n' drop in DocumentsActivity.

Change-Id: I9e4424bfbffc46cd1880241b6961c0f0ca75aab4
2016-04-22 17:47:33 +00:00
Philip P. Moltmann
bfce110c63 Merge "Send update notifications when the status of a print job updates and make sure to only access mPrintServicesChangeListenerRecords when locked." into nyc-dev 2016-04-22 17:32:37 +00:00
Yang Ni
1b4df1697f Fixed BaseObj finalizer and destroy()
Bug: 28242626
Bug: 27972184
Bug: 27973681

This is resolving issues in ScriptGroup (V1) again.
In ScriptGroup.destroy(), we also need to consider the old API where
mClosures is not initialized.

Also cleaned up the finalizer for ScriptGroup and Allocation:
Since BaseObj.finalize() calls BaseObj.helpDestroy(), instead of
BaseObj.destroy(), there is no possibility that the finalizers of
child objects may race their parents finalizers. Note that
helpDestroy() does not try to recurse on child objects.

Change-Id: I9dbb2b60f8478f656f8a418c2b5fc8d6848aeef0
2016-04-22 10:21:18 -07:00
Michael Wright
103fb78ac1 Add ambient light ring buffer for initial data gathering period.
We're seeing reports of the display being too dim at initial wake up.
Saving the buffer for this initial period lets determine whether this
is a calculation error or something wrong with the sensor readings.

Bug: 27951906
Change-Id: I96b5dd0772de056c3c5e54d59c13d1a3d902d343
2016-04-22 13:17:51 -04:00
Garfield Tan
6e685dc3c5 Merge "DO NOT MERGE: Disable drag n' drop in DocumentsActivity." into nyc-dev 2016-04-22 17:17:16 +00:00
fionaxu
28ffb600db Add CarrierConfig for metered roaming
Bug: 26317905
Change-Id: Ib243de266736598cecdb8bcf76ac4db7275a1c01
2016-04-22 10:09:50 -07:00
Andrei Stingaceanu
9c55bda221 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: I3f856153c770d4d857276c15bb94deba755c719a
2016-04-22 17:01:44 +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
3ad874df28 Merge "FrameMetricsListener API council changes" into nyc-dev
am: 82ee675330

* commit '82ee6753305b484d778743882fb827c6b73d82c1':
  FrameMetricsListener API council changes

Change-Id: Ia22fea9fd5d15e481ad41d2ea7a7839bedf2a460
2016-04-22 16:34:14 +00:00
Andres Morales
82ee675330 Merge "FrameMetricsListener API council changes" into nyc-dev 2016-04-22 16:31:21 +00:00
Andrii Kulian
63211c339f Merge "Show recents when task moves to docked stack" into nyc-dev
am: 82e5288ee6

* commit '82e5288ee63c92d3a610fd5c50bad510917fbf63':
  Show recents when task moves to docked stack

Change-Id: I9979ee936a279875482bdf79aaa315a5c59f3a01
2016-04-22 16:19:59 +00:00
Andrii Kulian
82e5288ee6 Merge "Show recents when task moves to docked stack" into nyc-dev 2016-04-22 16:15:09 +00:00
Andrii Kulian
bf71968f89 Show recents when task moves to docked stack
When task was moved to docked stack using adb command,
recents didn't show and docked stack was minimized when
home task obtained focus.
This CL shows recents if needed when task is moved to
docked stack.

Bug: 28215216
Change-Id: If1cfb9d24bd77cc9c3c8fad3479f115d7aca1301
2016-04-22 16:08:46 +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
Jason Monk
f60281f3b5 Merge "Add back elevation to quick settings" into nyc-dev
am: ca2ce9b74a

* commit 'ca2ce9b74aba25692762fa625a1fd2894a62534b':
  Add back elevation to quick settings

Change-Id: Ib3d57e728a635d9c6aaec539cdadd84bf57b155c
2016-04-22 15:54:14 +00:00
Jeff Sharkey
25e17d82d8 Strings for post-upgrade.
Bug: 28164677
Change-Id: If46bb4670214cbecf761ca2d2c8664971d983124
2016-04-22 09:52:16 -06:00
Jason Monk
ca2ce9b74a Merge "Add back elevation to quick settings" into nyc-dev 2016-04-22 15:47:31 +00:00
Bo Liu
408c9f8834 Merge "webview: canInvokeDrawGlFunctor should always return true" into nyc-dev
am: 79ec08248a

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

Change-Id: I48e1dbb8d8890917b6695552ff7fb0ab6f6c1686
2016-04-22 15:40:27 +00:00
Selim Cinek
53405ffa62 Merge "Fixed a bug where notifications could overlap" into nyc-dev
am: 33e2fc481c

* commit '33e2fc481c05e0f9c956fc81a999a2b704c21564':
  Fixed a bug where notifications could overlap

Change-Id: Ib93924d2c6828bca840a4529531f64a6278b4af0
2016-04-22 15:40:25 +00:00
Bo Liu
79ec08248a Merge "webview: canInvokeDrawGlFunctor should always return true" into nyc-dev 2016-04-22 15:36:38 +00:00
TreeHugger Robot
33e2fc481c Merge "Fixed a bug where notifications could overlap" into nyc-dev 2016-04-22 15:16:07 +00:00
Brian Carlstrom
eca1026d72 Merge "Add reasons to notifyPackageUse calls" into nyc-dev
am: 6894199054

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

Change-Id: I299c8e5edca598b5506789f6acf7ce00c836a3c2
2016-04-22 15:15:22 +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
6096c68863 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: Ie7b8e0f10aee354c0b987aa37427cc1f60d286d4
2016-04-22 14:20:37 +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
Chris Banes
02e81a094f Make AbsSavedState read using given ClassLoader
Currently it does not use a ClassLoader to read
any super state, which can cause crashes for
custom views using the class but on a different
class loader.

BUG: 27790353
Change-Id: I4f4d1d72f213f2481606673643c0e56c23d34bc6
2016-04-22 13:52:08 +01:00
Victor Chang
bf35a4d024 Merge "Deleting lock screen clears all CA approvals" into nyc-dev
am: c0440e5f4d

* commit 'c0440e5f4dfa695d2347c68bbec787d3e16847eb':
  Deleting lock screen clears all CA approvals

Change-Id: I20852d21a77f252ef8bdab06f2b00ac9f3daab1d
2016-04-22 11:06:52 +00:00
Victor Chang
c0440e5f4d Merge "Deleting lock screen clears all CA approvals" into nyc-dev 2016-04-22 11:02:43 +00:00
Seigo Nonaka
77972bbf2c Fix unexpected truncation again.
Unexpected truncation happens again after [1].
This is fixed by setting match_parent into the container LinearLayout.

For the unexpected truncation of Holo Theme is came from other but
related root cause. To calculate the window and container width,
need to add container padding in addition to the maximum width of
the text view. Otherwise the width of the container view will be
shrunk and the contents will be truncated. This only happens on
Holo Theme since the padding of the container is zero on Material
Theme.

I manually confirmed this CL doesn't revive following issues
- 28034210
- 27341560

[1]: I67886a752ef110d3433dddd6aa8447a9027f8e19
[2]: I69b258687b4bf5510d9b2c3e690c88106bf893f5

Bug: 28266493
Bug: 28281740
Change-Id: Ie6d274714ac08080dc22aeb8ecd8b7729cb634cd
2016-04-22 19:06:53 +09:00
Hugo Benichi
cbb0d77bcd Merge "Split network monitoring and portal probe events" into nyc-dev
am: 784c93e372

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

Change-Id: I1f443c68ab59d14dad99e826b49f5a593d82a75b
2016-04-22 09:50:58 +00:00
Rubin Xu
67c7ac2890 Merge "Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast" into nyc-dev
am: b40667eccd

* commit 'b40667eccdd797d08560c33e696625509f90d52b':
  Remove MANAGED_PROFILE_AVAILABILITY_CHANGED broadcast

Change-Id: If16093eef0bc2d5ef3022e2a110ab5eca952e0bf
2016-04-22 09:50:57 +00:00
Jaewan Kim
b003364bc7 Revert "Prevent recents from closing while moving PiP to fullscreen."
This reverts commit 744e6e3aef
to prevent Recents from shown again after an activity is PIPed
immediately after the fullscreen.

Bug: 28333917
Change-Id: Ifeceb910eefc3eef109bdc3ed24e11109f2cf9b4
2016-04-22 18:44:07 +09: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
Rebecca Silberstein
bb1b31a3aa Merge changes from topic \'blockOnProcessingUnsolicited\' into nyc-dev
am: ff0ff67ecc

* commit 'ff0ff67eccd784ccdd35b91ed182c50bb8df2d71':
  Tethering: interface updates can be handled again
  NativeDaemonConnector: add waitForCallbacks method

Change-Id: I74e75f669710bef0c8e57b0a6f2a6cfbb154a88e
2016-04-22 08:46:20 +00:00
Selim Cinek
1ba41d1a22 Fixed a bug where notifications could overlap
If the expanded child was smaller then the collapsed one
the UI could get very weird. We're now measuring the expanded
version at least as big as the collapsed one.

Change-Id: Ibb99c4926121b2affcc181071b5e439f23c8e4f2
Fixes: 28318145
Fixes: 28015447
2016-04-22 01:43:24 -07:00
Lorenzo Colitti
ff0ff67ecc Merge changes from topic 'blockOnProcessingUnsolicited' into nyc-dev
* changes:
  Tethering: interface updates can be handled again
  NativeDaemonConnector: add waitForCallbacks method
2016-04-22 08:41:10 +00:00
Rebecca Silberstein
636c07d9a9 Tethering: interface updates can be handled again
When reloading wifi firmware, unsolicited responses from netd were
processed after softap had started and caused wifi tethering to be torn
down.

The NetworkManagementServer.wifiFirmwareReload call has been changed to
not only block for the command to finish, but also until all unsolicited
messages (interface updates) have been handled.  We should now be able
to handle interface updates in tethering without suffering from the
softap bringup/interface down notification race condition.

BUG: 27857665
Change-Id: Ie57cb8f760781b3227df575b577b33667070d63e
2016-04-22 08:39:35 +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
bf72e614a0 Merge "Fixed a bug where the icon of children could be colored" into nyc-dev
am: d212cfa107

* commit 'd212cfa107948adc986a179deb79aa6b62709b63':
  Fixed a bug where the icon of children could be colored

Change-Id: Ib0677499d5ca95931cc3bc98692bf7b180b0196b
2016-04-22 07:47:53 +00:00
TreeHugger Robot
d212cfa107 Merge "Fixed a bug where the icon of children could be colored" into nyc-dev 2016-04-22 07:28:31 +00:00