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

138367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Deepanshu Gupta
e872209986 Merge "LayoutLib: Add assertions for typeface." into lmp-preview-dev 2014-06-05 22:38:00 +00:00
Deepanshu Gupta
edfaa50864 Merge "LayoutLib: Font variants" into lmp-preview-dev 2014-06-05 22:37:09 +00:00
Deepanshu Gupta
37f7c68cd7 Merge "LayoutLib: Add capability to simulate old versions" into lmp-preview-dev 2014-06-05 22:36:57 +00:00
ztenghui
2050d39e08 Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev 2014-06-05 22:32:41 +00:00
Raph Levien
e1c4a0d299 Make elegantTextHeight xml attribute public 
The elegantTextHeight attribute of TextView was made public through
Java code, but the corresponding attribute wasn't public. This patch
makes it so.

This is a fix for bug 15428791 "elegantTextHeight is hidden (not in
android.R.attr)"

Change-Id: I7011f10ae58fd2e212da9cbaca4a484f011d8fed
 2014-06-05 22:30:37 +00:00
Vinod Krishnan
b0e5bbb657 Adding a way to stub Vpn ConfirmDialog 
- This is needed to pass CTS tests on the wear devices
- Related CL: http://ar/479486

Bug: 15087985

Change-Id: I56673ff6085618a03ec61031e3af0f6631cb3425
 2014-06-05 15:28:50 -07:00
Prashant Malani
448a4e59ad DO NOT MERGE Change display state modification during dozing 
Check that the BrightnessRamp animation has completed before updating
the display state to STATE_DOZING.

Bug: 13472578
Change-Id: Ib9751f7a987463e4df98571e846d829ec8e73b5e
Signed-off-by: Prashant Malani <pmalani@google.com>
 2014-06-05 22:25:23 +00:00
Aravind Akella
62479c591f Remove getRequiredPermission from NDK. 
Bug: 15089664
Change-Id: Ieb1e97e44ef335e6087ba9164058fe3535e9998a
(cherry picked from commit 8bcdd9b7a5c99e9a5bf1e45f7924b67037898e75)
 2014-06-05 22:24:57 +00:00
Aravind Akella
5271e0b890 Hide Sensor.getRequiredPermission API. 
Bug: 15089664
Change-Id: Ia0f4e64a563ca409849cf53721b4836abbb0be68
(cherry picked from commit e7213150abbe33c71dbdc3295a1fa1feaafb069d)
 2014-06-05 22:24:25 +00:00
Ji-Hwan Lee
4a2e599b5a am b3412adf: Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev 
* commit 'b3412adf92b9d932b600acf44c4463cf06387a8e':
  TvContract: Add channel logo and program thumbnail
 2014-06-05 22:23:11 +00:00
Yorke Lee
f537259ec4 am 87d1dbc5: Merge "API changes to Telephony per API review" into lmp-preview-dev 
* commit '87d1dbc52e473227b2b4bc0d95ca48cfb3363adc':
  API changes to Telephony per API review
 2014-06-05 22:23:03 +00:00
Alan Viverette
0622a4c8b8 am 7553d48d: Merge "Fix default stroke width and NPE for line with no stroke width" into lmp-preview-dev 
* commit '7553d48d28683b5b21e964d837a3f3c0f66af9ad':
  Fix default stroke width and NPE for line with no stroke width
 2014-06-05 22:22:57 +00:00
Chris Craik
c229c2a6a8 am 8632b85b: Merge "Fix issues around GL on incorrect thread" into lmp-preview-dev 
* commit '8632b85b3ceca1b64ca37843ffd87bc10f4ae72f':
  Fix issues around GL on incorrect thread
 2014-06-05 22:22:51 +00:00