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

176530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
a75b0ad384 resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp 
Change-Id: Id7df835f0bd3d5d276b162635ddfb7fe0918dfed
 2014-12-04 13:41:04 -08:00
Winson Chung
e1a96f7fe2 am 1c88fc00: am 4eb896ef: am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev 
* commit '1c88fc009fb3f7a3b5f085abb6a40cf4d845d662':
  Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
  Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)
 2014-12-04 21:24:02 +00:00
Jim Miller
1568aa6ccd am d205d407: am f2b934b4: am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev 
* commit 'd205d407b44b3218579401be4960eda79ce32f67':
  Stop keyguard from spamming the log
 2014-12-04 21:23:58 +00:00
xinhe
a766b75103 am c377c360: am 9a4472bf: am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev 
* commit 'c377c360e971b07ccb3c2937f23168c88f426640':
  Unable to unlock SIM with a PIN/PUK
 2014-12-04 21:23:53 +00:00
Wink Saville
6abe46c472 am 58a3561f: am 0304c529: am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev 
* commit '58a3561f74204a3c4cf913169ebc990ca9c0db28':
  Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
 2014-12-04 21:23:48 +00:00
Christopher Tate
1d94907c77 am dff55807: am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev 
* commit 'dff55807117f515ff3f8878ed268a20c1fb9e4a5':
  Adjust wallpaper-restore acceptance criteria
 2014-12-04 21:23:43 +00:00
Winson Chung
1c88fc009f am 4eb896ef: am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev 
* commit '4eb896ef011a8ecfe32f3b4300a42e0cc8b162a8':
  Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
  Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)
 2014-12-04 21:18:01 +00:00
Jim Miller
d205d407b4 am f2b934b4: am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev 
* commit 'f2b934b42be772d457b3f6e16c95aad1056c502e':
  Stop keyguard from spamming the log
 2014-12-04 21:17:55 +00:00
xinhe
c377c360e9 am 9a4472bf: am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev 
* commit '9a4472bf45044082f4fa6d906530f3640761676a':
  Unable to unlock SIM with a PIN/PUK
 2014-12-04 21:17:50 +00:00
Wink Saville
58a3561f74 am 0304c529: am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev 
* commit '0304c529b6a166547aaf104a46bc876780ba7416':
  Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
 2014-12-04 21:17:43 +00:00
Christopher Tate
dff5580711 am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev 
* commit 'e808d2df764ca19c94bdaf5f9b5cd9a311046d98':
  Adjust wallpaper-restore acceptance criteria
 2014-12-04 21:17:37 +00:00
Geoff Mendal
afda110a48 am 348b03bf: (-s ours) am 2dadff70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '348b03bff44482a3cd004f0aec9b66b721a3b62e':
  Import translations. DO NOT MERGE
 2014-12-04 20:45:16 +00:00
Geoff Mendal
41398aa48a am a79eea5c: (-s ours) am 3b05d2bd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'a79eea5c9722d1ee23c7b220f4c29815a1c6c0bd':
  Import translations. DO NOT MERGE
 2014-12-04 20:45:12 +00:00
Geoff Mendal
a0e6d49c3b am a786837b: (-s ours) am 2253b8c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'a786837be8181cfb251e695a8df8a0409dd1b4aa':
  Import translations. DO NOT MERGE
 2014-12-04 20:45:08 +00:00
Robert Greenwalt
48af2cf8cd am 83c0b096: am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 
* commit '83c0b096b775e7b39f89c2da1c9a8193555c0178':
  Separate voice/data roaming state and type
 2014-12-04 20:45:03 +00:00
Eino-Ville Talvala
1aef3b1eb4 am 431b65d1: am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 
* commit '431b65d11fa79ee1acf55e1de0d074fe9913a51d':
  Revert "Camera: Add new capability flags as system features as well"
 2014-12-04 20:44:58 +00:00
