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

149797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
9f30ce3b82 Merge "Proxy fixes from API review feedback" into lmp-dev 2014-09-04 19:52:03 +00:00
Deepanshu Gupta
75c6c90aa8 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 properly. [DO NOT 
* commit '4576f597078ade77c38a6432d8ae4edc85446db5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 19:49:26 +00:00
Deepanshu Gupta
df5c2a9627 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. [DO NOT MER 
* commit '0d5a7d7f41c0c7bd920fda0e7d4780dc639c90f1':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 19:49:22 +00:00
Deepanshu Gupta
acf556a29e 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-mr1.1-dev 
* commit 'b0be99261ae96df7c29856eccc571e54247fa3a5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 19:49:17 +00:00
Deepanshu Gupta
407453a57b 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 jb-mr1.1-dev 
* commit '2be81615b2b862ee064d5ed03e8ba44d6168b3ff':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 19:49:13 +00:00
Jean-Michel Trivi
ba36392557 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 '7632ed91d91906504212cb7acc85128c89d6d3c7':
  Do not restore the media button event receiver
 2014-09-04 19:49:08 +00:00
Ye Wen
f40275d35e Merge "Add missing mms_config key enableGroupMms to SmsManager (1/2)" into lmp-dev 2014-09-04 19:45:01 +00:00
Jason Monk
d8927a84fb Merge "Change constants from API review feedback" into lmp-dev 2014-09-04 19:40:30 +00:00
Jason Monk
8236413ce0 Proxy fixes from API review feedback 
Bug: 17389383
Change-Id: Ib5e40f55d02687ee917ba30773123cf3e4c2a97d
 2014-09-04 15:39:56 -04:00
Nancy Chen
81a0cbcda3 Merge "Remove check for voicemail number when parsing URI phone number." into lmp-dev 2014-09-04 19:21:30 +00:00
Kenny Guy
6e0a5aef30 Merge "Revert "Ensure all RemoteViews use myUserId rather than context."" into lmp-dev 2014-09-04 19:14:25 +00:00
Yorke Lee
b501eb7ae2 Merge "Turn off FORCE_LOGGING in Telecomm" into lmp-dev 2014-09-04 18:55:30 +00:00
Svetoslav
ac0d317c31 Merge "Update accessibility focused virtual view bounds." into lmp-dev 2014-09-04 18:40:05 +00:00
dcashman
977c5bec52 Merge "Add upgrade KeySets check to permission pruning on install." into lmp-dev 2014-09-04 18:39:35 +00:00
Svetoslav
f96f52ea51 Merge "Fix collection iteration index." into lmp-dev 2014-09-04 18:39:02 +00:00
Yorke Lee
f3dba2f77d Turn off FORCE_LOGGING in Telecomm 
Bug: 17329799
Change-Id: Ic93cfaee62f83b457da3982237170e299c63cf5d
 2014-09-04 11:33:38 -07:00
Ye Wen
fe4bf48b92 Add missing mms_config key enableGroupMms to SmsManager (1/2) 
b/17390011

Change-Id: I6bef36521de6cd1644f83a667753542313fa8d8b
 2014-09-04 11:32:14 -07:00
Jason Monk
5503a55c0b Change constants from API review feedback 
Bug: 17390600
Change-Id: Ie93da8eb6786b7135e8b852804a95f376fcb9d91
 2014-09-04 14:25:45 -04:00
Svetoslav
298a6c6b29 Fix collection iteration index. 
bug:17387880

Change-Id: Ic637ce8fa2da87d6f21a222bd70bf627953f57e3
 2014-09-04 11:20:25 -07:00
Deepanshu Gupta
4576f59707 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 properly. [DO NOT MERGE]" into 
* commit '9bfa073662748e2d0b4b08cfa7fa312e7023f75c':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 18:17:42 +00:00
Deepanshu Gupta
0d5a7d7f41 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. [DO NOT MERGE] 
* commit '8929642ca72981f3c5cd4e7d408d47c724d9127b':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 18:17:38 +00:00
Deepanshu Gupta
b0be99261a 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-mr1.1-dev 
* commit '889ec19249fecfa7121c77b4c2bb32a054311cb5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 18:17:32 +00:00
Deepanshu Gupta
2be81615b2 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 jb-mr1.1-dev 
* commit '9f7c594a05411191d83ccb21655fbd8d52f56189':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 18:17:28 +00:00
Jean-Michel Trivi
7632ed91d9 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 '525e552eef3e38f3ab1a61377ebe69af43e959d7':
  Do not restore the media button event receiver
 2014-09-04 18:17:24 +00:00
Deepanshu Gupta
9bfa073662 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 properly. [DO NOT MERGE]" into jb-dev 
* commit '7119fbb63a32f4f51bf07293c0a7f5a3a32abba0':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 18:10:53 +00:00
Deepanshu Gupta
8929642ca7 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. [DO NOT MERGE] 
* commit '0ff5117fb3aebfd64ffe26ff68308632c7ceeb3d':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 18:10:50 +00:00
Deepanshu Gupta
889ec19249 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-mr1.1-dev 
* commit 'a7ce11070a74f7a0447f0d40d51cb0d3f95999fd':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 18:10:39 +00:00
Deepanshu Gupta
9f7c594a05 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 jb-mr1.1-dev 
* commit 'ae6f2595206d33f04c951c2f3dfff5ede100c942':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 18:10:35 +00:00
Jean-Michel Trivi
525e552eef 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 '800f3ca4ddf52fe46d039505266c84b0ad0234b1':
  Do not restore the media button event receiver
 2014-09-04 18:10:31 +00:00
Michael Wright
18aa9f65fd Merge "Add support for SW_CAMERA_LENS_COVER." into lmp-dev 2014-09-04 18:07:00 +00:00
George Mount
0f6c32af06 Merge ""Back" with translucent window now sets ActivityOptions." into lmp-dev 2014-09-04 18:03:52 +00:00
George Mount
9e18397112 "Back" with translucent window now sets ActivityOptions. 
Also made convertToTranslucent set the canvas opacity.

Bug 16215650

Change-Id: Id4325eaed34cda1269d874f239aeb5f6f82c959f
 2014-09-04 11:02:29 -07:00
Deepanshu Gupta
7119fbb63a 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 properly. [DO NOT MERGE]" into jb-dev 
* commit '4df075bcb5770ba411b6a32c9daeac24da0597e2':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:59:47 +00:00
Deepanshu Gupta
0ff5117fb3 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. [DO NOT MERGE] 
* commit '7055778ef5e97f6f83181a44c9b3804632f6f64e':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 17:59:44 +00:00
Deepanshu Gupta
a7ce11070a 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-mr1.1-dev 
* commit '19fa86cfd6fddb63715b50a4e0bc881d2ea34133':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:59:41 +00:00
Deepanshu Gupta
ae6f259520 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 jb-mr1.1-dev 
* commit '409e42a17eeedf125d012ebc3f1d91fcf5812573':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 17:59:38 +00:00
Jean-Michel Trivi
800f3ca4dd 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 '14c8acef21136a07e5e750b245874d779f410b53':
  Do not restore the media button event receiver
 2014-09-04 17:59:35 +00:00
Baligh Uddin
6bed40eddc Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-04 17:49:32 +00:00
Baligh Uddin
b318691573 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-04 17:49:06 +00:00
Baligh Uddin
82a946d7de Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-04 17:49:05 +00:00
Baligh Uddin
d837c3e87d Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-04 17:48:59 +00:00
Ruben Brunk
69a0966441 Merge "camera2: Fix Nakasi crash-on-start when using Camera2 API." into lmp-dev 2014-09-04 17:47:16 +00:00
Deepanshu Gupta
4df075bcb5 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 properly. [DO NOT MERGE]" into jb-dev 
* commit '057eb404363184b75ab0e5d3768a22126703f750':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:46:19 +00:00
Deepanshu Gupta
7055778ef5 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. [DO NOT MERGE] 
* commit 'a9f56d5a050845703bdcfff734d9d189bec2ddec':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 17:46:15 +00:00
Deepanshu Gupta
19fa86cfd6 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-mr1.1-dev 
* commit '5384d40ed4ec8f3546be94e6cae7c0011ef235a5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:46:11 +00:00
Deepanshu Gupta
409e42a17e 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 jb-mr1.1-dev 
* commit 'e19464aae4ba251c758f3b27601ef3470e0a8c2d':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 17:46:08 +00:00
Jean-Michel Trivi
14c8acef21 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 '5fb35780a53c239e34aec8beccd328cad9145e3d':
  Do not restore the media button event receiver
 2014-09-04 17:46:04 +00:00
Chris Wren
0fb810a3fa Merge "Honor per-app sensitivity setting." into lmp-dev 2014-09-04 17:42:18 +00:00
RoboErik
f85a08d30f Merge "Update VolumeProvider apis per feedback" into lmp-dev 2014-09-04 17:38:01 +00:00
Deepanshu Gupta
057eb40436 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 properly. [DO NOT MERGE]" into jb-dev 
* commit 'a5176670c8ef21b42e0a2e7db07c968e3ceacb39':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 17:33:28 +00:00