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

138551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jim Miller
2c1de5b052 Hide the fingerprint API for now. DO NOT MERGE 
Change-Id: I78aadf8d03be74eb862c5fe120fa544a2483553c
 2014-06-05 19:37:42 -07: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
Deepanshu Gupta
b78cc30920 Add missing dependency in layoutlib build file [DO NOT MERGE] 
Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
(cherry picked from commit e345507ca4b7b83c6e0446788f4404eb697f945b)
 2014-06-05 18:32:14 -07:00
Todd Poynor
5fde3ff375 BatteryManager: battery property query API update 
Move battery property value accessors to BatteryManager.

Hide BatteryProperty class.

Bug: 15191190
Change-Id: Ic021e6e28a8bc30c145ccc31b3a3446ba82d2004
 2014-06-05 18:10:46 -07: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
Robert Greenwalt
9ac3dbe1ce Fix the marking of restricted network requests 
Need to realized that the NOT_RESTRICTED bit is set by
default, so if looking at what bits are set to decide if
we want NOT_RESTRICTED cleared, we need to ignore the
bit itself.

bug:15456019

Change-Id: Iecae598f47ec7306d475e2262bb1c452ddf0fc75
 2014-06-05 23:59:48 +00: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
Zhijun He
169a149d55 am b67beb8e: Merge "Camera2: Hide input stream related key and enum" into lmp-preview-dev 
* commit 'b67beb8e8b9115c1ba796a57f1bb59822e6a1ce1':
  Camera2: Hide input stream related key and enum
 2014-06-05 23:21:03 +00:00
Alan Viverette
efa65cc8e7 am 6f2ed69f: (-s ours) Merge "DO NOT MERGE Change preference category text color for quantum" into lmp-preview-dev 
* commit '6f2ed69f25dad726baabe67b98c9107fd9bcaa46':
  DO NOT MERGE Change preference category text color for quantum
 2014-06-05 23:16:17 +00:00
Evan Charlton
7d3ff83b8b am 266a63ad: Merge "Expose post-dial APIs" into lmp-preview-dev 
* commit '266a63ad7731d7ebaf4c426b3d226e70c6afd2af':
  Expose post-dial APIs
 2014-06-05 23:15:58 +00:00
Zhijun He
f98a3c020d Merge "Camera2: Hide input stream related key and enum" into lmp-preview-dev 2014-06-05 23:15:17 +00:00
Alan Viverette
4294202648 Merge "DO NOT MERGE Change preference category text color for quantum" into lmp-preview-dev 2014-06-05 23:09:57 +00:00
Vinod Krishnan
90e96db0b5 Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev 2014-06-05 23:03:49 +00:00
Prashant Malani
42db3761c9 Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev 2014-06-05 23:03:19 +00:00
Prashant Malani
31363809b8 Merge "Change display state modification during dozing" 2014-06-05 23:02:42 +00:00
Yorke Lee
8c2d8c0c27 Revert "API changes to Telephony per API review" 
The original change was submitted into lmp-preview-dev and should
not have been auto-merged to master.

This reverts commit 80327f7a31b19213ec48e1ab66e6bdc8e76cb0fe.

Change-Id: I9ff8a868ffa3135583c52ef97b15311107716899
 2014-06-05 22:55:49 +00:00
Evan Charlton
e62a885ea6 Merge "Expose post-dial APIs" into lmp-preview-dev 2014-06-05 22:52:07 +00:00
Deepanshu Gupta
eaa55cdc87 am ee001119: Merge "LayoutLib: Add assertions for typeface." into lmp-preview-dev 
* commit 'ee0011198ff150f972c8afbc5dff695bce2af1f1':
  LayoutLib: Add assertions for typeface.
 2014-06-05 22:43:22 +00:00
Deepanshu Gupta
6d14163a1e am 242dded6: Merge "LayoutLib: Font variants" into lmp-preview-dev 
* commit '242dded6e8b7e5851ad7b80a0c05e4883d2a9f42':
  LayoutLib: Font variants
 2014-06-05 22:43:16 +00:00
Deepanshu Gupta
6c1f78f5d6 am 9a9d96bf: Merge "LayoutLib: Add capability to simulate old versions" into lmp-preview-dev 
* commit '9a9d96bf044bd75e0d75e16a6002dc20e5399866':
  LayoutLib: Add capability to simulate old versions
 2014-06-05 22:43:11 +00:00
ztenghui
537d7ea039 am 42decb1b: Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev 
* commit '42decb1bfe354923205a7cdf856f395f9070b64f':
  API Review: move the CreateRevealAnimator to ViewAnimationUtils
 2014-06-05 22:39:11 +00:00