230760 Commits

Author SHA1 Message Date
Victor Chan
4d8c66bd36 Use vector drawables for icons on car navbar
Adjusting CarNavigationButton layout so that vector
drawables are properly scaled/rendered in the car navigation bar.

Change-Id: I71fdfd0d863049a63abf11c41f46c950ed7e309e
2016-01-26 14:18:31 -08:00
Julia Reynolds
ec0c2d8fde Merge "Visual interruptions: stop more full screen intents." 2016-01-26 22:08:28 +00:00
Jason Monk
f641858497 Merge "Make suggestions handle string or int" 2016-01-26 22:04:16 +00:00
Jason Monk
ca7ec8a547 Make suggestions handle string or int
Evidently metadata bundles turn a single int into an integer rather than a
string without telling you.

Change-Id: I5c6557bad51981f27a7e213052e2be5bcc3a0a93
2016-01-26 17:01:00 -05:00
Julia Reynolds
0971cb076d Visual interruptions: stop more full screen intents.
The user options for 'no screen interruptions' needs to stop
peeks and full screen intents when the screen is on.

Bug: 25423508
Change-Id: I49b1c40552c3506fae259364a4d5e49168c8de36
2016-01-26 17:00:22 -05:00
Nick Vaccaro
16726c5c76 Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am: 907108ca0f -s ours am: 3e413dfcdd -s ours am: f5958497d3 -s ours
am: cee0600bd9  -s ours

* commit 'cee0600bd9c9c9d7a7d777ca3621396c972783db':
  [DO NOT MERGE ANYWHERE] Fix bodysensor permission
2016-01-26 21:57:26 +00:00
Sailesh Nepal
58941094d4 Merge "Mark mised call notification as protected" 2016-01-26 21:48:58 +00:00
Xiaohui Chen
3104d634a1 Merge changes from topic 'xc_remove_shelf'
* changes:
  sysui: remove shelf
  DO NOT MERGE sysui: remove shelf
2016-01-26 21:26:35 +00:00
Julia Reynolds
e66515f542 Merge "Show app level settings when an app doesn't use topics." 2016-01-26 21:21:04 +00:00
Ji Yang
a8efa46fcb Merge "New string constants shown when new SMS arrives while phone is locked." 2016-01-26 21:18:44 +00:00
Chong Zhang
46e114430b Merge "Restore code to draw backdrop and content nodes" 2016-01-26 20:52:11 +00:00
Chong Zhang
c3bd568112 Restore code to draw backdrop and content nodes
bug: 26626661
Change-Id: I9e4dd41708e8ed93d3cf64242ad81815a653d269
2016-01-26 12:49:28 -08:00
Julia Reynolds
92d456e9a6 Show app level settings when an app doesn't use topics.
Change-Id: I205062868ac3a44aa24a29bcb82a9374026287a7
2016-01-26 15:43:10 -05:00
Nick Vaccaro
cee0600bd9 Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am: 907108ca0f -s ours am: 3e413dfcdd -s ours
am: f5958497d3  -s ours

* commit 'f5958497d36ac64ed1f2bbbd80cb0a3a24e94f13':
  [DO NOT MERGE ANYWHERE] Fix bodysensor permission
2016-01-26 20:34:20 +00:00
Nick Vaccaro
f5958497d3 Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am: 907108ca0f -s ours
am: 3e413dfcdd  -s ours

* commit '3e413dfcddf27f1a44012e4c1d2b80bdcacd1e26':
  [DO NOT MERGE ANYWHERE] Fix bodysensor permission
2016-01-26 20:21:37 +00:00
Nick Vaccaro
3e413dfcdd Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev
am: 907108ca0f  -s ours

* commit '907108ca0f4e69dd170a507c5830591712ec5967':
  [DO NOT MERGE ANYWHERE] Fix bodysensor permission
