drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
161,622 Commits 1 Branch 0 Tags
Commit Graph

161622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
e260a358bf am 7c3212b2: Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev 
* commit '7c3212b2f4f2f4b5ee18f2db925db95ee420d489':
  Propagate DrawableContainer state on mutate, fix ColorDrawable theming
 2014-12-12 22:04:10 +00:00
Alan Viverette
1060d75e3a am 9a1b4c29: Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev 
* commit '9a1b4c29672f7b7a8cfdeedfc2421854439c0af0':
  Move ripple to end state on jump when hardware exit is pending
 2014-12-12 22:04:04 +00:00
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
d4bef185a5 am bb177db1: Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev 
* commit 'bb177db1fe39f0855f79c15195ae837d87479636':
  parse bitrate range for video/audio caps
 2014-12-12 20:54:49 +00:00
Svet Ganov
26c8895465 am 14e3351a: Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 
* commit '14e3351a1eae2b4fc8a12c9a4586f8ea7b87442c':
  Fix a NPE in AccessiiblityManagerService.
 2014-12-12 20:54:43 +00:00
Svet Ganov
e608644a9f am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev 
* commit '7486bc1f5a8156e9b586ebb9c32ced218e668652':
  Fix an edge case in computing click location in accessibility mode.
 2014-12-12 20:54:38 +00: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
dcd42f0fa1 am 4357d4ea: Merge "Don\'t show last used and profile button at same time." into lmp-mr1-dev 
* commit '4357d4eabc375c392190cf2d1dfc3aeba9718ceb':
  Don't show last used and profile button at same time.
 2014-12-12 18:50:15 +00:00
Tim Kilbourn
d91985cd43 am 2636ccc1: Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev 
* commit '2636ccc1857264a76db8ddaee600f06fadad3c36':
  Revert "Attempt to fix keyguard missing bug"
 2014-12-12 18:50:10 +00: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
746079e2ee am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 
* commit '9a0799cf6b7289b8127ffcb22291f5baf21b4035':
  Have ViewGroups without a parent clip child visible rects to bounds
 2014-12-12 18:43:38 +00:00
Jason Monk
f8dd5f6a19 am a47f968d: Merge "Handle config changes in NetworkController" into lmp-mr1-dev 
* commit 'a47f968d7e27560984d846bb62c7b40297c1579c':
  Handle config changes in NetworkController
 2014-12-12 18:43:33 +00:00
Jason Monk
106806270c am a6869700: Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev 
* commit 'a68697005137c2b5c5feb43b8cac078f7b75ec18':
  Fix tests after inet changes in NetworkController
 2014-12-12 18:43:28 +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
Esteban Talavera
4f40fb4712 Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev 
automerge: c28fa2c

* commit 'c28fa2cdd4692faafc520972b71ddbac1feec4d3':
  Take into account other profiles when deciding whether to show ResolverActivity
 2014-12-12 17:08:46 +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
e741a3e9fe am 8934e670: Merge "Limit item count in QS detail" into lmp-mr1-dev 
* commit '8934e67051a7c2598ad94699037701c4c6bf83ca':
  Limit item count in QS detail
 2014-12-12 15:39:27 +00:00
Jorim Jaggi
19131b49f6 am d3cccec0: Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev 
* commit 'd3cccec08361effa5d0f47143ea8c521f49bad79':
  Fix low FPS when entering wifi/BT detail panel
 2014-12-12 15:39:22 +00:00
Jorim Jaggi
569a113a19 am ab60f285: Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev 
* commit 'ab60f2855b0d2a96fe1610f42a83dc761c4c10e6':
  Improve transition when going to Wifi/BT detail panel
 2014-12-12 15:39:16 +00: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
0703c09b9a am eb9d4fdf: am a91ef1ec: Properly recognize repeating wakeup alarms automerge: 8965a8d 
* commit 'eb9d4fdf4623fe23f0f224b5ae2d68cd4c714c7f':
  Properly recognize repeating wakeup alarms
 2014-12-12 13:33:53 +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
6cc44cce0e am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 
* commit '6e04a7b65488656c4cb72d99d285050d56068112':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:37:40 +00: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
72468d2d14 am 45838de9: fix Uss accounting in getPssPid() 
* commit '45838de942b87150fc3b03a8b943841a8647fd81':
  fix Uss accounting in getPssPid()
 2014-12-12 00:34:35 +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
0ca6b7f980 am 4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev 
* commit '4841a787b3380ba045a465e347668729b19f3d79':
  Attempt to fix keyguard missing bug
 2014-12-11 23:41:03 +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
b21a7ad02e am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev 
* commit 'b9a4d15d0942a55c7dc32a471ee40890986e3fab':
  Force-flush state sync on texid change
 2014-12-11 22:49:52 +00:00
Chris Craik
00905a984c am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev 
* commit '63c7b24645d94c92dc6dc32d57c23b5167950c8b':
  Correct layer size formatting in trace
 2014-12-11 22:49:46 +00:00