231965 Commits

Author SHA1 Message Date
Tomasz Mikolajewski
1c0b2326b8 Fix flaky testLoadsHomebyDefault.
The test was resuming a previously opened activity, so naturally the
redirect to Home didn't happen.

This CL fixes the issue by closing the activity in TearDown().

Change-Id: I43e78a83c2b53c52745bc7eef515a8f759559e46
2016-02-04 11:50:45 +09:00
Christopher Tate
4cf5a49e54 Mark the idle-maint trigger broadcast 'protected'
Bug: 26942536
Change-Id: I52d6b304fc894cad7957f84946178378c309f621
2016-02-03 16:42:19 -08:00
Jae Seo
3bc8dd8edd Merge "TIF: Add extras to TvInputInfo" 2016-02-03 23:29:58 +00:00
Jan Nordqvist
e678624958 Fixed bad serialization code in ScanResult.
am: 7a504417f2

* commit '7a504417f23a1388d2a9bf53f0871d274e70c6b2':
  Fixed bad serialization code in ScanResult.
2016-02-03 23:06:58 +00:00
Wale Ogunwale
b5649ecdce Merge "Fixed some issues with layer adjustment for special windows." 2016-02-03 23:03:01 +00:00
Jan Nordqvist
7a504417f2 Fixed bad serialization code in ScanResult.
Bug: 26964162
Change-Id: Ie9ad65936ab5173533773e5a711bcb81799acfb5
2016-02-03 15:00:57 -08:00
Wale Ogunwale
26b7b43d17 Fixed some issues with layer adjustment for special windows.
- Adjust layers of all windows in pinned stack.
The surface view of a pinned activity will be hidden during transition
animations because we were only adjusting the layer of the main app
window when we adjust special windows in WindowLayersController.
We now adjust the layers of all windows in the pinned stack.
- Also adjust layers for all windows in the docked stack for the same
reasons
- Adjust layers for replacing windows that was lost when the code
was moved to the separate class.

Bug: 26697719
Change-Id: I42fc3f9a51de9999157bcc7fee25a334b3e93ea1
2016-02-03 22:55:20 +00:00
Aga Wronska
d8c25f8908 Merge "Stop current root reloading when it is clicked again" 2016-02-03 22:55:14 +00:00
Jason Monk
bacab47918 Merge "QS Visuals work" 2016-02-03 22:25:02 +00:00
Chong Zhang
3442c1232c Merge "Do not adjust for IME window if docked stack is not visible" 2016-02-03 22:20:42 +00:00
Doris Liu
d86da08531 Merge "Fix NPE for invalid target exception" 2016-02-03 22:19:40 +00:00
Chong Zhang
feea9ca7d0 Do not adjust for IME window if docked stack is not visible
getDockSide() will tell us the stack is docked on bottom even when
we're not in docked mode. So we have to check if docked stack is
visible first.

bug: 26940656
Change-Id: I8729b2502e2fa78ae51e97f5599c23f3d3ea62fc
2016-02-03 14:10:58 -08:00
Julia Reynolds
555c86f944 Merge "Make 'total silence' more silent." 2016-02-03 22:03:49 +00:00
Alan Viverette
3caad43a1f Merge "Preserve TextView mDrawables if it has metadata (ex. tint or padding)" 2016-02-03 22:03:21 +00:00
Vladislav Kaznacheev
383b7aa01b Merge "Make pointer-icon attrs public" 2016-02-03 21:51:48 +00:00
Zach Kuznia
55fd569c1b Merge "Improve gesture recognition state change for TouchExplorer." 2016-02-03 21:48:27 +00:00
Jan Nordqvist
f52a8f6ef7 Fixed API merge issue in master.
Change-Id: I4bf0104ee703daa4da78d6637c1fa82ace57f073
2016-02-03 13:01:03 -08:00
Jason Monk
db204e9ada Merge "String updates - touch to tap" 2016-02-03 20:44:28 +00:00
Jason Monk
50b4b1eb39 String updates - touch to tap
Bug: 26749895
Change-Id: I5a6d44269e48aa89076199a825b65329c735437c
2016-02-03 15:43:01 -05:00
Jason Monk
db50de8073 QS Visuals work
Mostly just resizing and placement of things.

Change-Id: I28dbe22b0b0633bbe2bd484879e29349510dde29
2016-02-03 15:34:54 -05:00
Zachary Kuznia
28239e8a61 Improve gesture recognition state change for TouchExplorer.
This increases the tolerace for detecting a user interaction as a
gesture in Touch exploration mode.  The detection should also be more
consistant between devices, as the threshold is based on physical
units.

Change-Id: Iec935e862d2634fba0fea6dc6d81e62ed2213cbc
2016-02-03 12:06:13 -08:00
Jan Nordqvist
962c6a81e3 Merge "New System APIs for Passpoint r2 app." into mm-wireless-dev
am: fd600b1113

* commit 'fd600b1113af6f66e28b65f5b53f4a7c751cdef9':
  New System APIs for Passpoint r2 app.
