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

122230 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Christie
26c6c15f54 am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'b3c96c4c57cb97924f828ea917b1c4d63b2c9d00':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:53:27 -08:00
Craig Mautner
04a0ea60ac Retain stacks even if they are empty. 
Previously stacks would be removed when the last ActivityRecord was
removed. This causes problems for ActivityContainers which persist and
permit activities to be launched into an empty stack.

Change-Id: Ia79ac65d17c42eff3a7b1321980c21b29996001b
 2014-01-13 12:51:26 -08:00
David Christie
b3c96c4c57 am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '1d151607fbee65fc9fc2bb1cb38a850c1f68bede':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:50:18 -08:00
David Christie
1d151607fb am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '4013c4b18ccc66b510f4cdb222d4c04597975843':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:46:35 -08:00
David Christie
4013c4b18c am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '42d7a0bff5da6aeb8323ae0c797e9c4e116b637b':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:43:47 -08:00
David Christie
42d7a0bff5 am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'a7d13fabd6184e411215e9a841cf16097f1a5127':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:41:48 -08:00
David Christie
a7d13fabd6 am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '45aaa377c5d090003c6cf5fb54fff856a0807c4f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:40:04 -08:00
Geoff Mendal
17fc100ea1 Merge "Import translations. DO NOT MERGE" 2014-01-13 20:37:13 +00:00
David Christie
45aaa377c5 am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'a1b89310d58df14570f7f6f5abb677c976c63a7a':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:36:49 -08:00
Geoff Mendal
aa96177c1b Merge "Import translations. DO NOT MERGE" 2014-01-13 20:33:53 +00:00
David Christie
a1b89310d5 am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'a87bdc1f8ff308f90ec7a3234c4848c79d4c3988':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:33:39 -08:00
Geoff Mendal
d8f45184b5 Import translations. DO NOT MERGE 
Change-Id: Ib8169e516ef1d0b7911adabbd945673b199eddd2
Auto-generated-cl: translation import
 2014-01-13 11:59:12 -08:00
Geoff Mendal
4248f74eea Import translations. DO NOT MERGE 
Change-Id: I74b8724bc83b4f86569a2b10e2fee3b44af65410
Auto-generated-cl: translation import
 2014-01-13 11:51:13 -08:00
Tim Murray
6f842ac8aa Add clipping for intrinsics. 
Change-Id: Ic7e1da3c69aa3d5f990816178739120b6059e7a5
 2014-01-13 11:47:53 -08:00
Glenn Kasten
f634bc0ff5 Merge "Prepare for additional formats beyond 8-bit and 16-bit PCM" 2014-01-13 19:25:58 +00:00
quddusc
d77cb626ca docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature. 
Change-Id: I6d9e07e724b2eb02bec7c43344872459e3104fa4
 2014-01-13 11:20:39 -08:00
Daniel Cashman
4b5593d22f am 71007e5d: am 555b8ebf: am e29ff50a: am fe7bfdd3: am af2f2f76: am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit '71007e5d549ba72f68d9ee054cffb477205d3ac5':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 19:12:48 +00:00
Daniel Cashman
71007e5d54 am 555b8ebf: am e29ff50a: am fe7bfdd3: am af2f2f76: am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit '555b8ebfd6e4ee1f60752459061f6dae2fd45981':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 19:10:08 +00:00
John Spurlock
60aaabb0ef Merge "Use accessors for @hidden fields." 2014-01-13 19:06:43 +00:00
Daniel Cashman
555b8ebfd6 am e29ff50a: am fe7bfdd3: am af2f2f76: am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit 'e29ff50aae302ef05b0592e4bab6b3090a59254a':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 19:05:49 +00:00
Daniel Cashman
cc23522029 am 94827c34: am 21a801d0: am 0d30e07d: am 3d5ea26f: am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev 
* commit '94827c3484da6f0a9cd171e6892d2710b1eafa12':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 19:04:18 +00:00
Daniel Cashman
e29ff50aae am fe7bfdd3: am af2f2f76: am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit 'fe7bfdd384f199668ba9b1b751194e06cbb50b3b':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 11:02:15 -08:00
Daniel Cashman
94827c3484 am 21a801d0: am 0d30e07d: am 3d5ea26f: am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev 
* commit '21a801d0885d65f128b84a593140b07fd0d4e980':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 19:00:37 +00:00
Daniel Cashman
fe7bfdd384 am af2f2f76: am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit 'af2f2f767a1673f10a2b44f913832cacefda341b':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 11:00:02 -08:00
Daniel Cashman
21a801d088 am 0d30e07d: am 3d5ea26f: am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev 
* commit '0d30e07d23e9a2bcea4c1b3e61e12e68f5111fe2':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 18:57:19 +00:00
Daniel Cashman
af2f2f767a am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit '9ecadd7cedc492faef163a314713caddbd5da39a':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 10:56:41 -08:00
Daniel Cashman
9ecadd7ced am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit '6f34b9382f0dac64952e0e5c05e96ea2ef3e28e8':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 10:53:31 -08:00
Daniel Cashman
0d30e07d23 am 3d5ea26f: am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev 
* commit '3d5ea26fbb92b1b780cd9763c0731288f48341a3':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 10:52:54 -08:00
Jeff Sharkey
4bc9432f28 am 38c65b1f: am 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered" 
* commit '38c65b1f70042bc8e37e91106692158f0ce98703':
  MountService listeners can not be unregistered
 2014-01-13 18:51:24 +00:00
