Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,659 Commits 3 Branches 0 Tags
350fe3255073dd47bf9d1bef4e0283f28badbd7d
Commit Graph

57380 Commits

Author SHA1 Message Date
Ruben Brunk
af496e7ba0 am 25e44765: am ea33afcb: Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev 
* commit '25e4476596079bc603b0822d6255d31119380a3f':
  camera2: Add HDR vendor tag for legacy mode.
 2014-08-30 00:44:48 +00:00
Ruben Brunk
0f946d172a am ea33afcb: Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev 
* commit 'ea33afcb1fe0747b427ece6e73fe4f64e741fead':
  camera2: Add HDR vendor tag for legacy mode.
 2014-08-30 00:33:01 +00:00
Ruben Brunk
6293217929 Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev 2014-08-30 00:27:43 +00:00
Alan Viverette
9094d5671a am ecba5c53: am 30da9cd4: Merge "Variety of small UI tweaks" into lmp-dev 
* commit 'ecba5c53317409aab4b78ce12d78cf32114c7a5f':
  Variety of small UI tweaks
 2014-08-29 23:54:54 +00:00
dcashman
a289ea1f1b am e71234b3: am 219d9d38: Merge "Address KeySet API Review" into lmp-dev 
* commit 'e71234b3410519d2d0ab91775378e594f74a73bb':
  Address KeySet API Review
 2014-08-29 23:54:49 +00:00
Robin Lee
aacc124d6e am 066b8593: am cf5d78fb: Merge "Keep managed profile keystores in sync with owner" into lmp-dev 
* commit '066b85934baad993d4040723192ed07846d3af71':
  Keep managed profile keystores in sync with owner
 2014-08-29 23:54:44 +00:00
George Mount
ea4da9e19f am 8383fba1: am 2ad5c527: Merge "Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds." into lmp-dev 
* commit '8383fba1c61d3b7d2f7cafb85a3c186d4b7eaf27':
  Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds.
 2014-08-29 23:54:22 +00:00
Dianne Hackborn
b74989b40c am d0780328: am 325662a3: Merge "Oh sticky broadcasts, I\'d like to do even worse to you." into lmp-dev 
* commit 'd0780328259c9522e150e790e24226325c2288f7':
  Oh sticky broadcasts, I'd like to do even worse to you.
 2014-08-29 23:54:12 +00:00
John Spurlock
c9093b30f0 am ec6c1a68: am 84a39cb0: Merge "Add a hidden system method to check call filter." into lmp-dev 
* commit 'ec6c1a68a5a48cb20f7290342f17de85778741db':
  Add a hidden system method to check call filter.
 2014-08-29 23:54:07 +00:00
Amith Yamasani
5c5d8f8e5a am b9970b0f: am 9d375df7: Merge "Clean up apks installed for a removed user" into lmp-dev 
* commit 'b9970b0fbe5f4436490552f52c64331cbec78d3e':
  Clean up apks installed for a removed user
 2014-08-29 23:53:58 +00:00
Michael Wright
6eb8b59159 am a4e2b977: am 224c2ccc: Merge "Use a linear spline if there\'s a non-monotonic brightness curve" into lmp-dev 
* commit 'a4e2b9771dc8903a27ea2a73e1b208c87a38c097':
  Use a linear spline if there's a non-monotonic brightness curve
 2014-08-29 23:53:48 +00:00
Chris Wren
3f420855ae am a69ad7a3: am 7d0a2a7f: Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev 
* commit 'a69ad7a380c246f3665984aad4ce53cf9e025e8c':
  Disable lockscreen notifications for secure users on upgrade.
 2014-08-29 23:53:05 +00:00
Alan Viverette
99758ca82e am 30da9cd4: Merge "Variety of small UI tweaks" into lmp-dev 
* commit '30da9cd4009b42cdcaff5787c7ef4f8fa6f34dee':
  Variety of small UI tweaks
 2014-08-29 23:36:01 +00:00
dcashman
ce880fc089 am 219d9d38: Merge "Address KeySet API Review" into lmp-dev 
* commit '219d9d387b1d6133e8dd61b78f5e2556a4566a87':
  Address KeySet API Review
 2014-08-29 23:35:56 +00:00
Robin Lee
b228a5b4d4 am cf5d78fb: Merge "Keep managed profile keystores in sync with owner" into lmp-dev 
* commit 'cf5d78fb25a6c1d623ea8d8f5eddab8d6cd3e556':
  Keep managed profile keystores in sync with owner
 2014-08-29 23:35:49 +00:00
