158927 Commits

Author SHA1 Message Date
Alan Viverette
7c3212b2f4 Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev 2014-12-12 22:00:26 +00:00
Alan Viverette
9a1b4c2967 Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev 2014-12-12 21:59:22 +00:00
Alan Viverette
9bc11ac168 Move ripple to end state on jump when hardware exit is pending
BUG: 18734676
Change-Id: Ie063e1eec0b4f28f936ea27822afacfd1b72a0e9
2014-12-12 13:38:10 -08:00
Chong Zhang
bb177db1fe Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev 2014-12-12 20:49:36 +00:00
Svet Ganov
14e3351a1e Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 2014-12-12 20:49:01 +00:00
Svet Ganov
7486bc1f5a Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev 2014-12-12 20:48:09 +00:00
Alan Viverette
419aa7ad14 Propagate DrawableContainer state on mutate, fix ColorDrawable theming
BUG: 18542282
BUG: 18467568
Change-Id: Id1d75cfe47fde3206ab40e5360289e0cb2504402
2014-12-12 12:34:15 -08:00
Chong Zhang
216e11dcbb parse bitrate range for video/audio caps
Bug: 18684228
Change-Id: Ib5c3682bb1dfa338b99352ea040edcb99d86ef0b
2014-12-12 11:34:42 -08:00
Kenny Guy
4357d4eabc Merge "Don't show last used and profile button at same time." into lmp-mr1-dev 2014-12-12 18:46:23 +00:00
Tim Kilbourn
2636ccc185 Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev 2014-12-12 18:44:19 +00:00
Adam Powell
9a0799cf6b Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 2014-12-12 18:37:33 +00:00
Jason Monk
a47f968d7e Merge "Handle config changes in NetworkController" into lmp-mr1-dev 2014-12-12 18:36:40 +00:00
Jason Monk
a686970051 Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev 2014-12-12 18:36:26 +00:00
Tim Kilbourn
1991590ddd Revert "Attempt to fix keyguard missing bug"
This reverts commit a5faf2415d5760d2239f85271b889d655b5c271b.
It prevents the launcher from showing up on Android TV.

Bug: 18724479
2014-12-12 18:33:16 +00:00
Kenny Guy
b8a2df10c9 Don't show last used and profile button at same time.
UI for ResolverActivity doesn't support last used
activity and work/personal profile button at the
same time. So if work/personal button is present
disable last used.

Bug: 18730438
Change-Id: I7ae7319bbdeb9bcaab9d6d03f97dea17d07c6d7f
2014-12-12 17:04:08 +00:00
Esteban Talavera
c28fa2cdd4 Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev 2014-12-12 16:59:31 +00:00
Jason Monk
3aaabd7124 Handle config changes in NetworkController
We need to remap or recalculate icons after a config change, so
configs based on mccmnc can update properly.

Bug: 18654943
Change-Id: I6a4c1debf9b266d486143b9869abb569bbc31aef
2014-12-12 11:56:11 -05:00
Jorim Jaggi
8934e67051 Merge "Limit item count in QS detail" into lmp-mr1-dev 2014-12-12 15:32:57 +00:00
Jorim Jaggi
d3cccec083 Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev 2014-12-12 15:32:30 +00:00
Jorim Jaggi
ab60f2855b Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev 2014-12-12 15:32:18 +00:00
Jason Monk
d8e4bf4e43 Fix tests after inet changes in NetworkController
Bug: 17460017
Change-Id: Iee9c4399f5ca4413f1449cfcf05d72a67b0adadc
2014-12-12 10:26:43 -05:00
Esteban Talavera
6de72663fa Take into account other profiles when deciding whether to show ResolverActivity
Show ResolverActivity even if there is only one target
on the current profile that listens to that intent,
if other profiles can also handle it.
Also, fix crash while trying to access out of bounds
element on the list.

BUG: 18701336,18713763
Change-Id: I3a5e9cc5c0eedb2792b8f6d8a5d4aa8ee9e1256b
2014-12-12 14:34:29 +00:00
Christopher Tate
eb9d4fdf46 am a91ef1ec: Properly recognize repeating wakeup alarms automerge: 8965a8d
* commit 'a91ef1ec04affdf98eb89f11b67fdbae72acb8dd':
  Properly recognize repeating wakeup alarms
2014-12-12 13:24:06 +00:00
Christopher Tate
a91ef1ec04 Properly recognize repeating wakeup alarms
automerge: 8965a8d

* commit '8965a8da5513cf31a313ecdac3506718c2813932':
  Properly recognize repeating wakeup alarms
2014-12-12 13:14:30 +00:00
Svet Ganov
09687064f4 Fix a NPE in AccessiiblityManagerService.
It is possible that the accessibility windows list is null which
is treated as if there is no window information. The getWindows
method was accessing properties of the windows filed witgout a
null check.

bug:18522998

Change-Id: Ieefe678d3da3d6e8f96c0e4bedac0c55975621fa
2014-12-11 22:59:12 -08:00
Svet Ganov
9fc96c5371 Fix an edge case in computing click location in accessibility mode.
In accessibility mode to click a view we computed a point where to send
down and up touch events. The logic that computes where to send the
events was not clipping the bounds of the child to these of the parent.
As a result we wrongly computed we can send the events in a location
of the child that is outside of its parent, thus the click having no
effect or clicking the wrong thing.

bug:18672945

