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

150170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
773200640b Fix RemoteViews to inflate views for current user. 
Fix RemoteViews so that it loads resources from
user that created the RemoteViews but inflates
for the user applying the RemoteViews.
Fix Notification to rebuild RemoteViews with
same ApplicationInfo as original app.

Bug: 17302505
Change-Id: I39f21eef83d63e9e494ea35818e1eb969edd38d7
 2014-09-04 20:18:35 +01:00
Alan Viverette
a2362c9251 Clear ripple animations on cancel/end 
This prevents subsequent calls to end() from snapping the background
opacity (among others) back to 1.

BUG: 17357749
BUG: 17349157
Change-Id: I2a4870ed588ba98986428983bf29b556cdc9a701
 2014-09-04 12:16:40 -07:00
Adam Lesinski
7f61e96db7 Add Configuration changes to UsageStats 
Bug:17354208
Change-Id: I9b2f595e51b656607e30e798926cfb7e25134944
 2014-09-04 12:15:32 -07: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
Dianne Hackborn
925e2b3352 Fix issue #17175312: Calendar crashed when tapping on the event notification 
mActivities can be null.

Change-Id: I9cc1a08d19d2c38a4ebaaf0ed2168cfbeeaf3b51
 2014-09-04 11:26:09 -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
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
dc1592ba94 am 576fad6d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '576fad6d19ed527b957967d7ad5c8ffaeea20987':
  Import translations. DO NOT MERGE
 2014-09-04 17:58:05 +00:00
Baligh Uddin
545b8afa30 am 84004db4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '84004db40a4d0df26cbe8ca8555f96c8406f1588':
  Import translations. DO NOT MERGE
 2014-09-04 17:58:02 +00:00
Baligh Uddin
2d464d8570 am 8331b3e4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '8331b3e46caa1a23498684cbde3fdded54bcff9a':
  Import translations. DO NOT MERGE
 2014-09-04 17:57:59 +00:00
Baligh Uddin
48651f4c75 am bee78b3d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'bee78b3d7ee6a1510a37595540628a4d1f42180f':
  Import translations. DO NOT MERGE
 2014-09-04 17:57:55 +00:00
Ruben Brunk
2b9a59d896 am bb009ddb: Merge "camera2: Fix Nakasi crash-on-start when using Camera2 API." into lmp-dev 
* commit 'bb009ddb9167058dae8543172511261df020b0ee':
  camera2: Fix Nakasi crash-on-start when using Camera2 API.
 2014-09-04 17:57:51 +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
2cac28f8fa Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-04 17:49:04 +00:00
Baligh Uddin
83126ac869 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-04 17:49:04 +00:00
Baligh Uddin
d837c3e87d Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-04 17:48:59 +00:00