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

138822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amit Mahajan
0409e9f0af resolved conflicts for merge of 437a77d4 to master 
Change-Id: I65585939a57c561064d370be131c0197de0f08c3
 2014-06-10 10:47:26 -07:00
Adrian Roos
13dee43e6f Fix broken tablet layout of QS on lockscreen 
Bug: 15536406
Change-Id: I6c075d0875cf78dff1938b5cfd49e6b1924bcc99
 2014-06-10 19:43:13 +02:00
Doug Zongker
40e53cdc94 Merge "hide RECOVERY permission from L preview -- DO NOT MERGE" into lmp-preview-dev 2014-06-10 17:38:20 +00:00
Selim Cinek
554f5406f3 Merge "Fixed several bugs with redaction." into lmp-preview-dev 2014-06-10 17:33:44 +00:00
Selim Cinek
429b1ab5cb Merge "Fixed an issue where holes in the notification shade could appear." into lmp-preview-dev 2014-06-10 17:33:21 +00:00
Jorim Jaggi
36b15237a6 Fix black background for auto-redacted legacy notifications 
Also removes the wrongly implemented Froyo compatibility mode, as now
all the notifications are light and the background is provided by us,
it's again like in Froyo-world! :-)

Bug: 15295371
Bug: 14105711
Change-Id: Icbae15e690494465b0e63935d81d59edfa05e76e
 2014-06-10 19:24:42 +02:00
Chris Craik
1e5cf9aced am b1c76a1a: Merge "Tessellate on worker threads" into lmp-preview-dev 
* commit 'b1c76a1abcfb2f33e12fef37ec71d20724863b5e':
  Tessellate on worker threads
 2014-06-10 17:22:31 +00:00
Igor Murashkin
f1d758867a am 69729adf: Merge "camera2: Fix session-related CTS test failures" into lmp-preview-dev 
* commit '69729adf04bddb2e5b67d625412151b4bcbc1ca4':
  camera2: Fix session-related CTS test failures
 2014-06-10 17:22:22 +00:00
Adam Lesinski
859cd926fe am a277deb7: (-s ours) DO NOT MERGE - Creating an empty package should be succesfull 
* commit 'a277deb755f95ca42e39f8910d958bfd1ceafa55':
  DO NOT MERGE - Creating an empty package should be succesfull
 2014-06-10 17:22:12 +00:00
Jeff Brown
085a1e7933 am af0c2ebf: @hide ACCESS_INPUT_FLINGER permission. 
* commit 'af0c2ebfc71f6106656eb17345e122ea7ac8cf2a':
  @hide ACCESS_INPUT_FLINGER permission.
 2014-06-10 17:21:59 +00:00
Craig Mautner
7683baad6c am a7c5791a: Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev 
* commit 'a7c5791a95bf732c2381f698d78930ee61efd36b':
  Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK
 2014-06-10 17:21:52 +00:00
Christopher Tate
4a1c0bd20b am 2099866f: Merge "Switch framework to using new scheduled-work API" into lmp-preview-dev 
* commit '2099866f0d9ae5692e6edfc053aebe7f93a21618':
  Switch framework to using new scheduled-work API
 2014-06-10 17:21:47 +00:00
Fabrice Di Meglio
5ef6f9078a am 821c8331: Merge "Fix bug #14258811 Permissions icons are not visible in App info" into lmp-preview-dev 
* commit '821c833143d396cf64536eb4938c0d79d1adccc6':
  Fix bug #14258811 Permissions icons are not visible in App info
 2014-06-10 17:21:42 +00:00
Leon Scroggins III
e3f9800f38 Fix a memory leak with empty screenshot. 
Use an autodeleter to delete the ScreenshotClient when it's not
needed.

Discovered while investigating BUG:15454296, but it does not fix
the problem.

Change-Id: I00ea81de15ddc2507d904a6c20af3c410f573dce
 2014-06-10 13:19:35 -04:00
Nicolas Prevot
fb8a98d3f3 Changing the value of the user consent extra in DevicePolicyManager. 
Renaming android.app.action.USER_HAS_CONSENTED to
android.app.action.ACTION_PROVISIONING_USER_HAS_CONSENTED

Change-Id: I65a3b8f1ec29a0bed5b61ff9e7587195e1c96cec
 2014-06-10 17:59:27 +01:00
