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

156562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Gunn
3b4b1dcb60 Support disconnecting conference participants from conference. 
- Added "onDisconnectConferenceParticipant" method used to inform a
connection acting as the conference host that one of the participants
should be disconnected.
- Added "VIRTUAL_CALL" PhoneCapability used to indicate that a call cannot
be the active or background call, but only be a child of another call.

Bug: 18228141
Bug: 18176606
Change-Id: I7aec631cc89c0f08e174b24ce3a9cb547b47e36b
 2014-11-04 14:53:37 -08:00
Griff Hazen
9c95015b0c Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 2014-11-04 15:23:21 +00:00
Rob Tsuk
e6c0bda5dd Merge "Make points drawn with default paint visible" into lmp-mr1-dev 2014-11-04 15:20:00 +00:00
Jorim Jaggi
1482b0535e Merge "Update QS tile states after unlocking" into lmp-mr1-dev 2014-11-04 14:31:46 +00:00
Jorim Jaggi
8289301c74 Merge "Always update quick settings header translation in onLayout" into lmp-mr1-dev 2014-11-04 14:27:50 +00:00
Adrian Roos
ad3bc7f878 Fix a keyguard charging status 
Fixes a bug where the keyguard was showing
a charging state even though the device was
not plugged in.

Bug: 18166083
Change-Id: I85a2cda674ffdafb37df70598f4028414a639def
 2014-11-04 14:18:16 +00:00
Adrian Roos
c0f0a74762 Fix low profile bar mode for Material themed apps 
Bug: 17691219
Change-Id: I1b1fb2e831e5d4c41073bb4db0793bf66468c4c4
 2014-11-04 14:16:16 +00:00
John Spurlock
d94017b0c2 Merge "QS: New rotation-lock tile icon, using AVDs." into lmp-mr1-dev 2014-11-04 12:15:10 +00:00
Nicolas Prevot
8da8ab5cf2 Merge "An intent forwarded from a chooser intent will be a chooser too." into lmp-mr1-dev 2014-11-04 11:08:19 +00:00
Nicolas Prevot
ac7774e8c1 Merge "Do not fix uris inside the system." into lmp-mr1-dev 2014-11-04 10:47:25 +00:00
Sander Alewijnse
47ffc60578 Merge "Show message when intent is forwarded across profiles." into lmp-mr1-dev 2014-11-04 10:24:28 +00:00
Narayan Kamath
78a3b7d5af Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev 2014-11-04 09:48:19 +00:00
Mark Renouf
c2a667cc4e am 2750e9ff: am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours 
* commit '2750e9ffe1df82fa9f81b9a8fdd311ceb2deacae':
 2014-11-04 07:22:48 +00:00
Mark Renouf
5070b63f40 am 2faa0c53: am 066f97e7: Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours automerge: ff2e718 -s ours 
* commit '2faa0c532c38cd171b9fa4843cb9ef43621f9f4e':
 2014-11-04 07:22:44 +00:00
kmccormick
0fc93ca3d7 am eac757a8: am b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a automerge: 5298190 
* commit 'eac757a8a26ed4839aca716845fdec1d6ad0842f':
 2014-11-04 07:22:41 +00:00
Mark Renouf
2750e9ffe1 am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours 
* commit '4cc7ae80387df1556cd4f2a0db75cf91057f7609':
 2014-11-04 07:18:31 +00:00
Mark Renouf
2faa0c532c am 066f97e7: Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours automerge: ff2e718 -s ours 
* commit '066f97e79bce5ac6722f44dcb411f9642c40026c':
 2014-11-04 07:18:28 +00:00
kmccormick
eac757a8a2 am b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a automerge: 5298190 
* commit 'b2dfaf0ee621642190598b32b5ead861402b32ec':
 2014-11-04 07:18:24 +00:00
Mark Renouf
4cc7ae8038 If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours 
automerge: 01afc37  -s ours

* commit '01afc37403a244e75fbfa385b197d76e476213e8':
 2014-11-04 07:15:18 +00:00
Mark Renouf
066f97e79b Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours 
automerge: ff2e718  -s ours

* commit 'ff2e71830cafe063e876e5a56db0d33a8a5ba679':
 2014-11-04 07:14:17 +00:00
kmccormick
b2dfaf0ee6 am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a 
automerge: 5298190

* commit '5298190a30288d29cb9107d89b00411def3e469b':
 2014-11-04 07:13:11 +00:00
Dongwon Kang
085329b69a Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev 2014-11-04 02:41:54 +00:00
Eric Laurent
8befd6fd05 Merge "AudioService: fix cross deadlock" into lmp-mr1-dev 2014-11-04 02:00:32 +00:00
David Friedman
6666f34c9b am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 
* commit 'e20e2b9a4863144633bb5ba9d7bedf7d0948c760':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
 2014-11-04 01:34:05 +00:00
Eric Laurent
8fa4d6f585 AudioService: fix cross deadlock 
Fix cross deadlock between VolumeStreamState.class and
VolumeStreamState instance synchronization.

Do not synchronize on VolumeStreamState instance anymore.

Also document the locking order for synchronization objects
related to volume management.

