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

153686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
600dc4393a am 323e213d: am b25a4d5f: Merge "Prioritize reveal clipping over Outline clipping" into lmp-dev 
* commit '323e213d0aff4e4120ce183ac4c38d63b593ecee':
  Prioritize reveal clipping over Outline clipping
 2014-09-04 21:26:02 +00:00
David Christie
25fb15035b am d3a78eff: am 36b0eac4: Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev 
* commit 'd3a78eff9d1a34f4638ddfdb6b1f3519b10426b7':
  Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
 2014-09-04 21:17:20 +00:00
RoboErik
aefb63d596 am 41151329: am 9c7c737a: Merge "Ensure there\'s a valid handler when registering a sessions listener" into lmp-dev 
* commit '41151329142a8eadb8a7677b27487c9915183139':
  Ensure there's a valid handler when registering a sessions listener
 2014-09-04 21:17:16 +00:00
Eric Laurent
e3cbfc661e am c61756c5: am f225a5c2: Merge "AudioManager: only use main looper for AudioPort event handler" into lmp-dev 
* commit 'c61756c594c8cfb806882f47148287f827e4102e':
  AudioManager: only use main looper for AudioPort event handler
 2014-09-04 21:17:10 +00:00
Alan Viverette
f97d540026 am 2bb0dec5: am 69dc952d: Merge "Fix AM/PM text i18n and clean up keyboard support in time picker" into lmp-dev 
* commit '2bb0dec5fb6e4e1d112bbbea7ce59ae0d6b9127a':
  Fix AM/PM text i18n and clean up keyboard support in time picker
 2014-09-04 21:17:05 +00:00
Alan Viverette
b053e16027 am 83a9b505: am cfad03e3: Merge "Fix clip rect when drawing accessibility focus rect" into lmp-dev 
* commit '83a9b505f452c4518f445540d1b3059d52775507':
  Fix clip rect when drawing accessibility focus rect
 2014-09-04 21:17:01 +00:00
Craig Mautner
54dee06570 am ae433669: am ac8731f9: Merge "Eliminate deadlock by deferring wipe data call" into lmp-dev 
* commit 'ae43366952e7811c62684878f8f160c44a8454fa':
  Eliminate deadlock by deferring wipe data call
 2014-09-04 21:16:56 +00:00
Raph Levien
01fb255d78 am f7380a69: am 58e457cc: Merge "Fix Layout.isRtlCharAt" into lmp-dev 
* commit 'f7380a6978d3f5b848df277fb23fbc544e148e61':
  Fix Layout.isRtlCharAt
 2014-09-04 21:16:52 +00:00
Alan Viverette
54c3b78a01 am 009ac82c: am 3d6f0211: Merge "Clear ripple animations on cancel/end" into lmp-dev 
* commit '009ac82ce8e5f062ecaa51f29fb8ba05d17c6763':
  Clear ripple animations on cancel/end
 2014-09-04 21:16:47 +00:00
Chris Craik
45769f139d am b25a4d5f: Merge "Prioritize reveal clipping over Outline clipping" into lmp-dev 
* commit 'b25a4d5fbbbbcaefd0c494c410542680db9c7d11':
  Prioritize reveal clipping over Outline clipping
 2014-09-04 21:16:46 +00:00
David Christie
1e76e568dc am 36b0eac4: Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev 
* commit '36b0eac472fdbc45db378646170b891581b53b36':
  Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
 2014-09-04 21:08:19 +00:00
RoboErik
27fcccce63 am 9c7c737a: Merge "Ensure there\'s a valid handler when registering a sessions listener" into lmp-dev 
* commit '9c7c737a603807e727721d00b70a227f60c674e1':
  Ensure there's a valid handler when registering a sessions listener
 2014-09-04 21:08:14 +00:00
Eric Laurent
a4722007c2 am f225a5c2: Merge "AudioManager: only use main looper for AudioPort event handler" into lmp-dev 
* commit 'f225a5c2410eb7a9417f02e65afbe0f92a338a25':
  AudioManager: only use main looper for AudioPort event handler
 2014-09-04 21:08:08 +00:00
Alan Viverette
72c36bd77b am 69dc952d: Merge "Fix AM/PM text i18n and clean up keyboard support in time picker" into lmp-dev 
* commit '69dc952dba40c2c5ab3f0e596391e330ff9f71c8':
  Fix AM/PM text i18n and clean up keyboard support in time picker
 2014-09-04 21:08:04 +00:00
Alan Viverette
4765bd4605 am cfad03e3: Merge "Fix clip rect when drawing accessibility focus rect" into lmp-dev 
* commit 'cfad03e3088ea3f673859c1ada257f299b4ebe68':
  Fix clip rect when drawing accessibility focus rect
 2014-09-04 21:07:59 +00:00
