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

161222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andreas Gampe
152d9aae63 am 31629651: Merge "Frameworks/base: Fix more aapt issues" 
* commit '316296511bf12c4e14dfb6f54731d1a515114abf':
  Frameworks/base: Fix more aapt issues
 2014-10-02 07:01:55 +00:00
Andreas Gampe
316296511b Merge "Frameworks/base: Fix more aapt issues" 2014-10-02 06:58:39 +00:00
Andreas Gampe
87332a7109 resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aosp 
Change-Id: I8f7cbd971beae3ab134195e612d705860665142f
 2014-10-01 23:26:06 -07:00
Andreas Gampe
b8dc7bc582 Frameworks/base: Fix more aapt issues 
Change-Id: I6da7dc674e9f9e3b0886a3cfd1e3194d6b5ac948
 2014-10-01 20:42:00 -07:00
Craig Mautner
bee6dfe09d am 8a33674b: am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '8a33674bed6791c63eee9d798693e25bc07b7cba':
  Don't clear visible-behind activity if it is top
 2014-10-02 00:58:50 +00:00
Selim Cinek
6ebab792d2 am 1e5e35ef: am 1c061d48: am cdbda3e9: am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev 
* commit '1e5e35ef626d2a73cf823e75fcbb67af3398b1ff':
  Adapting translation length for a string in a dialog
 2014-10-02 00:58:46 +00:00
Baligh Uddin
8c95b359da am 940d3dd0: (-s ours) am f7ade46c: (-s ours) am 7249a8bb: (-s ours) am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '940d3dd05554db4627f0704be4f73fb1a27ce479':
  Import translations. DO NOT MERGE
 2014-10-02 00:58:42 +00:00
John Spurlock
b3a90ee245 am 7e67011f: am 394f29e7: am cd98a559: am c909e1b2: Zen: Fix new event category check. 
* commit '7e67011f15dd3c7df3200358d950cf4e4429db2c':
  Zen: Fix new event category check.
 2014-10-02 00:58:36 +00:00
Baligh Uddin
5729f6c0de am 861978f7: (-s ours) am b8cbdcb6: (-s ours) am 4aa820ce: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '861978f7de8b95010fecfb76b15f1d81f4f5c3a8':
  Import translations. DO NOT MERGE
 2014-10-02 00:58:32 +00:00
Andreas Gampe
1dcc75b2db am 0ce259c2: Merge "Frameworks/base: Fix AAPT warnings" 
* commit '0ce259c2f69cefd09342a95fbbd4c1a63a0af484':
  Frameworks/base: Fix AAPT warnings
 2014-10-01 23:38:25 +00:00
Andreas Gampe
0ce259c2f6 Merge "Frameworks/base: Fix AAPT warnings" 2014-10-01 23:34:31 +00:00
Andreas Gampe
2412f84064 Frameworks/base: Fix AAPT warnings 
Turn on -Wall -Werror. Fix warnings.

Change-Id: I287fb3c1e851c654479bcf9ea8c73bd354a6b2a1
 2014-10-01 16:18:06 -07:00
Stephen Hines
25a8e43b13 am 7d92ae6d: am 5b3be618: am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev 
* commit '7d92ae6d973cd93cf9034c2f38b964b329ca2eaf':
  include direct.h for _mkdir
 2014-10-01 23:14:53 +00:00
Winson Chung
7f54b3a914 am 6b59887e: am f7d4eb52: am 7f76e505: Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev 
* commit '6b59887e57e37ef33c80a8dc93c0cfede55184cb':
  Fixing invalid check to get component enabled state. (Bug 17679693)
 2014-10-01 23:14:49 +00:00
Stephen Hines
7d92ae6d97 am 5b3be618: am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev 
* commit '5b3be618b1063c95ea3d2be760f62edeaa89b00d':
  include direct.h for _mkdir
 2014-10-01 23:05:40 +00:00
Winson Chung
6b59887e57 am f7d4eb52: am 7f76e505: Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev 
* commit 'f7d4eb52aef5670270d5ba727431d0b2411cbc58':
  Fixing invalid check to get component enabled state. (Bug 17679693)
 2014-10-01 23:05:36 +00:00
Stephen Hines
5b3be618b1 am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev 
* commit '70de9c0d585dcfe71e2cfd921438071e69ff5c45':
  include direct.h for _mkdir
 2014-10-01 22:59:30 +00:00