George Mount
39b7014384 am 2ad5c527: Merge "Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds." into lmp-dev 
* commit '2ad5c527c0e196ca7f62d4c04b60aad18b6a7c26':
  Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds.
 2014-08-29 23:35:18 +00:00
Dianne Hackborn
25f9acc4f6 am 325662a3: Merge "Oh sticky broadcasts, I\'d like to do even worse to you." into lmp-dev 
* commit '325662a3559d3504dbc9f6f38615eb9564185c2a':
  Oh sticky broadcasts, I'd like to do even worse to you.
 2014-08-29 23:35:08 +00:00
John Spurlock
aae97ee46d am 84a39cb0: Merge "Add a hidden system method to check call filter." into lmp-dev 
* commit '84a39cb09e300386d6875c1f555c969089814fd8':
  Add a hidden system method to check call filter.
 2014-08-29 23:34:51 +00:00
Amith Yamasani
e05b340871 am 9d375df7: Merge "Clean up apks installed for a removed user" into lmp-dev 
* commit '9d375df719ab6b6c85e3bff9a46666c3827ae102':
  Clean up apks installed for a removed user
 2014-08-29 23:34:30 +00:00
Michael Wright
aafd4b423d am 224c2ccc: Merge "Use a linear spline if there\'s a non-monotonic brightness curve" into lmp-dev 
* commit '224c2ccc66cf937de84a79e89997685a162cc905':
  Use a linear spline if there's a non-monotonic brightness curve
 2014-08-29 23:34:17 +00:00
Chris Wren
3cdfa64906 am 7d0a2a7f: Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev 
* commit '7d0a2a7f7d0e87fa76dbf7c29b91a9ce4331b733':
  Disable lockscreen notifications for secure users on upgrade.
 2014-08-29 23:33:48 +00:00
Alan Viverette
cf2a75a66e Merge "Variety of small UI tweaks" into lmp-dev 2014-08-29 23:08:01 +00:00
dcashman
efb1f36f09 Merge "Address KeySet API Review" into lmp-dev 2014-08-29 23:06:50 +00:00
Robin Lee
bccf6f0323 Merge "Keep managed profile keystores in sync with owner" into lmp-dev 2014-08-29 23:01:29 +00:00
George Mount
9a61f9485e Merge "Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds." into lmp-dev 2014-08-29 22:43:25 +00:00
Dianne Hackborn
e56665cd4e Merge "Oh sticky broadcasts, I'd like to do even worse to you." into lmp-dev 2014-08-29 22:37:48 +00:00
Dianne Hackborn
2c3530061f Oh sticky broadcasts, I'd like to do even worse to you. 
Change-Id: I36a7eae294d325d1bd88c15d52566dd4ee1f35be
 2014-08-29 15:27:11 -07:00
Alan Viverette
7ff48839b0 Variety of small UI tweaks 
Updates dialog padding, text opacities on dark theme, progress bar
opacity, ripple background exit speed, remove unnecessary text color
attribute from action menu item layout, fix secondary and tertiary
disabled state text colors.

BUG: 17321765
BUG: 17333263
BUG: 17322159
BUG: 17330086
Change-Id: I14473a985b2c6b853afe7db535a2443e934238e9
 2014-08-29 15:20:13 -07:00
John Spurlock
bd69378419 Merge "Add a hidden system method to check call filter." into lmp-dev 2014-08-29 22:17:10 +00:00
John Spurlock
2b122f4c2e Add a hidden system method to check call filter. 
As a stopgap for dialer, add a NoMan method to check
whether or not contact extras meet the current notification
interruption filter, if phone calls are allowed at all.

Bug:17299986
Change-Id: I4d7e04b974d878504ef4e3a73cb6b602cdd2f73e
 2014-08-29 18:09:35 -04:00
Robin Lee
f0246a8a14 Keep managed profile keystores in sync with owner 
Fixes setting a keyguard password for keystore in a multi-user setup
while we're at it.

Bug: 16233206.
Change-Id: I7941707ca66ac25bd122fd22e5e0f639e7af697e
 2014-08-29 23:03:42 +01:00