Craig Mautner
547faf79e1 am ac8731f9: Merge "Eliminate deadlock by deferring wipe data call" into lmp-dev 
* commit 'ac8731f94bb416be0cc54f226bda1929b0cba2c0':
  Eliminate deadlock by deferring wipe data call
 2014-09-04 21:07:54 +00:00
Raph Levien
91401c38d8 am 58e457cc: Merge "Fix Layout.isRtlCharAt" into lmp-dev 
* commit '58e457ccaf9d9b864d4033be18ddf0e71a218952':
  Fix Layout.isRtlCharAt
 2014-09-04 21:07:49 +00:00
Alan Viverette
ad4a58fa57 am 3d6f0211: Merge "Clear ripple animations on cancel/end" into lmp-dev 
* commit '3d6f02118c08b45e1b9a4b9a28ca494db4bf5e3e':
  Clear ripple animations on cancel/end
 2014-09-04 21:07:42 +00:00
Chris Craik
2d3f9033f8 Merge "Prioritize reveal clipping over Outline clipping" into lmp-dev 2014-09-04 21:06:10 +00:00
Chris Craik
e83cbd4518 Prioritize reveal clipping over Outline clipping 
bug:15780987
bug:17350602

Also update docs around clipping nesting behavior,
and some Z ordering behavior.

Change-Id: Iaa204350a0adfdcbd8c4b821fb4a9c0ae22f2613
 2014-09-04 14:05:10 -07:00
Prabhakar Thirumoorthy
039f3996f7 am fd21f082: am bbc5508d: Merge "Add a missing dependency on a shared JNI library" into lmp-dev 
* commit 'fd21f082dfa00d2e8336a7ff7194944e700a26ef':
  Add a missing dependency on a shared JNI library
 2014-09-04 21:04:42 +00:00
Adam Lesinski
32962bbccf am 9d54107e: am 0c0fcce6: Merge "Add Configuration changes to UsageStats" into lmp-dev 
* commit '9d54107ef3aa5e31fe96a7465fbb9816e2f747d7':
  Add Configuration changes to UsageStats
 2014-09-04 21:04:37 +00:00
Jing Zhao
74b45dddd2 am fe81757c: am 2c8b3f19: AT&T short dialing code 
* commit 'fe81757c9f15e322b8daa3b6790d8d189a83e5de':
  AT&T short dialing code
 2014-09-04 21:04:28 +00:00
David Christie
e7baf5afc0 Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev 2014-09-04 20:53:39 +00:00
David Christie
c20b795cf0 Add @SystemApi annotations to methods used by GmsCore. 
-Currently these methods are called using reflection for location.
Bug: 17371392
Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
 2014-09-04 20:53:21 +00:00
RoboErik
a4b9a191a8 Merge "Ensure there's a valid handler when registering a sessions listener" into lmp-dev 2014-09-04 20:52:56 +00:00
Eric Laurent
b6efa23adc Merge "AudioManager: only use main looper for AudioPort event handler" into lmp-dev 2014-09-04 20:47:44 +00:00
Alan Viverette
3b256c850c Merge "Fix AM/PM text i18n and clean up keyboard support in time picker" into lmp-dev 2014-09-04 20:45:12 +00:00
Alan Viverette
c65e9a480a Merge "Fix clip rect when drawing accessibility focus rect" into lmp-dev 2014-09-04 20:44:38 +00:00
Prabhakar Thirumoorthy
94e1134448 am bbc5508d: Merge "Add a missing dependency on a shared JNI library" into lmp-dev 
* commit 'bbc5508df13852f2e95bedaedc3fba9b202f9a67':
  Add a missing dependency on a shared JNI library
 2014-09-04 20:42:14 +00:00
Adam Lesinski
d8b4eef307 am 0c0fcce6: Merge "Add Configuration changes to UsageStats" into lmp-dev 
* commit '0c0fcce6a5ce39df0161a78fbb0577d4c70a7a87':
  Add Configuration changes to UsageStats
 2014-09-04 20:42:09 +00:00
Jing Zhao
26a49d0be6 am 2c8b3f19: AT&T short dialing code 
* commit '2c8b3f19d4a2e575a769d6d9ff2ea16947cd22ce':
  AT&T short dialing code
 2014-09-04 20:42:04 +00:00
Craig Mautner
127343cb46 Merge "Eliminate deadlock by deferring wipe data call" into lmp-dev 2014-09-04 20:41:39 +00:00
Raph Levien
37d611198f Merge "Fix Layout.isRtlCharAt" into lmp-dev 2014-09-04 20:40:45 +00:00
Alan Viverette
680e425596 Merge "Clear ripple animations on cancel/end" into lmp-dev 2014-09-04 20:40:06 +00:00
Prabhakar Thirumoorthy
785040f483 Merge "Add a missing dependency on a shared JNI library" into lmp-dev 2014-09-04 20:38:09 +00:00
Adam Lesinski
430f5680b6 Merge "Add Configuration changes to UsageStats" into lmp-dev 2014-09-04 20:35:51 +00:00
Jing Zhao
078dede1de AT&T short dialing code 
User should be able to dial 0 or 00 in AT&T network.
The code should not be taken as MMI Code.

