Commit Graph

246497 Commits

Author SHA1 Message Date
Jorim Jaggi
4a9653841b Merge "Fix stuck windows in multi-window" into nyc-dev 2016-04-25 19:33:40 +00:00
Jorim Jaggi
dbe44ac48d Fix stuck windows in multi-window
Window manager checked for the full display size so isHiddenFromUserLocked
always returned true but activity manager and other places in window manager
thought it would be visible which created a really weird state.

Bug: 28344326
Change-Id: I98daefbcc64bf7a5196588c25d2cbc5ee046a77d
2016-04-25 12:31:17 -07:00
Jorim Jaggi
17178d95f2 Merge "Fix layout for child windows" into nyc-dev 2016-04-25 19:29:41 +00:00
Jorim Jaggi
5f23a57707 Fix layout for child windows
Turns out that we also need to fit child windows to display in all
cases except NO_LIMITS is set.

Bug: 27991404
Change-Id: I34a12bbf9d0169bdb770e0e96f4b994146063e90
2016-04-25 12:24:57 -07:00
Amith Yamasani
9af762cace Merge "Fix NPE when assist data request times out" into nyc-dev
am: bc6d96e

* commit 'bc6d96e4d09ec71a2844ea4e9281b7e849a00f80':
  Fix NPE when assist data request times out

Change-Id: Ifb20aa2e1f246dacff008f539fce728c18abf14b
2016-04-25 19:23:49 +00:00
Jeff Sharkey
02179da30e Destroy both CE and DE data when corrupted.
When we find either a CE or DE data directory that has been corrupted,
destroy both CE and DE data together, since internal services like
AccountManager get confused if they find DE data without matching CE
data.

Bug: 28346537
Change-Id: Iaf3694c20e4664536af25a2afeb45fe8a90d8171
2016-04-25 13:23:32 -06:00
Daniel Sandler
955009f9d3 Merge changes from topic 'substitute-notification-app-name' into nyc-dev
* changes:
  Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
  Show "Android System" instead of "System UI" in screenshot notifications.
2016-04-25 19:22:40 +00:00
Daniel Sandler
4c40888673 Merge "Tap, don't touch." into nyc-dev 2016-04-25 19:21:46 +00:00
smain@google.com
8ac737db37 Update the N Preview docs now that Studio 2.1 is stable.
bug: 28342771

Change-Id: I73ee710928e4270ffe8212ca16b42d28b738949e
2016-04-25 19:21:21 +00:00
Daniel Sandler
5602898dd5 Merge "Don't generate stack in logcat if assistant missing." into nyc-dev 2016-04-25 19:21:03 +00:00
Jeff Sharkey
24492ae448 Track down Contexts without data directories.
Data directories for all packages should be created and managed by
installd; if we create a Context and the data directory doesn't exist
yet, we're in trouble, since a later mkdirs() would end up creating
the directory with incorrect permissions, mode, and SELinux labels.

Bug: 28272737
Change-Id: Ie3bb884ab07748719378de5c792046a031a3f945
2016-04-25 13:20:29 -06:00
Mady Mellor
37c6a196f1 Merge "Fix gear being covered on notification update" into nyc-dev
am: 904a39c

* commit '904a39ca92f7e616d400a8733b3970b8828da072':
  Fix gear being covered on notification update

Change-Id: I4c6110c40aeff0dec30269d6117def1e0581dab2
2016-04-25 19:13:03 +00:00
Mady Mellor
2003f115da Merge "Fix the gear so that it is always centered based on the min noti height" into nyc-dev
am: 5a3e441

* commit '5a3e4411582b1cae9b9002026b467c9c08e69a55':
  Fix the gear so that it is always centered based on the min noti height

Change-Id: I4ffb1bc658323392723fecd53179b0edb9140f6d
2016-04-25 19:13:02 +00:00
Felipe Leme
c837b17378 Merge "Added a \'deferred\' parameter on executeRunnableDismissingKeyguard()." into nyc-dev
am: 73624af

* commit '73624af552ac0bfdcd60d5cb3de0e56b8be878a2':
  Added a 'deferred' parameter on executeRunnableDismissingKeyguard().

Change-Id: I92dfafdc192139536dbedc365444a80a92db5028
2016-04-25 19:13:00 +00:00
Amith Yamasani
bc6d96e4d0 Merge "Fix NPE when assist data request times out" into nyc-dev 2016-04-25 19:07:32 +00:00
Mady Mellor
904a39ca92 Merge "Fix gear being covered on notification update" into nyc-dev 2016-04-25 19:06:17 +00:00
Mady Mellor
5a3e441158 Merge "Fix the gear so that it is always centered based on the min noti height" into nyc-dev 2016-04-25 19:05:48 +00:00
Kevin Hufnagle
9ee8d41162 docs: Added entry in USB vendor ID table for HP.
The USB Vendor IDs table within the "Using Hardware Devices" page now
includes an entry for HP (03f0).

