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

170179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chih-hung Hsieh
e762f986c4 am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 
* commit '0ebbfaedd7fd843229d289baa69fffd33eab2985':
  Add -Wno-unused-parameter to LOCAL_CFLAGS
 2014-12-04 19:51:15 +00:00
Chih-hung Hsieh
0ebbfaedd7 am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 
* commit 'ccce6e0f9f6f4da95d61fb2cfb1253ac662fba30':
  Add -Wno-unused-parameter to LOCAL_CFLAGS
 2014-12-04 15:16:04 +00:00
Adam Lesinski
8e5362f20e am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays" 
* commit '503071ae41374a66f61e53e05a91243473db83b9':
  RRO: prevent duplicate system overlays
 2014-12-04 09:21:45 +00:00
Chih-hung Hsieh
ccce6e0f9f Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 2014-12-04 01:04:09 +00:00
Michael Wright
c0707c007d am 83de9a42: am da79c87f: Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev 
* commit '83de9a426ab3d8f1e1473fd438ab9cde3d65f283':
  Add keylayout for Logitech RedHawk Gamepad DO NO MERGE
 2014-12-03 20:54:16 +00:00
Michael Wright
fc09908b8a am 70d8133c: am 22458842: Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev 
* commit '70d8133cc3db2742980ec4157322c08eaebf6e6b':
  Added Razer USA, Ltd serval DO NOT MERGE
 2014-12-03 20:54:10 +00:00
John Spurlock
c9b862cfc4 am 06eaac44: am cdf7f984: Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev 
* commit '06eaac4463015d9ff93c694603bb9398b065f502':
  Doze: Fast path for pickup pulses.
 2014-12-03 20:44:30 +00:00
Sreeram Ramachandran
3a8fbb8072 am 95e4474c: am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev 
* commit '95e4474c7069bdd85178aab96182bc0088b43a70':
  Fix docs per API review.
 2014-12-03 20:43:50 +00:00
Etan Cohen
a2ab707c87 am 89b55fc5: am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place) 
* commit '89b55fc52d0ad20013353af32e7d4823d95db575':
  Add a global override for VoLTE calls (which leaves user setting in place)
 2014-12-03 20:43:46 +00:00
Craig Mautner
62a7022f7d am 56f10c26: am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev 
* commit '56f10c2685dd6f69c57744896e9bc7db129da447':
  Handle keyguard dismiss flags correctly
 2014-12-03 20:43:40 +00:00
Trevor Johns
8e78f0a712 am 9aa9e46b: am 5244ab68: am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs 
* commit '9aa9e46b4e02e5f39752d93a3aa0645ede056fa9':
  Docs: Add "admin" to samples categories
 2014-12-03 20:43:03 +00:00
Trevor Johns
d0dca6f322 am f560f334: am e218d0d3: am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs 
* commit 'f560f334b0784ebeea86997d391e1245590d131d':
  Docs: Remove NavigationDrawer sample from What's New page
 2014-12-03 20:42:58 +00:00
Trevor Johns
8db20dc19d am 2047e6a0: am 4360c12b: am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs 
* commit '2047e6a0d1f40e2187f1d7b9f8c7d2d5e97ec8cf':
  Docs: Remove GitHub links from docs/samples/new/index.html
 2014-12-03 20:42:51 +00:00
Winson Chung
fee5e3d32a am 50511096: am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 
* commit '50511096998ffff4fa5c001e46b056201fb0b892':
  Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
 2014-12-03 20:42:45 +00:00
Evan Charlton
c0362c5da3 am 10dff0a7: am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev 
* commit '10dff0a710b46cc1ddf554e6c83941a201aa6150':
  Re-add Connection.getCallCapabilities
 2014-12-03 20:42:39 +00:00
Nancy Chen
5125dc1cbc am a1163d57: am 6963ff0e: Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev 
* commit 'a1163d575b41580352e39dde455ef2f1f7fbcbf4':
  Change a semi-colon to a colon in AudioState logging.
 2014-12-03 20:42:34 +00:00
