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

138402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav
a798c0a984 Refactor printing 
Change-Id: I19850154ef2798afff511e4490a268ce38e8cbae
 2014-06-06 13:33:16 -07:00
Yorke Lee
67a0ed001d Merge "API changes to Telephony per API review" 2014-06-06 17:37:37 +00:00
Raph Levien
71f75f1e7b Merge "Fix getFontMetrics problems" 2014-06-06 17:10:32 +00:00
Raph Levien
817ef4ae79 Fix getFontMetrics problems 
Fixes a number of individual problems. In Minikin builds, gets base font
from TypefaceImpl rather than using whatever random font was in the
paint. Respects elegant metrics in ascent and descent methods as well as
getFontMetrics. Sets fixed ascent and descent values to 1900, -500,
which matches the Roboto font.

Part of the fix for bug 15467288 "Inconsistent line heights on
Minikin builds"

Change-Id: I12915f4a62de28932469c7279241eecf7320c47b
 2014-06-06 10:06:01 -07:00
Yorke Lee
282129fd3f API changes to Telephony per API review 
* Make context the first argument for isLocalEmergencyNumber and
isPotentialLocalEmergencyNumber

Bug: 15432083

Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
 2014-06-06 09:29:32 -07:00
Alexandra Gherghina
56e0d8003b Merge "Clean up deleted users in DevicePolicyManagerService" 2014-06-06 16:14:53 +00:00
George Mount
cb0462d36f am 2c9ce97c: Merge "API review: Constants to Gravity and Epicenter." into lmp-preview-dev 
* commit '2c9ce97c340393cb9fcb49d4163ab7d40f434186':
  API review: Constants to Gravity and Epicenter.
 2014-06-06 14:52:18 +00:00
John Reck
743922e9df Merge changes Ie0773f85,Ie5e75505 
* changes:
  Even FASTER damage calculations!
  Have all the setters return changed
 2014-06-06 14:41:37 +00:00
Florin Malita
53be7b79fb Merge "Implement SkCanvasGlue::clipRegion() using clipPath()." 2014-06-06 14:04:32 +00:00
George Mount
d23d509726 Merge "API review: Constants to Gravity and Epicenter." into lmp-preview-dev 2014-06-06 13:59:27 +00:00
Kenny Guy
262d905ee7 am b43f20d7: Merge "Badge notification from managed profiles." into lmp-preview-dev 
* commit 'b43f20d772e5d3b1beafac648ba39c27c33bea01':
  Badge notification from managed profiles.
 2014-06-06 12:36:28 +00:00
Dongwon Kang
4ba840f183 am 1a4d3d02: Merge "TIF: Address the feedback from the API review - 2/3" into lmp-preview-dev 
* commit '1a4d3d02f32ba5e50f2b0da9058dedfbd6342ef9':
  TIF: Address the feedback from the API review - 2/3
 2014-06-06 12:36:19 +00:00
Dongwon Kang
929c6912a8 am 77b29f1f: Merge "TIF: Address the feedback from the API review - 1/3" into lmp-preview-dev 
* commit '77b29f1f7a0dfc7305ed49d2b68bb35b9cc11f4c':
  TIF: Address the feedback from the API review - 1/3
 2014-06-06 12:36:13 +00:00
Calin Juravle
c09722dc55 am c88a5ac3: am d1d46d9d: am bbf849b1: Merge "Add missing profiler options." 
* commit 'c88a5ac3ff0e3b3759c58279204bb8f6b8901669':
  Add missing profiler options.
 2014-06-06 12:31:24 +00:00
Calin Juravle
c88a5ac3ff am d1d46d9d: am bbf849b1: Merge "Add missing profiler options." 
* commit 'd1d46d9d5564a27dae45c2f2a62e6769402b556c':
  Add missing profiler options.
 2014-06-06 12:28:17 +00:00
Calin Juravle
d1d46d9d55 am bbf849b1: Merge "Add missing profiler options." 
* commit 'bbf849b1c686c9e09c4d59574da70181a47ebb5d':
  Add missing profiler options.
 2014-06-06 12:09:48 +00:00
Calin Juravle
bbf849b1c6 Merge "Add missing profiler options." 2014-06-06 12:06:36 +00:00
Calin Juravle
9828d067fb Add missing profiler options. 
Bug: 12877748

