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

178425 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
Tim Murray
eae2472985 Enable native tracking for RS contexts to improve GC behavior. 
This should prevent apps from leaking RS contexts as easily.

bug 18579193

Change-Id: I2d943ce4443ce7cb90ebdd3dd37d338eda6df3a2
 2014-12-12 13:30:15 -08:00
Chong Zhang
e079f8ee2d am d4bef185: am bb177db1: Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev 
automerge: d7383a8

* commit 'd7383a8f00b533d00dc48f7aca7ee89d1fc52a36':
  parse bitrate range for video/audio caps
 2014-12-12 21:07:38 +00:00
Svet Ganov
191dd667a0 am 26c88954: am 14e3351a: Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 
automerge: 9b3ab29

* commit '9b3ab29ffa6b3f67b5ab7c06338a2c76db59e176':
  Fix a NPE in AccessiiblityManagerService.
 2014-12-12 21:06:24 +00:00
Svet Ganov
103f52e1b2 am e608644a: am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev 
automerge: 1301446

* commit '1301446c01182b41c3f922121d21ed9b383cc4df':
  Fix an edge case in computing click location in accessibility mode.
 2014-12-12 21:05:01 +00:00
Chong Zhang
d7383a8f00 am d4bef185: am bb177db1: Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev 
* commit 'd4bef185a5057904f0e230ac8a2c5866e590094f':
  parse bitrate range for video/audio caps
 2014-12-12 21:02:36 +00:00
Svet Ganov
9b3ab29ffa am 26c88954: am 14e3351a: Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 
* commit '26c8895465bbc94efb0cc96460e5eabe88382698':
  Fix a NPE in AccessiiblityManagerService.
 2014-12-12 21:02:30 +00:00
Svet Ganov
1301446c01 am e608644a: am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev 
* commit 'e608644a9f0fa54a05379c171814569816145801':
  Fix an edge case in computing click location in accessibility mode.
 2014-12-12 21:02:24 +00:00
Raph Levien
8fdf39753b Merge "Revert "Fix missing ellipsis when just one character is truncated"" 2014-12-12 20:57:09 +00: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
Jeff Tinker
969ac0b2f3 Merge "Revert "Fix Crash when sending null in HashMap to getKeyRequest"" 2014-12-12 19:35:50 +00:00
Jeff Tinker
2888e90701 Revert "Fix Crash when sending null in HashMap to getKeyRequest" 
This reverts commit 5bec0266358f28a91b38f8aefbcb918219aa4ce9.

Change-Id: I78c2f04be03dbdf8da6ea1e1f600c7c12668e433
 2014-12-12 19:35:12 +00:00
Tim Murray
aefbd5f97c Enable native tracking for RS contexts to improve GC behavior. 
This should prevent apps from leaking RS contexts as easily.

bug 18579193

Change-Id: I2d943ce4443ce7cb90ebdd3dd37d338eda6df3a2
 2014-12-12 11:34:48 -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
Raph Levien
4c02e83172 Revert "Fix missing ellipsis when just one character is truncated" 
This reverts commit 93e48e8cf18610bfb3f88ccd29891b2959dd606b.

The existing code in master already worked correctly for the original
problem, and this change just introduced a new problem.

Bug: 18576264
 2014-12-12 11:24:45 -08:00
Todd Kennedy
2ece10db56 Merge "Add NoDisplay test when resuming Activity" 2014-12-12 19:20:43 +00:00
Kenny Guy
7369cc6145 am dcd42f0f: am 4357d4ea: Merge "Don\'t show last used and profile button at same time." into lmp-mr1-dev 
automerge: a63b620

* commit 'a63b620916e8b4f5c36cfb398bf5f0221466c875':
  Don't show last used and profile button at same time.
 2014-12-12 19:03:35 +00:00
Tim Kilbourn
839a8cd647 am d91985cd: am 2636ccc1: Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev 
automerge: d314333

* commit 'd3143333415bb7739ea753531ba0eec754653030':
  Revert "Attempt to fix keyguard missing bug"
 2014-12-12 19:02:17 +00:00
Adam Powell
dd65a916c7 am 746079e2: am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 
automerge: 097e383

* commit '097e3830cd33d1848da3f61a16866f2bbcb3b6d0':
  Have ViewGroups without a parent clip child visible rects to bounds
 2014-12-12 18:57:35 +00:00
Kenny Guy
a63b620916 am dcd42f0f: am 4357d4ea: Merge "Don\'t show last used and profile button at same time." into lmp-mr1-dev 
* commit 'dcd42f0fa16802d39245f3ba98a6226bde9a83e6':
  Don't show last used and profile button at same time.
 2014-12-12 18:57:31 +00:00
Tim Kilbourn
d314333341 am d91985cd: am 2636ccc1: Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev 
* commit 'd91985cd4306ad3d9f422a7392bc8513f6c59e07':
  Revert "Attempt to fix keyguard missing bug"
 2014-12-12 18:57:25 +00:00
Jason Monk
0adc69032d am f8dd5f6a: am a47f968d: Merge "Handle config changes in NetworkController" into lmp-mr1-dev 
automerge: 89b75bd

* commit '89b75bdbf64416cfea39641a85bf6458212a32bf':
  Handle config changes in NetworkController
 2014-12-12 18:56:18 +00:00
Jason Monk
7f8fab6fc3 am 10680627: am a6869700: Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev 
automerge: 19b6ae0

* commit '19b6ae0fe82913a9838a43f60ae330197d4ef978':
  Fix tests after inet changes in NetworkController
 2014-12-12 18:55:04 +00: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
Adam Powell
097e3830cd am 746079e2: am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 
* commit '746079e2ee516d1c7be62154992eda78e9f2ec28':
  Have ViewGroups without a parent clip child visible rects to bounds
 2014-12-12 18:49:37 +00:00
Jason Monk
89b75bdbf6 am f8dd5f6a: am a47f968d: Merge "Handle config changes in NetworkController" into lmp-mr1-dev 
* commit 'f8dd5f6a19791fdb6fbe1fc40863c1e8dcf785e6':
  Handle config changes in NetworkController
 2014-12-12 18:49:32 +00:00
Jason Monk
19b6ae0fe8 am 10680627: am a6869700: Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev 
* commit '106806270c6808c94978ce39e11b7ea73a2cfcf1':
  Fix tests after inet changes in NetworkController
 2014-12-12 18:49:26 +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
Mark Renouf
d3adc51a1b If no display settings are matched, return the first one. DO NOT MERGE 
Language changes will prevent previously saved display settings from
being loaded. This provides a fallback in the event a single entry exists
but does not match the current (localized) name of the Built-In Display.

BUG: 18130296
BUG: 18190800
Change-Id: Ibeff56045fc5713b9f79707dfb92bafc9fadd84f
(cherry picked from commit cf0f740e39f79da3fc8367c61ed473273248e8c1)
 2014-12-12 18:24:58 +00:00
John Reck
c8e771f8ee Merge "Fix style" into lmp-mr1-dev-plus-aosp 
automerge: 5e999ac  -s ours

* commit '5e999acf530be02239349e134f75b43122fc3c4c':
  Fix style
 2014-12-12 18:03:26 +00:00
John Reck
5e999acf53 Merge "Fix style" into lmp-mr1-dev-plus-aosp 2014-12-12 17:55:47 +00:00