Paul Jensen
3249d63704 am 3107a9ad: am f805ba7d: Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev 
* commit '3107a9ad244004938ff7d5d731b3973113344da4':
  Retry failed network validation every 10 minutes.
 2014-12-03 20:42:28 +00:00
Adam Lesinski
455550d586 am 72a6aeac: am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev 
* commit '72a6aeaca0712d9b72b9f773e2b72bb45ddd3cb8':
  AAPT: Add pathMotion custom classes to Proguard Keep set
 2014-12-03 20:42:22 +00:00
Dianne Hackborn
b46e9da64c am bedd1744: am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev 
* commit 'bedd1744b2afa0ede3ab7ac38a0e4a2111ed53bf':
  Work on issue #18572506: AppOps in-memory state is invalid after...
 2014-12-03 20:42:17 +00:00
Michael Wright
83de9a426a am da79c87f: Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev 
* commit 'da79c87f2e4502b02c29e9081dcdf52a742d29e5':
  Add keylayout for Logitech RedHawk Gamepad DO NO MERGE
 2014-12-03 20:41:52 +00:00
Michael Wright
70d8133cc3 am 22458842: Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev 
* commit '22458842cf0f86044856e6bc3c3a5fb2eda00862':
  Added Razer USA, Ltd serval DO NOT MERGE
 2014-12-03 20:41:47 +00:00
Adrian Roos
bf6f7960f4 am b67d8ef6: am f235edf2: Merge "Refresh user list a little more eagerly" into lmp-mr1-dev 
* commit 'b67d8ef66540bfb72db44721f353c661d1f88144':
  Refresh user list a little more eagerly
 2014-12-03 20:41:45 +00:00
Svetoslav
dc026bafa9 am 5303451e: am 4667d247: Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev 
* commit '5303451efc8553f83d921185c6aac30a178d632f':
  Inconsistent media sizes for es-US locale.
 2014-12-03 20:41:39 +00:00
Jason Monk
5a938481f3 am d6b001f1: am 8d72046b: Merge "Don\'t show no sim icon on wifi devices" into lmp-mr1-dev 
* commit 'd6b001f154d7c1038edba4e7729b2aeb0124d359':
  Don't show no sim icon on wifi devices
 2014-12-03 20:41:33 +00:00
Daniel Sandler
23d7930cfd am b0607472: am 195c4388: Fixing bugs in the LLand. 
* commit 'b06074723fbed960749bab2b6e6b7e013f012e6a':
  Fixing bugs in the LLand.
 2014-12-03 20:41:27 +00:00
Jinsuk Kim
dfa931b400 am 5f23693b: am 3f6755f5: CEC: Check command type for power status monitor action 
* commit '5f23693b5cad0647a6bd95ba50dc87bb9023e864':
  CEC: Check command type for power status monitor action
 2014-12-03 20:41:21 +00:00
Craig Mautner
a34a7d21a9 am 418eecb6: am dad92f36: Merge "Don\'t process windows belonging to unshown users" into lmp-mr1-dev 
* commit '418eecb6f870e4fc4dbb5715f61afd51827fe8a5':
  Don't process windows belonging to unshown users
 2014-12-03 20:41:15 +00:00
Lorenzo Colitti
45cd4df6a0 am d99cd44f: am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev 
* commit 'd99cd44f317a0e1b188a0033ebe4948f13c32491':
  Make StatusBar display all default networks.
 2014-12-03 20:41:10 +00:00
Filip Gruszczynski
35a2d36085 am 0821a566: am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev 
* commit '0821a56668aa0289b137eb510f35aed54784dc3b':
  Add overscan insets to surface frame dimensions in WallpaperService.
 2014-12-03 20:40:56 +00:00
Dongwon Kang
c0ab1086f0 am 25a05188: am b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev 
* commit '25a051880666022163b9a641737f26adc31e5477':
  TIF: call tune() in HardwareSession
 2014-12-03 20:40:45 +00:00
Michael Wright
da79c87f2e Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev 2014-12-03 20:34:34 +00:00
Michael Wright
22458842cf Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev 2014-12-03 20:34:21 +00:00
Sanket Padawe
3a64032fe6 am 8e1b08ac: am b13c12f5: Merge "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev 
* commit '8e1b08ac261324f85f53ce2991df83ef53dfd2bf':
  Call entitlement on clicking tethering tile in quick settings.
 2014-12-03 20:25:24 +00:00