Daniel Cashman
6f34b9382f am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit '3238d0d9f98d4d0972e52a81a4e9b8d2aea0436d':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 10:50:03 -08:00
Daniel Cashman
3d5ea26fbb am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev 
* commit '4503409a477f3fca2eb60e4105d804069d7b0cad':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 10:49:40 -08:00
Jeff Sharkey
38c65b1f70 am 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered" 
* commit '6fba240b72e9ae2bc66c98b058e78aecd568ae3f':
  MountService listeners can not be unregistered
 2014-01-13 18:47:41 +00:00
Daniel Cashman
3238d0d9f9 Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 2014-01-13 18:44:45 +00:00
Jeff Sharkey
6fba240b72 am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered" 
* commit '6d3700b394c7137ef95580d35223a402a3dd0e7c':
  MountService listeners can not be unregistered
 2014-01-13 18:44:43 +00:00
Daniel Cashman
4503409a47 Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev 2014-01-13 18:44:38 +00:00
Jeff Sharkey
6d3700b394 am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered" 
* commit '47235e8b5ce6c622a1182933404cf5a17fcd35dc':
  MountService listeners can not be unregistered
 2014-01-13 10:42:07 -08:00
Jeff Sharkey
47235e8b5c am 90cadb35: Merge "MountService listeners can not be unregistered" 
* commit '90cadb35156829ff1d6b7066409596da38fc70e1':
  MountService listeners can not be unregistered
 2014-01-13 10:37:51 -08:00
Jeff Sharkey
90cadb3515 Merge "MountService listeners can not be unregistered" 2014-01-13 18:35:32 +00:00
ztenghui
8a3452e7e1 Merge "Calculate and show the shadow from a spot light." 2014-01-13 18:28:42 +00:00
Marco Nelissen
92351c5886 libjhead_jni is still needed 
protip: do not remove things from makefiles just because it builds without them
b/12528751

Change-Id: I3ef8dcdf638e8b59d309922bb972c893fc75a712
 2014-01-13 10:19:17 -08:00
John Spurlock
01534780df Use accessors for @hidden fields. 
Change-Id: I7d66070afb707262cc0dff93b9f9a1dbe77b0092
 2014-01-13 12:03:49 -05:00
John Spurlock
dfc6319064 Remove only com.google reference from SystemUI. 
Change-Id: Ie02bf3662307fa1ea3c68b908a7856fbf0482bb7
 2014-01-13 11:27:25 -05:00
Narayan Kamath
793bbd2929 am 909427d0: am f588d2df: am d0ec6d8c: am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values." 
* commit '909427d093c30d2d4f4ffe5da19f1db6c3e9a3b3':
  Fix preference puts with "null" values.
 2014-01-13 13:10:53 +00:00
Narayan Kamath
909427d093 am f588d2df: am d0ec6d8c: am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values." 
* commit 'f588d2dff2ca6000fe02c5ac6e85f97133477767':
  Fix preference puts with "null" values.
 2014-01-13 13:07:47 +00:00
Narayan Kamath
f588d2dff2 am d0ec6d8c: am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values." 
* commit 'd0ec6d8c505142a51a6c1bfb3637d4a49aa05f32':
  Fix preference puts with "null" values.
 2014-01-13 13:04:28 +00:00
Narayan Kamath
d0ec6d8c50 am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values." 
* commit 'bc2a449a615b30efb81a1a0082a1bb0db515d0f5':
  Fix preference puts with "null" values.
 2014-01-13 05:01:44 -08:00
Narayan Kamath
bc2a449a61 am cb4d3ec1: Merge "Fix preference puts with "null" values." 
* commit 'cb4d3ec1ea446fc9ce51514cbf5b16da0ec0fa0f':
  Fix preference puts with "null" values.
 2014-01-13 04:32:19 -08:00
Narayan Kamath
cb4d3ec1ea Merge "Fix preference puts with "null" values." 2014-01-13 12:29:41 +00:00
Craig Mautner
80a6e776e0 am cf6e0d68: Merge "Add display synchronously." into klp-modular-dev 
* commit 'cf6e0d686f42036992bdac4f47d37bc8c0775027':
  Add display synchronously.
 2014-01-13 05:44:18 +00:00
Craig Mautner
cf6e0d686f Merge "Add display synchronously." into klp-modular-dev 2014-01-13 05:33:51 +00:00