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

171980 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Christoph Studer
250a141cbe Fix MediaStyle docs mentioning 2 max actions in compact view 
Bug: 18729304
Change-Id: Ica6b8ac47d7d38b1de62d64830256f66cbbdb225
 2014-12-12 18:00:09 +00:00
Rich Slogar
50ff944c02 docs: help-adt link updates 
Change-Id: I60fdea090d330a90ebf12b954fa312dbd49cec29
 2014-12-12 09:59:02 -08:00
John Reck
5e999acf53 Merge "Fix style" into lmp-mr1-dev-plus-aosp 2014-12-12 17:55:47 +00:00
John Reck
f088c349df Fix style 
Change-Id: I7227b0eac126bf470ed50249a7809b845872983b
 2014-12-12 09:49:29 -08:00
Jinsuk Kim
48cbf292ba audioservice: Clear calling identity upon calling HdmiControlService 
This makes sure that accessing the HdmiControlService via audio service
should be possible without the system permission.

Bug: 18730526
Change-Id: I05b364d8e38218eb75f3c08972a06bb2d71a982b
 2014-12-13 02:22:19 +09:00
Esteban Talavera
0b7b87a4c8 am 4f40fb47: Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev automerge: c28fa2c 
* commit '4f40fb471265a164a0bdfd060d90375ce706b1dd':
  Take into account other profiles when deciding whether to show ResolverActivity
 2014-12-12 17:17:32 +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
0b12c6cd89 am e741a3e9: am 8934e670: Merge "Limit item count in QS detail" into lmp-mr1-dev 
* commit 'e741a3e9fe1d710f5531d134ae317d2b73c57292':
  Limit item count in QS detail
 2014-12-12 15:46:37 +00:00
Jorim Jaggi
4ec83a764d am 19131b49: am d3cccec0: Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev 
* commit '19131b49f62e6a6b21013be1f9f25b3874728a9b':
  Fix low FPS when entering wifi/BT detail panel
 2014-12-12 15:46:30 +00:00
Jorim Jaggi
8514333283 am 569a113a: am ab60f285: Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev 
* commit '569a113a1957fee2a9ef2131f3334e68b30f30f4':
  Improve transition when going to Wifi/BT detail panel
 2014-12-12 15:46:24 +00: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
John Reck
a7c24b439e Fix build breakage 
Change-Id: Ib3904c4be5b7df0f6d02f92d63f056968243621d
 2014-12-12 07:22:19 -08: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
Olawale Ogunwale
7fc885b0bf am 0e954dcc: am bfb30244: Merge "[ActivityManager] Fix NPE when start activity" 
* commit '0e954dccabc4b3d7247c6469864bf20d059e02b9':
  [ActivityManager] Fix NPE when start activity
 2014-12-12 14:04:24 +00:00
Olawale Ogunwale
0e954dccab am bfb30244: Merge "[ActivityManager] Fix NPE when start activity" 
* commit 'bfb30244fbd3c6ba9eb8308b6bbacc9f78e8b6ef':
  [ActivityManager] Fix NPE when start activity
 2014-12-12 13:57:06 +00:00