Dianne Hackborn
c22369be46 am 3c8a439b: am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev 
* commit '3c8a439be33932f35b723271cec5cd4210c19221':
  Fix issue #17948584: Application crash and phone restart when app...
 2014-12-04 20:44:53 +00:00
Alan Viverette
1a1b89485d am 979ed514: am 3977137d: am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev 
* commit '979ed5140baf4e89d0aaaec39c0c2b8033c401bf':
  Slightly more button elevation to match Material spec
 2014-12-04 20:44:49 +00:00
Dianne Hackborn
722dee3e6c am 11bee890: am 4c4e4686: am 281f36f5: Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev 
* commit '11bee890a24b05d099be87b02ea667441e573898':
  Fix issue #18607384: Run fstrim after every system update
 2014-12-04 20:44:44 +00:00
Yin-Chia Yeh
e01ae15296 am e168dd28: am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev 
* commit 'e168dd28f8fedc921e8b08bdce71c20ab60966ee':
  Camera: update antibanding spec
 2014-12-04 20:44:39 +00:00
Geoff Mendal
348b03bff4 am 2dadff70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '2dadff70d46dd13ba2e51e8ecd5601c6f2f602d3':
  Import translations. DO NOT MERGE
 2014-12-04 20:24:28 +00:00
Geoff Mendal
a79eea5c97 am 3b05d2bd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '3b05d2bd6fe7a674537dc87aade5673746c96780':
  Import translations. DO NOT MERGE
 2014-12-04 20:24:11 +00:00
Geoff Mendal
a786837be8 am 2253b8c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '2253b8c576182256139a9b18195aef451f7e134a':
  Import translations. DO NOT MERGE
 2014-12-04 20:24:01 +00:00
Robert Greenwalt
83c0b096b7 am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 
* commit '98f81182fb61953e0712bd788941710b6ad842c2':
  Separate voice/data roaming state and type
 2014-12-04 20:23:55 +00:00
Eino-Ville Talvala
431b65d11f am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 
* commit '6e21817b8ef160fae5e7046745cb11ceab06b2d7':
  Revert "Camera: Add new capability flags as system features as well"
 2014-12-04 20:23:45 +00:00
Dianne Hackborn
3c8a439be3 am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev 
* commit 'e6333e5188fd4becf7dea286c768f55c3b89d63e':
  Fix issue #17948584: Application crash and phone restart when app...
 2014-12-04 20:23:25 +00:00
Alan Viverette
979ed5140b am 3977137d: am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev 
* commit '3977137d865637297b4723ec8784d5b97fc316dc':
  Slightly more button elevation to match Material spec
 2014-12-04 20:23:18 +00:00
Dianne Hackborn
11bee890a2 am 4c4e4686: am 281f36f5: Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev 
* commit '4c4e4686d5de3f22cf4d832c63716d9054b9ad54':
  Fix issue #18607384: Run fstrim after every system update
 2014-12-04 20:23:11 +00:00
Yin-Chia Yeh
e168dd28f8 am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev 
* commit '871571ae0c4d8f334265b99e274892346756d51b':
  Camera: update antibanding spec
 2014-12-04 20:23:00 +00:00
Craig Mautner
0dd02334f4 am b3c60bcb: am 6465980c: am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed" 
* commit 'b3c60bcb51821116a301a30566b89878ab77d3d0':
  Prevent ANR when broadcast receiver is killed
 2014-12-04 19:59:15 +00:00
Chih-hung Hsieh
f597aae090 am e762f986: am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 
* commit 'e762f986c47caf90a4c5e2887ab41818a1c4599e':
  Add -Wno-unused-parameter to LOCAL_CFLAGS
 2014-12-04 19:59:09 +00:00
Craig Mautner
b3c60bcb51 am 6465980c: am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed" 
* commit '6465980cd88ea4ed0057bf23867fd3ab8e146dfa':
  Prevent ANR when broadcast receiver is killed
 2014-12-04 19:51:23 +00:00
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
Justin Harrison
fdb33a0826 am 21af21ca: Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev 
* commit '21af21ca07cd07d7164bf7b7d70513c193785247':
  Revert "Improve fling physics for recents"
 2014-12-04 17:44:42 +00:00