Bug: 23001119
Change-Id: I77080a78980833239fef4524fe304e79bfa384a6
2016-04-25 12:00:01 -07:00
Julia Reynolds
0aa7d615c2 Api review: Settings.
Hide notification policy setting.

Bug: 28295513
Change-Id: Ic117285c3eb07cb4bf399e233adad835772b9673
2016-04-25 14:57:33 -04:00
TreeHugger Robot
73624af552 Merge "Added a 'deferred' parameter on executeRunnableDismissingKeyguard()." into nyc-dev 2016-04-25 18:57:30 +00:00
Bo Liu
d61776e18e Merge "WebView doc: explain persist js across navigations" into nyc-dev
am: b698fc9

* commit 'b698fc9d84cff493ce34dd9860f14f34ce48e8f0':
  WebView doc: explain persist js across navigations

Change-Id: I6c5a3b1b4bd78014d7d9b6cc32ddc88128e33de2
2016-04-25 18:46:49 +00:00
TreeHugger Robot
b698fc9d84 Merge "WebView doc: explain persist js across navigations" into nyc-dev 2016-04-25 18:39:47 +00:00
Rubin Xu
ea6d713221 Merge "Add back protected profile availibility broadcasts." into nyc-dev
am: cda5089

* commit 'cda50893b623f19834114eb225d78fceb70b8aca':
  Add back protected profile availibility broadcasts.

Change-Id: I64cb4f8be388dbadf607d19d64e4072df03ba7d2
2016-04-25 18:09:34 +00:00
Wale Ogunwale
5cca61d3f7 Merge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into nyc-dev
am: 442fd2a

* commit '442fd2a1ddcfde18887ae712649695d6e7c384b3':
  Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK

Change-Id: I505031cfb8fa177ef968dfe2a4170e31542147ec
2016-04-25 17:58:56 +00:00
Selim Cinek
13654c941c Merge "Added the ripple drawable back to the media notification" into nyc-dev
am: 08b38f8

* commit '08b38f87ef297ed792f25041e10d036eb6f58c82':
  Added the ripple drawable back to the media notification

Change-Id: Iac5eb83358ebb03f4858c2dfe74ca761a9c77396
2016-04-25 17:58:55 +00:00
Rubin Xu
cda50893b6 Merge "Add back protected profile availibility broadcasts." into nyc-dev 2016-04-25 17:58:29 +00:00
TreeHugger Robot
442fd2a1dd Merge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into nyc-dev 2016-04-25 17:51:13 +00:00
Rubin Xu
dae6beda7b Add back protected profile availibility broadcasts.
Bug: 27532254
Change-Id: Ifbf59f64358864cd1d48be5e797c45ec2744eac0
2016-04-25 18:47:36 +01:00
Selim Cinek
08b38f87ef Merge "Added the ripple drawable back to the media notification" into nyc-dev 2016-04-25 17:44:11 +00:00
Kweku Adams
5b2747e133 Removing extraneous field from batterystats dumpsys.
Accidentally introduced in ag/851920.

Change-Id: I89ac490cef1735defa7165e6d27beae20490091d
2016-04-25 10:44:05 -07:00
Amit Mahajan
2c222510f6 Change to return phone count as 0 if voice, sms, data not supported.
If any of the 3 is supported, and multi-sim capabilities are unknown,
return 1.

Bug: 23016052
Change-Id: Id19aaf33d9a86fc24116704c668977c727c2a1f2
2016-04-25 10:33:34 -07:00
Andreas Gampe
3480213054 Frameworks/base: Make debug helper lazy in ConnectivityManager
Place helper map for callback field names into a holder. This avoids
the reflective calls in static initialization of ConnectivityManager
in the common (non-debug) case, which means the class can be
compile-time initialized. Also saves the storage necessary (both
the storage array as well as the reflection metadata).

Follow-up to fcfa7d921a.

Bug: 27265238
Change-Id: Ib4bfaf27acd234a035a5d198458340099a156a4c
2016-04-25 10:30:53 -07:00
Amith Yamasani
6e267d3d23 Fix NPE when assist data request times out
Bug: 28329835
Change-Id: I032e20ea1008512954b97519a4abb6fe4d65c673
2016-04-25 10:24:52 -07:00
Chong Zhang
81e2deb6c2 Merge "fix "am start -W" hang on activity start" into nyc-dev
am: 5e40748