Bug: 17314389
Change-Id: I2f4187ddcbad6d78ee8d8c1881648b96a9da76dd
 2014-09-04 20:21:04 +00:00
Jason Monk
9373e7acd7 am f8c1c23f: am f06881a4: Merge "Proxy fixes from API review feedback" into lmp-dev 
* commit 'f8c1c23f35d5d89624c45f137ac5a0f711f998b4':
  Proxy fixes from API review feedback
 2014-09-04 20:12:31 +00:00
Deepanshu Gupta
007234cab0 am 10af8b21: am 1de3eb07: am 4576f597: am 9bfa0736: am 7119fbb6: am 4df075bc: am 057eb404: (-s ours) am a5176670: am 033a54ec: am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml at 
* commit '10af8b218815d8e783e9d516abae37a2bebc0162':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 20:12:26 +00:00
Deepanshu Gupta
bb60465f5e am b5402cf1: am 1e1e8b58: am 0d5a7d7f: am 8929642c: am 0ff5117f: am 7055778e: am a9f56d5a: (-s ours) am 44db2b3e: am 5d1755e9: am c634383a: (-s ours) am 8bc68f96: am 52ee9b99: am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values 
* commit 'b5402cf176d4db38743b953e260c510e628693ed':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 20:12:21 +00:00
Deepanshu Gupta
07344be7e4 am 4bba3932: am a02e2cd8: am b0be9926: (-s ours) am 889ec192: am a7ce1107: am 19fa86cf: am 5384d40e: (-s ours) am b79bb54e: am f4ba8731: am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb 
* commit '4bba3932cf231a3ef6225faf15285221fe5e56f8':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 20:12:17 +00:00
Deepanshu Gupta
8a3952e7a2 am 1dfb9803: am 54f5b95f: am 2be81615: (-s ours) am 9f7c594a: am ae6f2595: am 409e42a1: am e19464aa: (-s ours) am 9ee1556d: am 296b120c: am a82db08e: (-s ours) am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into 
* commit '1dfb9803bda188702ea6da02adbd202ecf16ebd7':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 20:12:12 +00:00
Jean-Michel Trivi
544292f4d9 am 7af51a9e: am b031a32c: am 7632ed91: am 525e552e: am 800f3ca4: am 14c8acef: am 5fb35780: am daf113b1: am 5c6248c9: am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver 
* commit '7af51a9ef58ac8a0d3569f18460002d953dbfa81':
  Do not restore the media button event receiver
 2014-09-04 20:12:06 +00:00
Alan Viverette
eb3ca22426 Fix clip rect when drawing accessibility focus rect 
BUG: 17320910
Change-Id: I4112c2c9c10187d4b085c7eb96112fab090612ce
 2014-09-04 13:09:34 -07:00
Ye Wen
fe30250ac0 am 9a73a14e: am f9723425: Merge "Add missing mms_config key enableGroupMms to SmsManager (1/2)" into lmp-dev 
* commit '9a73a14ec5915dabb7f0498148e797408564807a':
  Add missing mms_config key enableGroupMms to SmsManager (1/2)
 2014-09-04 20:02:14 +00:00
Jason Monk
3fe29bc600 am 2b9a1d51: am 2d084e75: Merge "Change constants from API review feedback" into lmp-dev 
* commit '2b9a1d51756976adf00ba8b58f945ba9e80851e1':
  Change constants from API review feedback
 2014-09-04 20:02:09 +00:00
Jason Monk
30574e93a8 am f06881a4: Merge "Proxy fixes from API review feedback" into lmp-dev 
* commit 'f06881a4755f146efcc2abca83f48580f16f794f':
  Proxy fixes from API review feedback
 2014-09-04 20:02:00 +00:00
Deepanshu Gupta
53933c2d88 am 1de3eb07: am 4576f597: am 9bfa0736: am 7119fbb6: am 4df075bc: am 057eb404: (-s ours) am a5176670: am 033a54ec: am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes prop 
* commit '1de3eb0784033545b2fac98c43e317e70933e3c5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 20:01:55 +00:00
Deepanshu Gupta
ba7cfef152 am 1e1e8b58: am 0d5a7d7f: am 8929642c: am 0ff5117f: am 7055778e: am a9f56d5a: (-s ours) am 44db2b3e: am 5d1755e9: am c634383a: (-s ours) am 8bc68f96: am 52ee9b99: am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib 
* commit '1e1e8b5804d0c808ee3ea5a02009a2b1e240d02b':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 20:01:51 +00:00