2016-01-26 20:16:15 +00:00
Marie Janssen
554bc80056 Merge "IBluetooth: remove dump(), support arguments" 2016-01-26 20:14:58 +00:00
Nick Vaccaro
907108ca0f Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev 2016-01-26 20:13:26 +00:00
Nathan Harold
86d4372c41 Merge "Remove Data RealTime Info Listener Support" 2016-01-26 20:13:26 +00:00
Peng Xu
79c004b2c1 [DO NOT MERGE ANYWHERE] Fix bodysensor permission
Bug: 26481493
Bug: 26447970
Change-Id: Ibeaf5a5e39f0dc552cf115d2834a1ec28ecef5ab
2016-01-26 20:10:27 +00:00
Chris Wren
e9aa39470d Merge "change the default notification rules" 2016-01-26 20:00:58 +00:00
Marie Janssen
9db28ebea5 IBluetooth: remove dump(), support arguments
Because IBluetooth is a Binder service, we don't need dump() to
support dumpsys, just call the IBinder.dump().

Change-Id: Idcd48f758427b824e0b7eaafd091ba3fb2ff8993
(cherry picked from commit adbb3ff062e039b2552c6b5ded92e56346ac3934)
2016-01-26 20:00:11 +00:00
Chris Wren
cdee8cd16a change the default notification rules
should make devices less noisy by default
more metrics so we can tell exactly what we're doing.

Change-Id: I2504df91083074de8fe08c896e017335bc0bc1c7
2016-01-26 14:58:06 -05:00
Jason Monk
5d269c758b Merge "Updates to SuggestionParser" 2016-01-26 19:52:54 +00:00
Jason Monk
294efa57ca Updates to SuggestionParser
Added support for feature requirements and return after dismiss delays.

Change-Id: I80e80a55817cd4d9717876e34fc591b3dd3228f1
2016-01-26 14:40:16 -05:00
Chris Tate
a59b5f7996 Merge "Prevent (and repair) poisoned full-data backup queue" 2016-01-26 19:39:08 +00:00
Xiaohui Chen
0691703467 sysui: remove shelf
Bug: 26742568
Change-Id: I10bbf55b4b93fb5d360a56dcc59c943d8806a27e
2016-01-26 11:32:20 -08:00
Xiaohui Chen
e9dab0dade DO NOT MERGE sysui: remove shelf
Bug: 26742568
Change-Id: I36bd013c4adb62b76b6f2789aa490c1484a535d7
2016-01-26 11:31:51 -08:00
Ji Yang
7c905ef519 New string constants shown when new SMS arrives while phone is locked.
Bug: 26232405
Change-Id: I979daab3d416b16ac4e1e488134f25ff75bad873
2016-01-26 11:06:56 -08:00
John Reck
c9fd313f94 Merge "Fix tests" 2016-01-26 18:59:27 +00:00
Christopher Tate
339b53a8e6 Prevent (and repair) poisoned full-data backup queue
An app that transitioned from full-data to key/value backup regimes
was being left in the full-data backup queue until next reboot.  In
edge cases this would result in the app being inappropriately shut
down for backup; furthermore, it would potentially cause there to
exist a full-data payload for the app that was considered "newest"
and therefore be the one delivered at restore time on a new device
or app (re)installation.

Defense in depth: full-backup candidates are just-in-time reevaluated
for validity when they come up again in the queue; app update
notifications cause a reevaluation and removal from the queue if
full-data is no longer the right modality; and the common engine for
all cloud-facing full-data backups does an additional last-ditch
validation that each stated target is actually supposed to get
full-data backups rather than key/value, to backstop the checks on
queue-presence validity.

Bug 26744511

Change-Id: I55bea3e19a2cab0150dbe5a08dd9fc550f0068c4
2016-01-26 10:58:37 -08:00
John Reck
65182ccffc Fix tests
Disable FrameBuilder.clippedMerging as it relies on
merged bitmap ops which was disabled in b/26793764

Fix Buffer to correctly initialize mRefs count