2016-02-03 20:00:47 +00:00
Jan Nordqvist
fd600b1113 Merge "New System APIs for Passpoint r2 app." into mm-wireless-dev 2016-02-03 19:57:00 +00:00
Chong Zhang
663928862a Merge "Disable WM loggings" 2016-02-03 19:56:50 +00:00
Philip P. Moltmann
92c293609f Merge "Cancel print job if PrintActivity was finished before spooler could be connected." 2016-02-03 19:51:21 +00:00
Chong Zhang
0464a9345e Disable WM loggings
bug: 26819496
Change-Id: Ib5258391101293c9aaca3b865e1f1580234bcbe3
2016-02-03 11:47:16 -08:00
Sunny Goyal
40dedd5a97 Merge "Added support for async inflation of RemoteViews" 2016-02-03 19:31:09 +00:00
Vinit Deshpande
a772f0cf34 New System APIs for Passpoint r2 app.
Change-Id: I09428e9a393999f43aefe5efd77cffe4b1b17da5
2016-02-03 11:28:21 -08:00
Svetoslav Ganov
d7595b3151 Merge "Add a couple of shared libraries - services, shared" 2016-02-03 19:25:52 +00:00
Rob Carr
48ab53e571 Merge "Remove obsolete conditional preventing surface placement." 2016-02-03 19:25:16 +00:00
Doris Liu
d4fda02dd5 Fix NPE for invalid target exception
Change-Id: I57b319fae617792351c6ec9872c3b73cd25dc4e5
2016-02-03 11:10:49 -08:00
Ruben Brunk
574460f547 Merge "Connect VR HAL to VrManagerService." 2016-02-03 19:05:32 +00:00
Chris Tate
eef4cb3efc Merge "fullBackupOnly=true means don't even think about key/value backup" 2016-02-03 18:29:23 +00:00
Chris Tate
220b845ba4 Merge "Send ALARM_CLOCK_CHANGED broadcast with REPLACE_PENDING" 2016-02-03 18:28:33 +00:00
Antonio Cansado
1e3f04f090 Merge "Adding a callback to notify data usage." 2016-02-03 18:16:51 +00:00
Aga Wronska
45f75e2a81 Stop current root reloading when it is clicked again
Bug: 25079217
Change-Id: I5d32be06d9eda4e5aced965030cce863e8a1965d
2016-02-03 10:09:35 -08:00
Eric Laurent
b09265df23 Merge "Bluetooth: Restrict gain for Absolute volume case" am: 81e7a58754
am: d24eb54b54

* commit 'd24eb54b5409997ece8e49ce2e57d27f8b41d778':
  Bluetooth: Restrict gain for Absolute volume case
2016-02-03 18:07:42 +00:00
Eric Laurent
d24eb54b54 Merge "Bluetooth: Restrict gain for Absolute volume case"
am: 81e7a58754

* commit '81e7a5875465f9b2b7ed785d4f138b11f386c5c1':
  Bluetooth: Restrict gain for Absolute volume case
2016-02-03 18:02:20 +00:00
Derek Sollenberger
0eef10e556 Merge "Update Canvas API with view system calls." 2016-02-03 17:59:11 +00:00
Geoff Mendal
b3187cc67d Merge "Import translations. DO NOT MERGE" 2016-02-03 17:55:05 +00:00
Geoff Mendal
a59ad81849 Import translations. DO NOT MERGE
Change-Id: Iad2ccbf1fef7c8ca217e78134a6fa66b738f97f8
Auto-generated-cl: translation import
2016-02-03 18:53:27 +01:00
Kenny Guy
c5947f8b76 Merge "Match non-crypto aware admins when registering." 2016-02-03 17:45:03 +00:00
Eric Laurent
81e7a58754 Merge "Bluetooth: Restrict gain for Absolute volume case" 2016-02-03 17:30:39 +00:00
Geoff Mendal
5aaac0152f Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 17:18:44 +00:00
Geoff Mendal
ff63640526 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 8152fbd7e9 -s ours
am: f322b46028  -s ours

* commit 'f322b4602893a9cb3eae30ac0f4f196b3dc95176':
  Import translations. DO NOT MERGE
2016-02-03 17:17:01 +00:00
Paul Jensen
1a737fbd78 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 17:16:58 +00:00
Ben Kwa
501fde65b5 Merge "Lint fixes and config tweaks." 2016-02-03 17:12:53 +00:00
Paul Jensen
8514a8131f Merge "Android packet filtering program interpreter test & program generator" into mm-wireless-dev
am: 44307adcf3

* commit '44307adcf371bacad4de6925a9207bdbfdc6f874':
  Android packet filtering program interpreter test & program generator
2016-02-03 17:12:47 +00:00
Ben Kwa
e3aee18dc9 Lint fixes and config tweaks.
- Add recommended ignore properties to lint.xml.
- Make Fragment subclasses public.
- Truncate log tags at 23 chars.
- Fix one instance of passing a color ID instead of a color.
- Misc xml property fixes.

Change-Id: Ie8d6a8932cda72b7a239f6dfab56bd854f909820
2016-02-03 09:09:40 -08:00
Selim Gurun
061371b3ee Merge "Make abiOverride attribute public" 2016-02-03 17:09:09 +00:00