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

153548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
8fa067ca6d 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:06 +00:00
Jason Monk
d8927a84fb Merge "Change constants from API review feedback" into lmp-dev 2014-09-04 19:40:30 +00:00
Nancy Chen
03221abb80 am 25627648: am c27868a6: Merge "Remove check for voicemail number when parsing URI phone number." into lmp-dev 
* commit '256276488d399414d69ed0e233cccfb6c4a496ce':
  Remove check for voicemail number when parsing URI phone number.
 2014-09-04 19:36:56 +00:00
Kenny Guy
44dfe678b3 am 68fc49ee: am 56e125ff: Merge "Revert "Ensure all RemoteViews use myUserId rather than context."" into lmp-dev 
* commit '68fc49ee0ac26467dd2c2e4dbc9cea7124ae05a2':
  Revert "Ensure all RemoteViews use myUserId rather than context."
 2014-09-04 19:36:51 +00:00
Nancy Chen
1a57311d1d 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:54 +00:00
Kenny Guy
325221c07b 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:52 +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
5c9d442150 am e490fd6d: am ddd81fb1: Merge "Turn off FORCE_LOGGING in Telecomm" into lmp-dev 
* commit 'e490fd6dd3f763a3189c8c3f8a0db244a74e5796':
  Turn off FORCE_LOGGING in Telecomm
 2014-09-04 19:10:49 +00:00
Yorke Lee
6f925a3cd3 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:21 +00:00
Yorke Lee
b501eb7ae2 Merge "Turn off FORCE_LOGGING in Telecomm" into lmp-dev 2014-09-04 18:55:30 +00:00
Svetoslav
100dfcd2fa am b57127fd: am af08fbbf: Merge "Update accessibility focused virtual view bounds." into lmp-dev 
* commit 'b57127fd037be7f78d62a9c39a4031c19181d6de':
  Update accessibility focused virtual view bounds.
 2014-09-04 18:52:22 +00:00
dcashman
c287fb2ffd am d285ab9a: am 0dd7e085: Merge "Add upgrade KeySets check to permission pruning on install." into lmp-dev 
* commit 'd285ab9a7b50bde8f65986139bdc0b30db701395':
  Add upgrade KeySets check to permission pruning on install.
 2014-09-04 18:52:16 +00:00
Svetoslav
82f04551f5 am a211481a: am ca24b463: Merge "Fix collection iteration index." into lmp-dev 
* commit 'a211481a57d4eda2830324b7ae254f2d4e9dcf3d':
  Fix collection iteration index.
 2014-09-04 18:52:11 +00:00
Svetoslav
2a87119065 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:44 +00:00
dcashman
adf8c0b9e3 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:39 +00:00
Svetoslav
fcc65d11a1 am ca24b463: Merge "Fix collection iteration index." into lmp-dev 
* commit 'ca24b4630e43f48ddeb0a70b918112719c200160':
  Fix collection iteration index.
 2014-09-04 18:45:34 +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
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
Michael Wright
4bed617911 am 3835c405: am c27c79f1: Merge "Add support for SW_CAMERA_LENS_COVER." into lmp-dev 
* commit '3835c40568592820429b81185a4b9d4b7de34aff':
  Add support for SW_CAMERA_LENS_COVER.
 2014-09-04 18:17:44 +00:00
George Mount
7a4dee660b am 9169d544: am ae572ad4: Merge ""Back" with translucent window now sets ActivityOptions." into lmp-dev 
* commit '9169d544573479d30ff47f303c34cf62e54b37fc':
  "Back" with translucent window now sets ActivityOptions.
 2014-09-04 18:17:35 +00:00
Baligh Uddin
f571341585 am 6909c794: (-s ours) am 576fad6d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6909c794dd0f9edf65ea06956993f7dac5a970f2':
  Import translations. DO NOT MERGE
 2014-09-04 18:12:40 +00:00
Baligh Uddin
19e5c27560 am 5e96ee32: (-s ours) am 84004db4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '5e96ee324a3d9476e040f69cfe6b82eaa631f819':
  Import translations. DO NOT MERGE
 2014-09-04 18:12:36 +00:00
Baligh Uddin
4ee9431c7e am e91cbc23: (-s ours) am 8331b3e4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e91cbc2336146d47e367dae6e5e42802a5d219cd':
  Import translations. DO NOT MERGE
 2014-09-04 18:12:31 +00:00
Baligh Uddin
229990064a am 7c7147d8: (-s ours) am bee78b3d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7c7147d810fec9cae2cd8af0d7a0b17400431693':
  Import translations. DO NOT MERGE
 2014-09-04 18:12:26 +00:00
Ruben Brunk
520c4f64c5 am f0ca58ff: am bb009ddb: Merge "camera2: Fix Nakasi crash-on-start when using Camera2 API." into lmp-dev 
* commit 'f0ca58ffdd989a5b11fd82cdb49b5fc5ae5948eb':
  camera2: Fix Nakasi crash-on-start when using Camera2 API.
 2014-09-04 18:12:21 +00:00
Michael Wright
a314f43514 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:05 +00:00
George Mount
64ffe9e1dc 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:10:00 +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
Baligh Uddin
70f733f613 am 576fad6d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '576fad6d19ed527b957967d7ad5c8ffaeea20987':
  Import translations. DO NOT MERGE
 2014-09-04 18:00:55 +00:00
Baligh Uddin
d553f5300e am 84004db4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '84004db40a4d0df26cbe8ca8555f96c8406f1588':
  Import translations. DO NOT MERGE
 2014-09-04 18:00:51 +00:00
Baligh Uddin
3ded246b21 am 8331b3e4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '8331b3e46caa1a23498684cbde3fdded54bcff9a':
  Import translations. DO NOT MERGE
 2014-09-04 18:00:46 +00:00
Baligh Uddin
5e0c12581f am bee78b3d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'bee78b3d7ee6a1510a37595540628a4d1f42180f':
  Import translations. DO NOT MERGE
 2014-09-04 18:00:41 +00:00
Ruben Brunk
faac30141e 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 18:00:37 +00:00
Chris Wren
0ede908c1d am 4b6f4321: am c95be445: Merge "Honor per-app sensitivity setting." into lmp-dev 
* commit '4b6f432163c4d50a53a64b27e19f6e71b0b33541':
  Honor per-app sensitivity setting.
 2014-09-04 17:57:56 +00:00
RoboErik
28cfe661d7 am dd22920f: am 11370544: Merge "Update VolumeProvider apis per feedback" into lmp-dev 
* commit 'dd22920f2290ad0bf97c466d6d11e10a704e4d70':
  Update VolumeProvider apis per feedback
 2014-09-04 17:57:50 +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
Chris Wren
cb72862b53 am c95be445: Merge "Honor per-app sensitivity setting." into lmp-dev 
* commit 'c95be445c9a26f125fcca0b44a74da5e8c1d59bb':
  Honor per-app sensitivity setting.
 2014-09-04 17:45:49 +00:00
RoboErik
edca5977ed am 11370544: Merge "Update VolumeProvider apis per feedback" into lmp-dev 
* commit '11370544c65d0cdbd8d6da86dc70722bcdc5f60c':
  Update VolumeProvider apis per feedback
 2014-09-04 17:45:42 +00:00