Change-Id: I311b8fb7e15d512e65631bc2a52c443a271d3d3f
 2014-06-06 12:55:23 +01:00
Nicolas Prevot
a61fbbd0c3 Merge "Adding an extra and an action to notify the mdm to start the provisioning." 2014-06-06 11:18:10 +00:00
Nicolas Prevot
07ac20bb2c Adding an extra and an action to notify the mdm to start the provisioning. 
Adding EXTRA_PROVISIONING_EMAIL_ADDRESS and ACTION_START_PROVISIONING to DevicePolicyManager.

BUG: 15157562

Change-Id: Ic3ecc6b0a501e1df9a5f803a44347dd024a7a07c
 2014-06-06 12:00:17 +01:00
Adam Skory
4dd853a643 Merge "Squash unreachable catch" 2014-06-06 10:07:03 +00:00
Kenny Guy
adf2ea2bfd Merge "Badge notification from managed profiles." into lmp-preview-dev 2014-06-06 10:06:41 +00:00
Dongwon Kang
7012db741c Merge "TIF: Address the feedback from the API review - 2/3" into lmp-preview-dev 2014-06-06 06:59:17 +00:00
Dongwon Kang
2750d21d8b Merge "TIF: Address the feedback from the API review - 1/3" into lmp-preview-dev 2014-06-06 06:58:02 +00:00
Yohei Yukawa
c1026e17c6 Naming style fix for an internal constant 
This CL does nothing except for adding MSG_ prefix to
an internal constant.

Change-Id: Ic41a8f1e31f5a6a84e6ff8fe9214e9cbc92e04d9
 2014-06-06 15:46:10 +09:00
Ed Heyl
608445608a fix build; undo automerger side affect 
Change-Id: I30da1c85dd67f62f94ddd436a9268eeaa717d7fc
 2014-06-05 22:39:36 -07:00
John Spurlock
5936a19659 am 0fbd9364: Merge "VolumeZen: Only display active condition when entering." into lmp-preview-dev 
* commit '0fbd936409cdc233821f3d29b3ec12738febbf62':
  VolumeZen: Only display active condition when entering.
 2014-06-06 03:42:48 +00:00
John Spurlock
7e984a953e Merge "VolumeZen: Only display active condition when entering." into lmp-preview-dev 2014-06-06 03:39:29 +00:00
John Spurlock
3ae5b35142 am 01566c37: Merge "QuickSettings: Bluetooth updates." into lmp-preview-dev 
* commit '01566c37846b7ad9e4173f2ae50de78ca8c05495':
  QuickSettings: Bluetooth updates.
 2014-06-06 03:32:36 +00:00
John Spurlock
a2cd733c23 Merge "QuickSettings: Bluetooth updates." into lmp-preview-dev 2014-06-06 03:28:29 +00:00
John Spurlock
a625b74120 QuickSettings: Bluetooth updates. 
- Use "Bluetooth" string when connecting.
- Use @hidden device alias (instead of name) for label.
- Use the same icon in the status bar.

Bug:15186962
Change-Id: I25613bebf069c91e76d6933f2512b3f0a8020474
 2014-06-05 23:20:15 -04:00
Aravind Akella
c22597a380 am ef601922: Merge "Hide Sensor.getRequiredPermission API." into lmp-preview-dev 
* commit 'ef6019220a6f15fe1a4c1b1ed2d81d04ce0bcfe4':
  Hide Sensor.getRequiredPermission API.
 2014-06-06 02:01:08 +00:00
Aravind Akella
5cc9da1117 am 7a9b037a: Merge "Remove getRequiredPermission from NDK." into lmp-preview-dev 
* commit '7a9b037ad14e09e59af9aea01192a3d697fe3f4e':
  Remove getRequiredPermission from NDK.
 2014-06-06 02:00:59 +00:00
Aravind Akella
acbf10ce5c Merge "Hide Sensor.getRequiredPermission API." into lmp-preview-dev 2014-06-06 01:57:25 +00:00
Aravind Akella
6ab4a2c297 Merge "Remove getRequiredPermission from NDK." into lmp-preview-dev 2014-06-06 01:56:57 +00:00
Vinod Krishnan
445d2139ef Merge "resolved conflicts for merge of a3d5d3b8 to master" 2014-06-06 01:54:11 +00:00
Vinod Krishnan
067351f876 resolved conflicts for merge of a3d5d3b8 to master 
Change-Id: If0fe0cb541adb0eb74f13cf557ee264aa76c650c
 2014-06-05 18:51:47 -07:00