* commit '5e40748d3f32c0d5843855cac169e82dd15a0904':
  fix "am start -W" hang on activity start

Change-Id: I1b588c6ccd369d05afca0729d79a3102226aeff9
2016-04-25 17:16:47 +00:00
Fyodor Kupolov
41263bf1f7 Merge "Return null when user is locked" into nyc-dev
am: 6eb8c15

* commit '6eb8c15b7e07e320243fbb34999f4a34fa729ed0':
  Return null when user is locked

Change-Id: I7926a4226ce99d290ba60fff85b72f4a2f3cf6f3
2016-04-25 17:16:45 +00:00
Jeff Sharkey
9ad9b8b61d Merge "Strings for post-upgrade." into nyc-dev
am: 5dc3304

* commit '5dc3304531b7612f1181e122a66eaf097339ae30':
  Strings for post-upgrade.

Change-Id: I6ccbf0118dd602cdb94c11085a4c45fb6b248856
2016-04-25 17:16:43 +00:00
Winson
74c195af45 Merge "Fixing animation regression due to ag/957220." into nyc-dev
am: de91709

* commit 'de91709935b687cf747b25a48d22e9aa396bf462':
  Fixing animation regression due to ag/957220.

Change-Id: Ib0bc962b9e789227fed652517dff63ca00e0acc6
2016-04-25 17:16:41 +00:00
Calin Juravle
3a61c96d29 Merge "Disable StrictMode policy when setting up profile support" into nyc-dev
am: 096e2dc

* commit '096e2dcf855714577bb86eaa4869ff46b5980a07':
  Disable StrictMode policy when setting up profile support

Change-Id: I2fa44b42bf2d5a3dd649ac75f032f0ebb79d3422
2016-04-25 17:16:38 +00:00
Alan Viverette
28fabe5e87 Apply tint when setting check mark drawable
Bug: 28373624
Change-Id: Ieb5be55c63b168ab18302836f28cd5cedc06c4d8
2016-04-25 13:15:39 -04:00
Julia Reynolds
47bee3b529 Reduce spacing.
Bug: 28325996
Change-Id: I065dc077876abb98d7c3381cc0ac28af77323c8a
2016-04-25 13:09:16 -04:00
Chong Zhang
5e40748d3f Merge "fix "am start -W" hang on activity start" into nyc-dev 2016-04-25 17:08:07 +00:00
Fyodor Kupolov
6eb8c15b7e Merge "Return null when user is locked" into nyc-dev 2016-04-25 17:03:36 +00:00
Alan Viverette
c7d34bb3dc Remove -night qualified resources
Bug: 28358465
Change-Id: I3e9c3ec21bdc39426aa5f81373ca44e61eb6974a
2016-04-25 12:57:54 -04:00
Bo Liu
e29d313e95 WebView doc: explain persist js across navigations
BUG: 28207652
Change-Id: Ib33f029c2cae6c1482c0c951075275e9f96ae73c
2016-04-25 09:38:06 -07:00
Jeff Sharkey
5dc3304531 Merge "Strings for post-upgrade." into nyc-dev 2016-04-25 16:34:13 +00:00
Winson Chung
de91709935 Merge "Fixing animation regression due to ag/957220." into nyc-dev 2016-04-25 16:25:51 +00:00
Felipe Leme
ee5d630459 Added a 'deferred' parameter on executeRunnableDismissingKeyguard().
OnDismissAction() should return true only when the dismiss should be
deferred, but the annonymous class on
executeRunnableDismissingKeyguard() was always return true, which was
cause a janky timeout when the runnable didn't launch an activity.

BUG: 28303552

Change-Id: I1f9e299102d6cebba44794c026a69cf43ea06990
2016-04-25 09:12:06 -07:00
Winson
60df24648e Fixing animation regression due to ag/957220.
- Ensure we clear deferred relayouts after finishing all animations in
  case they trigger a deferred layout in the animation-end callback.

Bug: 28287904
Change-Id: I6d71328fb3dc4595ea67ee18cfa57d85d741e6c6
2016-04-25 16:01:03 +00:00
TreeHugger Robot
096e2dcf85 Merge "Disable StrictMode policy when setting up profile support" into nyc-dev 2016-04-25 15:54:37 +00:00
Dan Sandler
5ccae1fb75 Don't generate stack in logcat if assistant missing.
Low ram devices don't have assistants. Worth noting, but not
making a big stink about it.

Change-Id: I5a49be99bf688a5f1b800a1124b14a589ecf5b52
Fixes: 27210719
2016-04-25 11:49:39 -04:00