Change-Id: If9c452e7e5b196f699db33d37dbc6775d5d1622a
2014-12-11 22:33:48 -08:00
Wink Saville
6e04a7b654 Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 2014-12-12 04:22:40 +00:00
Iliyan Malchev
45838de942 fix Uss accounting in getPssPid()
Change-Id: I0d1dc81d127afbf3a7d7b4b86865ccb0e8bd7d4c
Signed-off-by: Iliyan Malchev <malchev@google.com>
2014-12-12 00:20:24 +00:00
Jim Miller
4841a787b3 Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev 2014-12-11 23:33:10 +00:00
Christopher Tate
8965a8da55 Properly recognize repeating wakeup alarms
cherry-pick from lmp-mr1-dev

The code in place was inappropriately treating all recurring alarms
as non-wakeup for purposes of deferral.  Worse, it was overriding the
"this deliverable batch of alarms includes a wakeup alarm" bookkeeping,
so could potentially cause inappropriate deferral of even standalone
wakeup alarms.

Bug 18591317

Change-Id: I2a62ed4badcaeb549c1ac4f086014aa829e45427
(cherry picked from commit 864d42eb96a9127b7d2f10ad11e709c24b4b4304)
2014-12-11 23:22:41 +00:00
John Reck
b9a4d15d09 Merge "Force-flush state sync on texid change" into lmp-mr1-dev 2014-12-11 22:44:19 +00:00
Chris Craik
63c7b24645 Merge "Correct layer size formatting in trace" into lmp-mr1-dev 2014-12-11 22:43:18 +00:00
Chris Craik
c2379070a4 Correct layer size formatting in trace
bug:18722704
Change-Id: Icef9aaa62633b2d86ad250f43d4c8fa5cc0b6842
2014-12-11 14:29:51 -08:00
Craig Mautner
72b047c6c3 Merge "Don't apply animations to windows that are showing" into lmp-mr1-dev 2014-12-11 22:27:54 +00:00
John Reck
9a7fe1a034 Force-flush state sync on texid change
Bug: 18718646

Caused because the Texture object thought the GLES texture
was in a different state than it was as it persists across
EGL/GL contexts. Fix this by force-flushing the default
values when the texid has changed.

Change-Id: I264bac9a2beb08df8e2ba8a85ad15f0dd1fce22a
2014-12-11 14:27:39 -08:00
David Friedman
e84bf9fddc am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs
* commit 'd0d76540ae937d6773793ba053e81ee3667d0ba6':
  Adds link to related video.
2014-12-11 22:21:16 +00:00
Alan Viverette
ff44188309 Merge "Improve time picker accessibility" into lmp-mr1-dev 2014-12-11 22:11:56 +00:00
David Friedman
d0d76540ae am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs
* commit 'c82392df7caa12836d97650c7528f216d3c2b76f':
  Adds link to related video.
2014-12-11 22:10:48 +00:00
David Friedman
c82392df7c am 1ab615b3: Merge "Adds link to related video." into lmp-docs
* commit '1ab615b3e6a7ae820fde4ba067f76dff635f3639':
  Adds link to related video.
2014-12-11 22:03:42 +00:00
David Friedman
1ab615b3e6 Merge "Adds link to related video." into lmp-docs 2014-12-11 21:55:25 +00:00
Wink Saville
a54bf65833 Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Rename isValidSubId to isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
2014-12-11 13:37:50 -08:00
Winson Chung
47d9a58ce1 Merge "Fixing issue with old thumbnails on first launch of app. (Bug 18718114)" into lmp-mr1-dev 2014-12-11 21:20:42 +00:00
Joe Fernandez
817796940b am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
* commit 'c9014b6d59cae3602027a5ea373d436a7e78b71c':
  docs: studio basics haxm updates
2014-12-11 20:55:53 +00:00
Ricardo Cervera
af7070e6f0 am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
* commit '64d97cb2ad6bfd10511067f178ba8a1ccf9ba452':
  docs: Fixes to watch faces docs.
2014-12-11 20:55:49 +00:00
Rich Slogar
0564cee3c7 am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs
* commit 'b490f297101bcf31f56278d21d5f56a5e5998a58':
  docs: studio bundle update
2014-12-11 20:55:45 +00:00
Joe Fernandez
07877955be am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
* commit '5c518b7f01345a414cd260db7762bdb0aa73b55b':
  docs: platform updates for api 21
2014-12-11 20:55:35 +00:00
Joe Fernandez
e3bac3bc8f am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
* commit 'b64545c83a526d17ccbce2d110a06f3789dd4ad8':
  docs: sdk tools 24.0.1 revisions
2014-12-11 20:55:29 +00:00
Andrew Solovay
13e0a6505f am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
* commit 'a97053fd0ba37feb7382fd30498a6a5e93c52a9e':
  docs: Added info about managed profiles to "Android 5.0 Changes"
2014-12-11 20:55:23 +00:00
Jorim Jaggi
0ed01deb2f Limit item count in QS detail
- Introduce a maximum number of items to be shown in QS detail view
  depending on the device configuration.
- For Wifi and Cast, make the panel exactly that height as we would
  show the maximum count of items, in order to prevent that the
  buttons jump around.

Bug: 18665311
Change-Id: I7c0c383a902d295f1b486b8a074e15b990fbe562
2014-12-11 21:51:30 +01:00
Winson Chung
0eae5573b5 Fixing issue with old thumbnails on first launch of app. (Bug 18718114)
Ensure that we always update the thumbnail for the running task, in addition, we
need to be ignoring the running task when doing background preloading since it
will be invalidated anyways.

Change-Id: Ie4f9862dddc29aa71a44e94bbd036c7712487eed
2014-12-11 12:24:41 -08:00