Change-Id: I87d2fcc690a2ae14eaf751f650f522be5b622edf
2016-01-26 10:50:10 -08:00
Philip P. Moltmann
5ddbc2af0c Merge "Correctly deal with non-null ness of PrintJobId." 2016-01-26 18:25:23 +00:00
Philip P. Moltmann
8f8c79515e Merge "Correct nullability in PrintJob." 2016-01-26 18:24:37 +00:00
Philip P. Moltmann
b18cacfcad Merge "Carry over orientation when updating the printAttributes with the capabilities of the printer." 2016-01-26 18:24:15 +00:00
Tao Bao
5adbfd0a44 Merge "Build update engine binder AIDLs for framework use." 2016-01-26 18:17:37 +00:00
Ben Kwa
bae1c3482c Merge "Temporarily fix directory tile heights in grid mode." 2016-01-26 18:11:44 +00:00
Ben Kwa
70921871ba Temporarily fix directory tile heights in grid mode.
BUG=26760493

Change-Id: I118e30cdf3892ef6857735f4a4f69a128b3f1c36
2016-01-26 10:08:24 -08:00
John Reck
5f1c64ef76 Merge "Temporarily workaround merged bitmap bug" 2016-01-26 18:06:04 +00:00
Shishir Agrawal
9457a20dd5 Merge "DO NOT MERGE : Unhiding MSIM APIs." into mm-wireless-dev
am: 45836d13e5  -s ours

* commit '45836d13e5d06c787b5039894b6c0ac7c5eb7b7b':
  DO NOT MERGE : Unhiding MSIM APIs.
2016-01-26 18:04:39 +00:00
Shishir Agrawal
45836d13e5 Merge "DO NOT MERGE : Unhiding MSIM APIs." into mm-wireless-dev 2016-01-26 18:00:11 +00:00
Adrian Roos
ebefdd3f7c Merge "Crash dialog improvements, move crash code to AppErrors" 2016-01-26 17:42:09 +00:00
Shishir Agrawal
3a86d3d534 DO NOT MERGE : Unhiding MSIM APIs.
1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
   APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: Ibebab7379ea79c8e4812bbd190342827048e30e2
2016-01-26 09:29:24 -08:00
Wale Ogunwale
5407f1e652 Merge "Revert "Relaunch activity resumed if it got resumed before relaunching."" 2016-01-26 17:17:21 +00:00
Adrian Roos
20d7df3c3f Crash dialog improvements, move crash code to AppErrors
Factors out the crash and ANR handling code into separate
class and allows clearing cache and restarting app from
crash dialog.

Bug: 22692162
Change-Id: I2a08a4255ea02ab3c7441d351bf278128fcf5a5d
2016-01-26 09:16:26 -08:00
Wale Ogunwale
32ebbd87d7 Revert "Relaunch activity resumed if it got resumed before relaunching."
This reverts commit 51dc8be2230758132744ae6204d95e8171784c26.

Due to activities getting multiple resume calls.

Bug: 26116905
Bug: 25674611
Change-Id: Idb4846b6a0efc4d6ac06bf240565f303d9206f0f
2016-01-26 09:13:24 -08:00
John Reck
14de0415bb Temporarily workaround merged bitmap bug
Bug: 26569206

Merged bitmap ops are buggy, just turn them off for
now to unblock testing

Change-Id: Ic0151bb3f23b1843107806659a64b26fd6d6e19e
2016-01-26 09:01:30 -08:00
Florin Malita
dd93728b46 Merge "Add internal Canvas save flags" 2016-01-26 17:00:37 +00:00
Jason Monk
8dfd95d091 Merge "Add user switcher back to QS" 2016-01-26 16:07:55 +00:00
Jason Monk
69e76ccee7 Add user switcher back to QS
Change-Id: Ie3f8139782aee06ad932ded9145162de5e22a824
2016-01-26 11:03:16 -05:00