Sol Boucher
fca5f52347 am af9a77d6: camera2: Fix ordering issue between #onOpened and createCaptureSession 
* commit 'af9a77d64912985a3fa9f91cd0e372316e790b9f':
  camera2: Fix ordering issue between #onOpened and createCaptureSession
 2014-06-06 01:51:25 +00:00
Sol Boucher
4b3f800438 camera2: Fix ordering issue between #onOpened and createCaptureSession 
This resolves an issue where the CameraDevice.StateListener callbacks were
erroneously called before the CameraCaptureSession.StateListener ones,
preventing e.g. creating a capture session from the
CameraDevice.StateListener#onOpened() callback.
It also explicitly ignores CameraDevice.StateListener#onUnconfigured() calls
occurring before the first call to #close .

Bug: 15449190
Change-Id: Ic0094d53a65e42108201d7bb50734d17290fa9bf
 2014-06-06 01:43:00 +00:00
John Spurlock
2769ac2907 VolumeZen: Only display active condition when entering. 
Instead of always displaying the active condition, only
show it the first time (when turning zen on).

Bug:15455271
Change-Id: I89e8e2c09fa0d06a5e4c3174f825dfe5a452f06e
 2014-06-05 20:55:49 -04:00
Evan Charlton
acb28a7af7 Merge "Fix the build breakage (update API & javadocs)" 2014-06-06 00:50:35 +00:00
Raph Levien
748a3779f3 am 455b351b: Merge "Make elegantTextHeight xml attribute public" into lmp-preview-dev 
* commit '455b351bba515c3a7e6139368c4110abbf1e4e89':
  Make elegantTextHeight xml attribute public
 2014-06-06 00:45:43 +00:00
Raph Levien
5b29e12cfb Merge "Make elegantTextHeight xml attribute public" into lmp-preview-dev 2014-06-06 00:42:34 +00:00
Evan Charlton
7960fd917a Fix the build breakage (update API & javadocs) 
Update API and Javadocs to fix the build.

Change-Id: I108e4d824eabb68f8edd864bf67a16188672b01b
 2014-06-05 17:31:11 -07:00
Prashant Malani
86414c31a9 am 59b82c3e: (-s ours) am 42db3761: Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev 
* commit '59b82c3eae2cd329461b7ad64bd8abee4898a90e':
  DO NOT MERGE Change display state modification during dozing
 2014-06-06 00:20:05 +00:00
Vinod Krishnan
a3d5d3b8af am 90e96db0: Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev 
* commit '90e96db0b5a200f528f1ca6a66d5aeaa5c915ca2':
  Adding a way to stub Vpn ConfirmDialog
 2014-06-06 00:16:40 +00:00
Prashant Malani
59b82c3eae am 42db3761: Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev 
* commit '42db3761c9ee3df11a367cbc907f2ba433251634':
  DO NOT MERGE Change display state modification during dozing
 2014-06-06 00:16:35 +00:00
Jae Seo
b8a64416e5 TIF: Address the feedback from the API review - 2/3 
This change addresses the following comments from the council:
- Change the TvView API to be tune(String inputId, Uri channelUri) and
  reset()
- @hide TvInputSession class, including createSession() and
  SessionCallback
- Define a listener interface specific to TvView, allowing you to hide
  the session details and keep the API simpler.  Add
  setTvInputListener().

Bug: 15345342
Change-Id: I931662841b41d862ebc4a700ccb245889a5f87a5
 2014-06-06 09:13:28 +09:00
Yin-Chia Yeh
abfaf964a5 am 6d892689: Merge "Camera2: Do not hide TonemapCurve construtor" into lmp-preview-dev 
* commit '6d892689f569871e2e711669c0262a7d25b3e091':
  Camera2: Do not hide TonemapCurve construtor
 2014-06-05 23:37:07 +00:00
Yin-Chia Yeh
ffff217134 Merge "Camera2: Do not hide TonemapCurve construtor" into lmp-preview-dev 2014-06-05 23:33:38 +00:00