Justin Harrison
21af21ca07 Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev 2014-12-04 17:37:55 +00:00
Justin Harrison
3f7dac5a1c Revert "Improve fling physics for recents" 
This reverts commit 00d947bda0b9a2ea133dfd7b0e445245a0e2c23c.

Change-Id: I3d6696227a381d232baed8fdbcbe34d3c4976ebe
 2014-12-04 17:37:24 +00:00
Svet Ganov
3ce873349c Merge "Update accessibility event constants in the service registration XML." 2014-12-04 17:24:21 +00:00
Adam Lesinski
63377406f7 am 8e5362f2: am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays" 
* commit '8e5362f20e2bc41b1dcf130a613b7e0b3cd1db58':
  RRO: prevent duplicate system overlays
 2014-12-04 16:17:12 +00:00
Michael Wright
8e8a24d793 am c0707c00: am 83de9a42: am da79c87f: Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev 
* commit 'c0707c007d8322338e9f46f5ccb04b5582e75845':
  Add keylayout for Logitech RedHawk Gamepad DO NO MERGE
 2014-12-04 16:16:39 +00:00
Michael Wright
976cf9d838 am fc09908b: (-s ours) am 70d8133c: am 22458842: Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev 
* commit 'fc09908b8a583b4aa1b0a059e305dc1356ce6aba':
  Added Razer USA, Ltd serval DO NOT MERGE
 2014-12-04 16:16:34 +00:00
Jorim Jaggi
9f44ea8fbc am 54daab10: Merge "Improve fling physics for recents" into lmp-mr1-dev 
* commit '54daab1009e7be849fa1dcbf4ee3f9d0ba40d732':
  Improve fling physics for recents
 2014-12-04 15:27:05 +00:00
Jorim Jaggi
d3cf181d57 am 47faf69c: Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev 
* commit '47faf69cfdca06cb82176a4b617814fd3e1aac18':
  Fix rounded corners in bottom QS panel.
 2014-12-04 15:26:59 +00:00
Jorim Jaggi
54daab1009 Merge "Improve fling physics for recents" into lmp-mr1-dev 2014-12-04 15:18:18 +00:00
Jorim Jaggi
47faf69cfd Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev 2014-12-04 15:17:03 +00:00
Derek Sollenberger
c1a2f38ce0 am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev 
* commit '4d9da135caf8d4f38bb728343c1aabbf45f81d5b':
  Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
 2014-12-04 15:17:01 +00:00
Christoph Studer
a6ecb61ee7 am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev 
* commit 'c9660bdf289ba7ee20854af9de4133df5fb42d92':
  RankingHelper: Remove STOPSHIP
 2014-12-04 15:16:55 +00:00
Deepanshu Gupta
43d0e67573 am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev 
* commit '7e168ad04a4553c23bca1e9bd427ba6088493908':
  Ensure that RandomAccessFile is not leaked.
 2014-12-04 15:16:49 +00:00
Deepanshu Gupta
52a60ff636 am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev 
* commit '302a7cc13a02863ef2e9d9102df761e92150de65':
  Fix AnalogClock rendering
 2014-12-04 15:16:44 +00:00
Deepanshu Gupta
c16d1448bb am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev 
* commit 'b2ded18a84b3b23a76b462644dcd24b3c33f5234':
  Fix typos in previous bugfixes.
 2014-12-04 15:16:37 +00:00
Jinsuk Kim
92a4627250 am f1647395: Merge "CEC: Generate hotplug events upon adding listener" into lmp-mr1-dev 
* commit 'f16473951052b1f9eb06753c43b93255452c8838':
  CEC: Generate hotplug events upon adding listener
 2014-12-04 15:16:32 +00:00