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

150024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jing Zhao
74e76d2ac7 am 2c8b3f19: AT&T short dialing code 
* commit '2c8b3f19d4a2e575a769d6d9ff2ea16947cd22ce':
  AT&T short dialing code
 2014-09-04 20:41:12 +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
7b72d72259 am f06881a4: Merge "Proxy fixes from API review feedback" into lmp-dev 
* commit 'f06881a4755f146efcc2abca83f48580f16f794f':
  Proxy fixes from API review feedback
 2014-09-04 20:03:38 +00:00
Deepanshu Gupta
534ba99f99 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:03:35 +00:00
Deepanshu Gupta
0ab8eaa483 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:03:31 +00:00
Deepanshu Gupta
cd78a02d66 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-mr1.1-dev 
* commit 'a02e2cd8baa7204da99ee828a130c92a0a5b283f':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 20:03:28 +00:00
Deepanshu Gupta
71d16ea096 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 jb-mr1.1-dev 
* commit '54f5b95f4d66ea84923ab69e041528ce6ab49f41':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 20:03:25 +00:00
Jean-Michel Trivi
646ca0848e 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 'b031a32c65f97aaae35f3ee00b8ed537ac322563':
  Do not restore the media button event receiver
 2014-09-04 20:03:21 +00:00
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
d97245e54e am f9723425: Merge "Add missing mms_config key enableGroupMms to SmsManager (1/2)" into lmp-dev 
* commit 'f9723425d6fca88a51a42b50a073246563d78668':
  Add missing mms_config key enableGroupMms to SmsManager (1/2)
 2014-09-04 19:49:06 +00:00
Jason Monk
c9cf46a60e am 2d084e75: Merge "Change constants from API review feedback" into lmp-dev 
* commit '2d084e7555715623213f6fdb7bd0af4505710b22':
  Change constants from API review feedback
 2014-09-04 19:49:02 +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
c7880d3f98 am c27868a6: Merge "Remove check for voicemail number when parsing URI phone number." into lmp-dev 
* commit 'c27868a6d085f10f6ca4f4a83c382078648f21e7':
  Remove check for voicemail number when parsing URI phone number.
 2014-09-04 19:29:51 +00:00
Kenny Guy
86a944e2ad am 56e125ff: Merge "Revert "Ensure all RemoteViews use myUserId rather than context."" into lmp-dev 
* commit '56e125ff1d6d1cde633b1154b07e1efddc5293e9':
  Revert "Ensure all RemoteViews use myUserId rather than context."
 2014-09-04 19:21:53 +00: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
ee2b005d57 am ddd81fb1: Merge "Turn off FORCE_LOGGING in Telecomm" into lmp-dev 
* commit 'ddd81fb1dc5cadc243d1ae617cd4d4c3178fc4dc':
  Turn off FORCE_LOGGING in Telecomm
 2014-09-04 19:04:03 +00:00
Yorke Lee
b501eb7ae2 Merge "Turn off FORCE_LOGGING in Telecomm" into lmp-dev 2014-09-04 18:55:30 +00:00
Svetoslav
9471dc19a8 am af08fbbf: Merge "Update accessibility focused virtual view bounds." into lmp-dev 
* commit 'af08fbbff429e08426e59fb0911a8be09d6c7062':
  Update accessibility focused virtual view bounds.
 2014-09-04 18:45:32 +00:00
dcashman
e714799bca am 0dd7e085: Merge "Add upgrade KeySets check to permission pruning on install." into lmp-dev 
* commit '0dd7e085f55dadbd5277f5cbb212705dbe27f7a5':
  Add upgrade KeySets check to permission pruning on install.
 2014-09-04 18:45:28 +00:00
Svetoslav
5a67469c9a am ca24b463: Merge "Fix collection iteration index." into lmp-dev 
* commit 'ca24b4630e43f48ddeb0a70b918112719c200160':
  Fix collection iteration index.
 2014-09-04 18:45:24 +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
e8291fd96a am c27c79f1: Merge "Add support for SW_CAMERA_LENS_COVER." into lmp-dev 
* commit 'c27c79f15ea22ad77d7431fe0eaf82c2d393635e':
  Add support for SW_CAMERA_LENS_COVER.
 2014-09-04 18:10:02 +00:00
George Mount
4f52476045 am ae572ad4: Merge ""Back" with translucent window now sets ActivityOptions." into lmp-dev 
* commit 'ae572ad4a0a27c9806b4b311d578b5ce27696604':
  "Back" with translucent window now sets ActivityOptions.
 2014-09-04 18:09:58 +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