Bug: 18159081.
Change-Id: Ibfe0759215cdac778408b95191cf0fd96bf46312
 2014-11-03 17:30:41 -08:00
Stuart Scott
b600d890a6 Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev 2014-11-04 01:29:00 +00:00
Deepanshu Gupta
fef500107e am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 
* commit '0a2e42d4afe9aa81cc41674102dfc999496db845':
  Fix BridgeContext.get*ResourceValue()
 2014-11-04 01:08:43 +00:00
Deepanshu Gupta
9a6d8ae255 am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a 
* commit '33996b98787c4625f9cd4a8e38e6a88458773276':
  Support framework menus in ActionBar
 2014-11-04 01:08:39 +00:00
Deepanshu Gupta
5ad076396c am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed 
* commit 'cd5f3bab37ef1dc041489f53f565416d295916d9':
  Use the right layout for inflating Action Bar.
 2014-11-04 01:08:23 +00:00
David Friedman
e20e2b9a48 am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 
* commit '5a416a4905ba2f347a9837c1f578327c239f5910':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
 2014-11-04 01:06:41 +00:00
David Friedman
5a416a4905 am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 
* commit 'a827de4e8bcd8d90987387b1acf8d8856104e21c':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
 2014-11-04 00:59:31 +00:00
Baligh Uddin
ecd9daab20 am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours 
* commit 'aa816de4e061ae5a70c759a1c6e55d111c636b6d':
  Import translations. DO NOT MERGE
 2014-11-04 00:56:16 +00:00
Deepanshu Gupta
0a2e42d4af Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev 
automerge: 9b64954

* commit '9b64954cb5b30b03abaae0b24132e1b1876f8af1':
  Fix BridgeContext.get*ResourceValue()
 2014-11-04 00:51:51 +00:00
Nancy Chen
f950301945 Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev 2014-11-04 00:51:29 +00:00
Deepanshu Gupta
33996b9878 Merge "Support framework menus in ActionBar" into lmp-dev 
automerge: c23487a

* commit 'c23487aa18a9882cb9c8c800c7c44ccb93ce60b9':
  Support framework menus in ActionBar
 2014-11-04 00:50:48 +00:00
Deepanshu Gupta
cd5f3bab37 Merge "Use the right layout for inflating Action Bar." into lmp-dev 
automerge: 84a89ed

* commit '84a89ed0f56d4c35cde5a1451a22a6edb59db06a':
  Use the right layout for inflating Action Bar.
 2014-11-04 00:49:43 +00:00
Baligh Uddin
aa816de4e0 Import translations. DO NOT MERGE 
automerge: 07dd521  -s ours

* commit '07dd52188ccafac3cec01122b132666f2bd8e32e':
  Import translations. DO NOT MERGE
 2014-11-04 00:48:44 +00:00
Dianne Hackborn
d1f1ea76e8 Merge "Few more small meminfo improvements." into lmp-mr1-dev 2014-11-04 00:41:54 +00:00
Rob Tsuk
b7c26562d0 Make points drawn with default paint visible 
When no stroke width is set, use 0.5 instead of 0.25 to make
sure the resulting rectangle spans at least one pixel.

Bug: 15455111
Change-Id: Id0a4b6d014c542ffc98b13a032f88ae0ce69b3a1
 2014-11-04 00:31:45 +00:00
Bryce Lee
99a6c1cbe8 Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev 
automerge: abf33e4

* commit 'abf33e48baff1ffc14562a499ec3eabc09a5dbb5':
  [Theater Mode] Add framework support for screen double tapping out of theater mode.
 2014-11-04 00:23:50 +00:00
Dirk Dougherty
73e558664d am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. 
automerge: 45729a1

* commit '45729a10495ed828749a706066b69051512bf4f0':
  Doc change: Tv doc updates for publishing in Google Play.
 2014-11-04 00:21:53 +00:00
John Spurlock
2d695813b4 QS: New rotation-lock tile icon, using AVDs. 
Also:
 - Better icon change detection, unify tile.icon vs tile.iconId.
 - Fix regression in touch feedback by fixing a11y string calculation.

Bug: 17426910
Change-Id: I14772f4e9b3be127bc39106ae9146ed46488fa48
 2014-11-03 19:08:39 -05:00
David Friedman
a827de4e8b Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 2014-11-04 00:05:52 +00:00
Adam Lesinski
f7ffcaa7a4 Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev 2014-11-03 23:38:56 +00:00
Adam Lesinski
668f0a356c Merge "Fix issues that will be present in C++11" into lmp-mr1-dev 2014-11-03 23:38:43 +00:00
Deepanshu Gupta
9b64954cb5 Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev 2014-11-03 23:15:03 +00:00
Deepanshu Gupta
c23487aa18 Merge "Support framework menus in ActionBar" into lmp-dev 2014-11-03 23:14:46 +00:00
Deepanshu Gupta
84a89ed0f5 Merge "Use the right layout for inflating Action Bar." into lmp-dev 2014-11-03 23:13:15 +00:00
Jorim Jaggi
3c7efdc005 Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev 2014-11-03 22:38:34 +00:00
Bryce Lee
abf33e48ba Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev 2014-11-03 21:59:27 +00:00