Winson Chung
f7d4eb52ae am 7f76e505: Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev 
* commit '7f76e505624fddbc4ba3350f3e381ccd275a5a75':
  Fixing invalid check to get component enabled state. (Bug 17679693)
 2014-10-01 22:59:26 +00:00
Stephen Hines
70de9c0d58 Merge "include direct.h for _mkdir" into lmp-dev 2014-10-01 22:54:00 +00:00
Winson Chung
7f76e50562 Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev 2014-10-01 22:53:29 +00:00
Hui Shu
724fe35eac am 5f961157: am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '5f961157c4480e3abbde0f80e5f682da4224b528':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-01 22:38:53 +00:00
Hui Shu
5f961157c4 am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '888fd710cd9ae569d47e1795f47e2ad909b5c8df':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-01 22:25:53 +00:00
wsmlby
49049aef19 am 2e7aa675: am 489502cf: am 7e1ae00c: Merge "Throw error when no intent can be found" into lmp-dev 
* commit '2e7aa67585778cc4ef518ee259103c7dfd384ee9':
  Throw error when no intent can be found
 2014-10-01 22:23:33 +00:00
Patrick Tjin
d104aae815 am cae74017: am f7c59190: am dea847c2: Skip over directories when iterating tombstones 
* commit 'cae740173f2797209bea31f3df23e6b664754498':
  Skip over directories when iterating tombstones
 2014-10-01 22:23:28 +00:00
John Spurlock
a0aa089bcf am eac9f30c: am 4940789b: am c403a340: Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev 
* commit 'eac9f30c94fbfd0ca2db51c1e8f73c3605153062':
  Doze: Route volume keys to music only while pulsing.
 2014-10-01 22:23:24 +00:00
Winson Chung
983917288d 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 home transition 
* commit '0dad6a0732633a11fa780135c3c1f52defac9f16':
  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-01 22:23:20 +00:00
Andreas Gampe
dc12e1092e am 7569294e: am 0a5f518e: am bf417b4d: Merge "Frameworks/base: Update to preloaded-classes" into lmp-dev 
* commit '7569294eb76106de3e4549e1589c1db2ce6ec554':
  Frameworks/base: Update to preloaded-classes
 2014-10-01 22:23:16 +00:00
John Reck
3b2f670187 am d644facf: am f408656a: am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit 'd644facfcd415b0ced337c6c2ef116fc4f1e1f63':
  Re-allow suppressing onDetachedFromWindow
 2014-10-01 22:23:12 +00:00
Adam Powell
4e789dbff0 am 8628387c: am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 
* commit '8628387c604168ccd1ae9c20b8b8d34c68e5f526':
  Revert "Fix issue with using locally defined attrs in a shared lib"
 2014-10-01 22:23:08 +00:00
Hui Shu
03e73745c6 am 7ce8d27f: am 9cd616e0: am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit '7ce8d27fcd83a4e193765f1814fb8f47d7ebf372':
  Remove WebView DRP Setting from Developer Settings
 2014-10-01 22:23:03 +00:00
kmccormick
51086dac0f am ab7104f9: am af0dca00: am 04e50c47: am d1ba4c13: am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit 'ab7104f957da6f956f7d13a6fe439aeafff51c07':
  Doc update: Update preprod (staging) instructions.
 2014-10-01 22:22:59 +00:00
wsmlby
2e7aa67585 am 489502cf: am 7e1ae00c: Merge "Throw error when no intent can be found" into lmp-dev 
* commit '489502cf606b12cc0f872cec6dfd18d0e41db93f':
  Throw error when no intent can be found
 2014-10-01 22:18:13 +00:00
Patrick Tjin
cae740173f am f7c59190: am dea847c2: Skip over directories when iterating tombstones 
* commit 'f7c59190f7f0ece82b98ed61ca16d5f7ab20dc0d':
  Skip over directories when iterating tombstones
 2014-10-01 22:18:04 +00:00
John Spurlock
eac9f30c94 am 4940789b: am c403a340: Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev 
* commit '4940789b6c821bcbc25330536fe76a3fdd7e7983':
  Doze: Route volume keys to music only while pulsing.
 2014-10-01 22:17:52 +00:00
Winson Chung
0dad6a0732 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 home transition - Disable th 
* commit 'd8ab73d71c50f8695ee8b671fdb838f2fd18790d':
  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-01 22:17:41 +00:00