Jessica Hummel
096fc544af Merge "Add different resolutions of afw icons" into lmp-preview-dev 2014-06-10 16:56:41 +00:00
Jessica Hummel
ae87d9eede Merge "Updating the pictures and labels for cross-profile intents." into lmp-preview-dev 2014-06-10 16:56:27 +00:00
Selim Cinek
295609a9a5 Merge "Delayed the highlighting of the statusbar header on drag down." into lmp-preview-dev 2014-06-10 16:44:39 +00:00
Selim Cinek
32b5f7a0e8 Merge "Added card elevation when card is clicked on the lockscreen" into lmp-preview-dev 2014-06-10 16:41:02 +00:00
Jessica Hummel
b19fd00c51 Add different resolutions of afw icons 
Also update the name of the icon so that it is consistent with other namings in the framework and in managed provisioning.

bug: 15538051 
Change-Id: I9e8e680eb1c654d9f5d94ce27775687b3dc92a22
 2014-06-10 16:14:58 +00:00
Nicolas Prevot
e4e95a0a3b Updating the pictures and labels for cross-profile intents. 
bug:15538051 
Change-Id: Ib95e36acd31d08fed04927be90e8322e806286ab
(cherry picked from commit c4752a313e137630a8cb84581767bb96d3010376)
 2014-06-10 16:13:59 +00:00
Yohei Yukawa
1ee99c4627 Show IME-related system IME dialogs over windows owned by the IME 
The IME-related system dialogs should be placed over any window
owned by the current IME. However, the framework has taken only
the main window of the current IME has been taken into account.
As a result, the system has not been able to show its IME-related
dialog properly layer when the IME is showing its own dialog.

This CL addresses the above issue.

BUG: 5809660
Change-Id: I205321c7ed42516f36a4bf29dd6a159ac34fd5ec
 2014-06-11 00:50:29 +09:00
Matthew Williams
c2c1a39510 Merge "Remove SyncRequest.setPriority from public API" into lmp-preview-dev 2014-06-10 15:50:11 +00:00
Adrian Roos
178e2b98c1 Merge "Add Emergency Calls Only and Charging State to Status Bar Header" 2014-06-10 15:41:15 +00:00
Selim Cinek
2f0df8ae03 Fixed several bugs with redaction. 
The Notification row was in most cases directly referring to
the private layout which lead to numerous bugs.

Bug: 15107339
Bug: 15536865
Bug: 15181880
Change-Id: Id1021eb853d67db168c9471d7dacbe5265c4ba2f
 2014-06-10 17:40:42 +02:00
Baligh Uddin
6af88cc76f Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-10 15:37:56 +00:00
Baligh Uddin
2ad173d891 Merge "Import translations. DO NOT MERGE" 2014-06-10 15:37:54 +00:00
Santos Cordon
ece0270d99 Merge "Support conference calling. (1/4) [DO NOT MERGE]" into lmp-preview-dev 2014-06-10 15:34:30 +00:00
Baligh Uddin
342c0d0a94 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-10 15:29:10 +00:00
Baligh Uddin
c60aa41104 Merge "Import translations. DO NOT MERGE" 2014-06-10 15:28:30 +00:00
Baligh Uddin
6584375afd Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-10 15:28:25 +00:00
Baligh Uddin
5f4291c1a5 Merge "Import translations. DO NOT MERGE" 2014-06-10 15:28:25 +00:00
Baligh Uddin
56f7c59168 Merge "Import translations. DO NOT MERGE" 2014-06-10 15:28:25 +00:00
Baligh Uddin
291258c880 Merge "Import translations. DO NOT MERGE" 2014-06-10 15:28:19 +00:00
Matthew Williams
f53c295ae3 am 3b471117: Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev 
* commit '3b4711176e77640d697e94137e65fa93c8363f5c':
  Add OnNetworkActive to TaskManager and simplify locking.
 2014-06-10 14:55:46 +00:00
John Reck
1a2f7a1e29 resolved conflicts for merge of 2d2aa0cc to master 
Change-Id: Ib7bb0e40569a8f6a7f856eef54980d70d9769cdc
 2014-06-10 07:53:03 -07:00
Selim Cinek
7d447726e2 Fixed an issue where holes in the notification shade could appear. 
When redaction was turned on, holes could appear.

Bug: 15107339
Change-Id: I8c2830caaa78f03c8ccada1a7160f73c906365d7
 2014-06-10 16:03:46 +02:00