Amith Yamasani
b48be6e858 Merge "Clean up apks installed for a removed user" into lmp-dev 2014-08-29 21:51:09 +00:00
Michael Wright
c0a6c03cf2 Merge "Use a linear spline if there's a non-monotonic brightness curve" into lmp-dev 2014-08-29 21:43:15 +00:00
Michael Wright
3e9a13438d Use a linear spline if there's a non-monotonic brightness curve 
Some devices may contain things like transflective displays where
they actually want the backlight brightness to decrease in the face
of high ambient light scenarios. In the interest of time, just use a
linear interpolation based on the brightness control points for these
cases but in the future we should consider adding a non-monotonic
cubic spline.

Bug: 15611140
Change-Id: I8fcee061b18c8ae9cc9a1b38d8b850aaec4478ce
 2014-08-29 14:39:12 -07:00
Chris Wren
4775109ec1 Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev 2014-08-29 21:25:43 +00:00
Christoph Studer
50b8fcb1f0 am e63f3434: am 5a657b43: Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev 
* commit 'e63f3434de0adc3bc9505e954fc3d58b4f627074':
  NoMan: Allow listeners to specify notification trim
 2014-08-29 21:03:04 +00:00
Christoph Studer
00a868f0ca am 5a657b43: Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev 
* commit '5a657b432a1074963484dd7df69c58576f052f07':
  NoMan: Allow listeners to specify notification trim
 2014-08-29 20:51:53 +00:00
Chris Wren
cd8f4f71fc Disable lockscreen notifications for secure users on upgrade. 
Add a notification for those users that teaches them how to re-enable
the notifications.

Bug: 15934899
Depends-On: Ie0bcc207c4f331def207e588bbad36b8986fe114
Change-Id: I4a169e268042cfcaa4ad80cdf205904f9c90e76d
 2014-08-29 20:49:36 +00:00
Christoph Studer
78358b1788 Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev 2014-08-29 20:37:50 +00:00
George Mount
b41572ec69 am 45af21e8: am 6e6a57c8: Merge "Add IDs for status and nav-bar backgrounds." into lmp-dev 
* commit '45af21e8314b877b90ad35248821da869835205a':
  Add IDs for status and nav-bar backgrounds.
 2014-08-29 20:18:27 +00:00
Adam Lesinski
e466091f06 am 81d63ef2: am 3335c1dc: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit '81d63ef2f2249a3be896a6ca792aeb8e2faf50fb':
  Make UsageStats API comply with API Council
 2014-08-29 20:18:22 +00:00
George Mount
cca19b363b am 6e6a57c8: Merge "Add IDs for status and nav-bar backgrounds." into lmp-dev 
* commit '6e6a57c8da95074c5f2c784b8fda38578835025e':
  Add IDs for status and nav-bar backgrounds.
 2014-08-29 20:06:09 +00:00
Adam Lesinski
d0a1a796f5 am 3335c1dc: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit '3335c1dcd1bde37dddbe95c45d64866ca2d31cf2':
  Make UsageStats API comply with API Council
 2014-08-29 20:06:04 +00:00
Adam Lesinski
d6fe30be04 am b616b94b: am 247e8e84: Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev 
* commit 'b616b94b63b91d17140a31ef65fa26cb261a67f4':
  Revert "Make UsageStats API comply with API Council"
 2014-08-29 20:05:14 +00:00
George Mount
d2334e669c Merge "Add IDs for status and nav-bar backgrounds." into lmp-dev 2014-08-29 19:59:59 +00:00
Adam Lesinski
5e71b3fa90 am 247e8e84: Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev 
* commit '247e8e84ec0cafcac7f5e686b68ff64cebf7272a':
  Revert "Make UsageStats API comply with API Council"
 2014-08-29 19:56:52 +00:00
Adam Lesinski
cc562a811d Make UsageStats API comply with API Council 
- Fix documentation to mention units of time in APIs.
- Return a Map instead of an ArrayMap

Bug:17289531
Change-Id: I0a2cfdc0bc003eeeb65a16e37bb7b991624b2853
 2014-08-29 12:52:41 -07:00
Adam Lesinski
25b09837d1 Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev 2014-08-29 19:42:43 +00:00
Adam Lesinski
df77a40d40 Revert "Make UsageStats API comply with API Council" 
This reverts commit 3811dabe57a60e4729f67b6fdc7fbe91eb8b3e06.

Did not update current.txt

Change-Id: I93faccaf24570b1ce88ade37c00506c4a48a8a1d
 2014-08-29 19:34:09 +00:00
Adam Lesinski
d57e1cb644 am f5e3785e: am 84b95b66: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit 'f5e3785e6fc2d4dcbc8ce72ad871a96421ca1f1d':
  Make UsageStats API comply with API Council
 2014-08-29 19:21:28 +00:00