Jason Sams
5f9e59b229 am e4c82550: (-s ours) am d6e9e61c: Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev 
* commit 'e4c825507dfcb2559ecf6401d06fa5a7ecc8e721':
  Fix bug in passing of context flags and version.
 2014-12-03 20:25:19 +00:00
John Spurlock
06eaac4463 am cdf7f984: Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev 
* commit 'cdf7f984870344de1b1237e2a7749a3e32b2b688':
  Doze: Fast path for pickup pulses.
 2014-12-03 19:56:12 +00:00
Sreeram Ramachandran
95e4474c70 am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev 
* commit '932c33214729fe2d2b09f82ef60a72871f182654':
  Fix docs per API review.
 2014-12-03 19:50:19 +00:00
Etan Cohen
89b55fc52d am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place) 
* commit '7ab0ad1ffe858dbf82d5c3b540c02488f31c51f0':
  Add a global override for VoLTE calls (which leaves user setting in place)
 2014-12-03 19:50:13 +00:00
Craig Mautner
56f10c2685 am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev 
* commit 'a9355bd1c5d80777172103bd4e694972fedf8e54':
  Handle keyguard dismiss flags correctly
 2014-12-03 19:49:46 +00:00
John Spurlock
cdf7f98487 Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev 2014-12-03 19:49:26 +00:00
Sreeram Ramachandran
932c332147 Merge "Fix docs per API review." into lmp-mr1-dev 2014-12-03 19:15:38 +00:00
Etan Cohen
7ab0ad1ffe Add a global override for VoLTE calls (which leaves user setting in place) 
Bug: 18446228
Change-Id: I7d07f066e5933c2aeecf9222bb54da69975099bc
 2014-12-03 18:56:45 +00:00
Sreeram Ramachandran
9e956e9b9a Fix docs per API review. 
Bug: 18573918
Change-Id: I639fe2ce40cdef57d904b9ad1ebb28db7d057144
 2014-12-03 10:53:35 -08:00
John Spurlock
f5d250deec Doze: Fast path for pickup pulses. 
Decrease the pulse duration when pulsing for pickup.
Add an option to skip the proximity check entirely, but don't
turn it on yet.

Bug: 18373928
Change-Id: I54f8dee004229193a18d488759bf797a16470cab
 2014-12-03 13:48:28 -05:00
Craig Mautner
a9355bd1c5 Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev 2014-12-03 18:41:30 +00:00
Trevor Johns
9aa9e46b4e am 5244ab68: am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs 
* commit '5244ab68e4aae1dd95f87e690f7df83c0e630cef':
  Docs: Add "admin" to samples categories
 2014-12-03 18:36:30 +00:00
Trevor Johns
f560f334b0 am e218d0d3: am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs 
* commit 'e218d0d3b5feb21e96ccbae62a67dfe5cb3d2ce5':
  Docs: Remove NavigationDrawer sample from What's New page
 2014-12-03 18:36:25 +00:00
Trevor Johns
2047e6a0d1 am 4360c12b: am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs 
* commit '4360c12bcbe1fa36b7aacdda70eb6ac2cf48454a':
  Docs: Remove GitHub links from docs/samples/new/index.html
 2014-12-03 18:36:20 +00:00
Winson Chung
5051109699 am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 
* commit 'de9848c641e1b1e0f73e5655c3f8c0c3b34a011c':
  Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
 2014-12-03 18:36:15 +00:00
Evan Charlton
10dff0a710 am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev 
* commit '5ce118d1f4bdaaa1e85626d06d473b2dece949c3':
  Re-add Connection.getCallCapabilities
 2014-12-03 18:36:10 +00:00
Nancy Chen
a1163d575b am 6963ff0e: Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev 
* commit '6963ff0e059977c901f4a961a24e7ffd3536af23':
  Change a semi-colon to a colon in AudioState logging.
 2014-12-03 18:36:02 +00:00