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

161400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
65d720b3fb am 6245bd9e: am eef8d3eb: am df959707: am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 
* commit '6245bd9e19639ec3f64cae4268b204f8bfa0c6c9':
  Revert the configKey generation algorithm to what it was in K.
 2014-10-02 13:40:24 +00:00
Deepanshu Gupta
70e1eb86fd am 3fef7abf: am 70d72265: am 9d474197: am 107e1fb4: am ae74287e: (-s ours) am fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev 
* commit '3fef7abf16c5df9a6a6a24fe0ddbe7c96d69ae2f':
  Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
 2014-10-02 13:40:02 +00:00
Deepanshu Gupta
be334a3a09 am 2ed63e0d: am 4ae7dbba: am 2fca3e94: am d3adf40e: am ae4cb17a: (-s ours) am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev 
* commit '2ed63e0dcc34c16af6fa24eab7eb6ba448d9400f':
  Resource resolution bug fix. [DO NOT MERGE]
 2014-10-02 13:39:59 +00:00
Deepanshu Gupta
a0b882c940 am 6351c202: am 3a863401: am 81f03898: am ba526a28: am d00d2ff2: (-s ours) am 57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev 
* commit '6351c2023b6f85f3d397ef79456b109fab37f850':
  Fix Tests after cherry picks. [DO NOT MERGE]
 2014-10-02 13:39:55 +00:00
Deepanshu Gupta
bfde0261ca am 5a939b42: am 16df192a: am 4d19dc0e: am a9787de3: am 735229c5: (-s ours) am 52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev 
* commit '5a939b4255dc157221e172417ce13908a495795e':
  Update intelliJ copyright profile [DO NOT MERGE]
 2014-10-02 13:39:50 +00:00
Deepanshu Gupta
f309f6f5a8 am 8d8b6271: am 8f1258bd: am 6ed3fadb: am 75f2f993: am 925abb6d: (-s ours) am 891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev 
* commit '8d8b6271b0ff43eb5ed84ae3a56876f4146c7c14':
  Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
 2014-10-02 13:39:47 +00:00
Deepanshu Gupta
a5d45f6d21 am ca8094ba: am 97a4c96f: am 7349e63d: am 473a2708: am a21ca344: (-s ours) am a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev 
* commit 'ca8094baecf0cc93853b0ee595a59534c4c566b0':
  Add layoutlib tests to DIST_DIR [DO NOT MERGE]
 2014-10-02 13:39:43 +00:00
Deepanshu Gupta
86ebb9e9f6 am 1c50eec8: am 6b97cb78: am fcca8151: am d24b45c8: am 93bf0696: (-s ours) am 541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev 
* commit '1c50eec808eddd214ff0a6fde724917873fcc339':
  Build layoutlib_create tests. [DO NOT MERGE]
 2014-10-02 13:39:39 +00:00
Deepanshu Gupta
fa4d2d9fae am 6c398a23: am 33832bfb: am 7d573818: am 42099d45: am ddbd9bec: (-s ours) am 2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev 
* commit '6c398a23e27ca179be1bb12d93aa905b4f212923':
  Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
 2014-10-02 13:39:35 +00:00
Deepanshu Gupta
52e6a4deec am 96c44cc0: am 8308e03f: am dd5d1fdd: am b183c181: am 1cbf17f7: (-s ours) am ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev 
* commit '96c44cc075ea3f04e799d6959e2b33824772576f':
  Get filename from File faster [DO NOT MERGE]
 2014-10-02 13:39:32 +00:00
Deepanshu Gupta
8488d3f71f am e280a66c: am 0b2d1197: am 71412900: am 9eb0cd12: am d332ff3e: (-s ours) am bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev 
* commit 'e280a66cd68e037fcd2dcd8a5f0f638ca5f50602':
  Add testing framework to LayoutLib. [DO NOT MERGE]
 2014-10-02 13:39:28 +00:00
Deepanshu Gupta
69bc46e945 am 11bfab9e: am fed5977c: am 19fe9f1b: am 82eecaf8: am c2ffb54f: (-s ours) am 60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev 
* commit '11bfab9e3486e4cf522f669556ec5cd28cb25ce0':
  Add tests to the layoutlib eclipse project. [DO NOT MERGE]
 2014-10-02 13:39:23 +00:00
Justin Koh
cb9cd6a20f am 3fc547e6: am 4fb046f1: am 90eca96f: am f7aac12e: am bf6f081c: (-s ours) am 37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev 
* commit '3fc547e6334740135ae24a816eeafcad636b7890':
  DO NOT MERGE Hide the volume panel for watches for now
 2014-10-02 13:39:19 +00:00
Andreas Gampe
3d49b28390 am 93870605: am d5a90829: am 1e48a1ee: am c152c7aa: Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev 
* commit '9387060528b22b455974eb060d573b37b81e6e3d':
  Revert "Frameworks/base: Update to preloaded-classes"
 2014-10-02 13:39:15 +00:00