Adrian Roos
59a6127551 Add Emergency Calls Only and Charging State to Status Bar Header 
Bug: 15393101
Change-Id: If1dc300d843fb5f694ef57714225f43924dbb2b8
 2014-06-10 14:49:10 +02:00
Selim Cinek
c0ce82daa4 Delayed the highlighting of the statusbar header on drag down. 
Also delayed the highlighing of buttons inside notifications.

Bug: 15184882
Change-Id: Ic3af7ec7c41232ac7f8ecfa4700659b1ca293894
 2014-06-10 14:00:42 +02:00
Adam Connors
8f70744221 DO NOT MERGE : Allow system process to call getApplicationBlockedAsUser 
MDMs in the managed profile needs to be able to call
DPM.isApplicationBlocked without the INTERACT_ACROSS_USERS
permission. DevicePolicyManager checks for appropriate
PROFILE_OWNER permission and then removes callerId, so this
change is needed to prevent a spurious security exception.

Bug: 14400206
Change-Id: Idd1bda6bb234f6cb7cb78a885ae2d7cc5cca4890
(cherry picked from commit c11c67b3e117b4fec3245f87b6d510461c1f8323)
 2014-06-10 11:39:31 +00:00
Jeff Sharkey
d734c698e3 am 99f4fe07: Merge "Refactor directory API to "opening document tree."" into lmp-preview-dev 
* commit '99f4fe0797adb8350f92c7d1ba11776d1947e768':
  Refactor directory API to "opening document tree."
 2014-06-10 11:18:54 +00:00
Xiaolei Wang
b71f764c28 am c686a0d4: Merge "Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a" into lmp-preview-dev 
* commit 'c686a0d4b116654d6bec3ff7d5443f8da3ffb20a':
  Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a
 2014-06-10 11:18:48 +00:00
Alan Viverette
3b77eb33a5 am 28104981: Merge "Optimize use of layers in ripple, update dialog styling" into lmp-preview-dev 
* commit '28104981ea36e96e0c85b735b91583fb344b85c5':
  Optimize use of layers in ripple, update dialog styling
 2014-06-10 11:18:38 +00:00
Alan Viverette
4a00c53800 am 5d5de3ee: Merge "Use a weak reference to the ObjectAnimator target" into lmp-preview-dev 
* commit '5d5de3ee32302ae45f3a01933997a2b838bf6291':
  Use a weak reference to the ObjectAnimator target
 2014-06-10 11:18:30 +00:00
Jeff Brown
11ef6a3b11 am 16eb7133: (-s ours) Add @SystemApi annotation to internal permissions. (DO NOT MERGE) 
* commit '16eb71335edcbe2978e2b2a9e5a69d1458ab03bd':
  Add @SystemApi annotation to internal permissions. (DO NOT MERGE)
 2014-06-10 11:18:19 +00:00
Jeff Brown
260fd18d4d am 1337bac1: (-s ours) Add support for @SystemApi annotation to aapt. (DO NOT MERGE) 
* commit '1337bac111c70ba4ccce21b2c75491ee690954a8':
  Add support for @SystemApi annotation to aapt. (DO NOT MERGE)
 2014-06-10 11:18:14 +00:00
Jeff Brown
1ffcc58c68 am 7296e808: (-s ours) Rename PrivateApi annotation to SystemApi. (DO NOT MERGE) 
* commit '7296e80837cd8e406e04193c239a1441c9f147b0':
  Rename PrivateApi annotation to SystemApi. (DO NOT MERGE)
 2014-06-10 11:18:09 +00:00
Michael Wright
66a862c38e am b225171e: (-s ours) Merge "Pack PointerCoords with BitSet. DO NOT MERGE" into lmp-preview-dev 
* commit 'b225171eb981dbd062c6c6b42a963930a31a2a51':
  Pack PointerCoords with BitSet. DO NOT MERGE
 2014-06-10 11:18:02 +00:00
Matthew Williams
3f51a909f0 am a06fce7d: Merge "Add test app for JobScheduler" into lmp-preview-dev 
* commit 'a06fce7dea359571877ae8d9cd9cf720934083f5':
  Add test app for JobScheduler
 2014-06-10 11:17:55 +00:00
Adam Connors
ac383e52a9 DO NOT MERGE : Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only. 
And update the javadoc to explain use-case.

Bug: 15025562
Change-Id: I8eb2666c8480f873e042687223b1a1f82e7919c9
 2014-06-10 10:24:14 +00:00