Sreeram Ramachandran
44774ad079 am 9e987f1d: am 4f4b81bd: am c04e922f: am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit '9e987f1d76e18bca72583ab5f4ff65ae4e8c381e':
  Send app permissions to netd.
 2014-10-02 13:39:05 +00:00
Deepanshu Gupta
e4ef95bfe0 am 2e67a882: am 92c40bbd: am 8989290b: am 7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-dev 
* commit '2e67a88214fa93a325a84a4b8e6ae122544c8edb':
  Always resolve enum when resolving resources.
 2014-10-02 13:38:54 +00:00
Benson Huang
cea4f7acb4 am 19766ff9: am 398de894: am 981258e5: [FM] Add FM permission to support FM radio app 
* commit '19766ff9381a37a55727edbeafa6613777d9bdb2':
  [FM] Add FM permission to support FM radio app
 2014-10-02 13:38:43 +00:00
Alan Viverette
f5c178bdd3 am 6cb68b46: am 8f438e4c: Merge "Remove Holo fast scroll preview from Material overlay themes" into lmp-mr1-dev 
* commit '6cb68b4637db7cf59e0278d532a1160ff6adc71e':
  Remove Holo fast scroll preview from Material overlay themes
 2014-10-02 13:38:32 +00:00
Dianne Hackborn
7cf6cac507 am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '03e173edce42a5ae0de8a7718330d83664a84a9e':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 13:38:23 +00:00
Erik Pasternak
c7cbbe8e82 am d68362b9: am c6646b0c: am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit 'd68362b962be2237418a1a10ebec7a2f75b9b267':
  Implement auto-sleep functionality.
 2014-10-02 13:38:16 +00:00
Jeff Sharkey
2f370e289f am 67c96fd7: am b6ea4676: am 3a14bc84: am f178591f: Merge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev 
* commit '67c96fd710e504f6c9763ee02a60bb94b217b553':
  Give audio GID to MANAGE_VOICE_KEYPHRASES apps.
 2014-10-02 13:38:10 +00:00
Alan Viverette
52bab6e722 am 3c062db9: am a5ecdbb1: Merge "Manage pressed state during drag-to-open" into lmp-mr1-dev 
* commit '3c062db99406f083f8c3529bcc56d042b9cb06b0':
  Manage pressed state during drag-to-open
 2014-10-02 13:37:56 +00:00
Dianne Hackborn
0c709a0c0c am f96d125c: am 84402777: am 9a4afb3f: am c3e7f87b: Merge "Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build." into lmp-dev 
* commit 'f96d125c569e181cb22583f295146250d58ec196':
  Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build.
 2014-10-02 13:37:51 +00:00
ztenghui
79ef48239d am 3fb45865: am 5f243860: am 9ad17521: am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev 
* commit '3fb458653e50e350e9e377d071cb79573d531748':
  + correcting shadow visual appearance (b/17610926)
 2014-10-02 13:37:47 +00:00
Svetoslav
893a15d1e4 am 0671790c: am c088ecc3: am 304a3528: am d35b072d: Merge "Fix accessiblity introspection from the shell user regression." into lmp-dev 
* commit '0671790c2895865ff0cc7780027427d1a9b95667':
  Fix accessiblity introspection from the shell user regression.
 2014-10-02 13:37:37 +00:00
Dianne Hackborn
ef2bc5ccd4 am def99c9d: am 51bd2041: am bfa6190f: am 144508d5: Merge "Revert white space changes." into lmp-dev 
* commit 'def99c9da6c47628ebe2b731387d98a79e63acdf':
  Revert white space changes.
 2014-10-02 13:37:33 +00:00
Neil Fuller
c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
 2014-10-02 14:32:37 +01:00
Stephen Hines
f08384c763 am 25a8e43b: am 7d92ae6d: am 5b3be618: am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev 
* commit '25a8e43b13e719ff97edd174f8b1ed175e6f91b0':
  include direct.h for _mkdir
 2014-10-02 12:41:58 +00:00
Winson Chung
594d2a5690 am 7f54b3a9: am 6b59887e: am f7d4eb52: am 7f76e505: Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev 
* commit '7f54b3a91430a73241b9ba34bfadf74997c495db':
  Fixing invalid check to get component enabled state. (Bug 17679693)
 2014-10-02 12:41:53 +00:00
Hui Shu
0fdb165193 am 724fe35e: am 5f961157: am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '724fe35eac0afd885f3a20ebf846f0429303c157':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-02 12:40:59 +00:00
wsmlby
d8e94409e0 am 49049aef: am 2e7aa675: am 489502cf: am 7e1ae00c: Merge "Throw error when no intent can be found" into lmp-dev 
* commit '49049aef19f001c6d671a10a3785473e49c056eb':
  Throw error when no intent can be found
 2014-10-02 12:38:49 +00:00
Patrick Tjin
21b0fc91e0 am d104aae8: am cae74017: am f7c59190: am dea847c2: Skip over directories when iterating tombstones 
* commit 'd104aae8154ae182d58fc4c2b85fabbbe152faca':
  Skip over directories when iterating tombstones
 2014-10-02 12:38:44 +00:00
John Spurlock
9ab7d0a736 am a0aa089b: am eac9f30c: am 4940789b: am c403a340: Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev 
* commit 'a0aa089bcf8358f93c4eef33cfe409238ccecd39':
  Doze: Route volume keys to music only while pulsing.
 2014-10-02 12:38:40 +00:00
Winson Chung
7716f1b609 am 98391728: am 0dad6a07: am d8ab73d7: am d092fc70: Merge "Ensure that we don\'t show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to ho 
* commit '983917288d1d6ea0ade9229740ea5bac0b8b2887':
  Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option
 2014-10-02 12:38:36 +00:00
Andreas Gampe
eaa863a64e am dc12e109: am 7569294e: am 0a5f518e: am bf417b4d: Merge "Frameworks/base: Update to preloaded-classes" into lmp-dev 
* commit 'dc12e1092e7216a9ed9295afc2fd3f235c2367bb':
  Frameworks/base: Update to preloaded-classes
 2014-10-02 12:38:31 +00:00
John Reck
2b16483ae6 am 3b2f6701: am d644facf: am f408656a: am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit '3b2f670187fde9079a1f9eaee92415b6a886611f':
  Re-allow suppressing onDetachedFromWindow
 2014-10-02 12:38:26 +00:00
Adam Powell
e18d68d6ab am 4e789dbf: am 8628387c: am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 
* commit '4e789dbff0bc4d9c259a33d6e8ea595c0f4d5f35':
  Revert "Fix issue with using locally defined attrs in a shared lib"
 2014-10-02 12:38:21 +00:00
Hui Shu
30c284fc46 am 03e73745: am 7ce8d27f: am 9cd616e0: am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit '03e73745c69637efb806e174109410b0192536e7':
  Remove WebView DRP Setting from Developer Settings
 2014-10-02 12:38:15 +00:00
kmccormick
e0a4bc6182 am 51086dac: am ab7104f9: am af0dca00: am 04e50c47: am d1ba4c13: am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit '51086dac0f143cf9f0999dafde0f71853da2d784':
  Doc update: Update preprod (staging) instructions.
 2014-10-02 12:38:11 +00:00
Ihab Awad
8620976eb9 am f6707f04: am 8f0356d8: Merge "resolved conflicts for merge of ead63f02 to lmp-mr1-dev" into lmp-mr1-dev 
* commit 'f6707f04bb81d916f3e6e07f596e050996ea3c31':
  Refine implementation of GSM conferences (1/3)
 2014-10-02 12:37:56 +00:00
ztenghui
043c4b3502 am 51ec33bb: am 2298938c: Merge "More test cases from UX team for AVD." into lmp-mr1-dev 
* commit '51ec33bbdf6aa533ae4c1e5f0407e8a10e3d212f':
  More test cases from UX team for AVD.
 2014-10-02 12:37:51 +00:00
Andreas Gampe
5e77475b5d am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues" 
* commit '152d9aae631381ea28f5701168d372a1486a7502':
  Frameworks/base: Fix more aapt issues
 2014-10-02 12:31:16 +00:00
Lorenzo Colitti
6245bd9e19 am eef8d3eb: am df959707: am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 
* commit 'eef8d3eb40f2775ca079b4e50ced8d4eafcbc7fd':
  Revert the configKey generation algorithm to what it was in K.
 2014-10-02 11:23:49 +00:00
Lorenzo Colitti
eef8d3eb40 am df959707: am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 
* commit 'df959707ff086ae1ffe516b516bfd99ac463b803':
  Revert the configKey generation algorithm to what it was in K.
 2014-10-02 11:18:50 +00:00
Lorenzo Colitti
df959707ff am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 
* commit '7fe95529e638467b77372dcac0efe51529e3bde1':
  Revert the configKey generation algorithm to what it was in K.
 2014-10-02 11:12:26 +00:00
Lorenzo Colitti
7fe95529e6 Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 2014-10-02 11:05:21 +00:00
Neil Fuller
ee665151a4 am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible" 
* commit '0c1faf43aecadc37b78c4ad6cb669eb351d21385':
  Switch from FloatMath -> Math and Math.hypot where possible
 2014-10-02 10:18:29 +00:00
Neil Fuller
0c1faf43ae Merge "Switch from FloatMath -> Math and Math.hypot where possible" 2014-10-02 10:14:19 +00:00
Deepanshu Gupta
3fef7abf16 am 70d72265: am 9d474197: am 107e1fb4: am ae74287e: (-s ours) am fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev 
* commit '70d72265b2a4a58f02ee552729847e41ffe5e0db':
  Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
 2014-10-02 09:45:33 +00:00
Deepanshu Gupta
2ed63e0dcc am 4ae7dbba: am 2fca3e94: am d3adf40e: am ae4cb17a: (-s ours) am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev 
* commit '4ae7dbbaa0a6cfd7bf9ec4131720f67b265ee0d2':
  Resource resolution bug fix. [DO NOT MERGE]
 2014-10-02 09:45:29 +00:00