这里写自定义目录标题
diff --git a/packages/apps/SnapdragonCamera/src/com/android/camera/CameraActivity.java b/packages/apps/SnapdragonCamera/src/com/android/camera/CameraActivity.java
index 6116487..32d80c0 100755
--- a/packages/apps/SnapdragonCamera/src/com/android/camera/CameraActivity.java
+++ b/packages/apps/SnapdragonCamera/src/com/android/camera/CameraActivity.java
@@ -1693,9 +1693,9 @@ public class CameraActivity extends Activity
registerAutoTestReceiver();
}
int rotation = CameraUtil.getDisplayRotation(this);
- /*if(android.os.SystemProperties.get("persist.panel.orientation").equals("90")){
- setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
- }*/
+ if(android.os.SystemProperties.get("persist.panel.orientation").equals("90")){
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+ }
}
private void setRotationAnimation() {
diff --git a/packages/apps/SnapdragonCamera/src/com/android/camera/CaptureModule.java b/packages/apps/SnapdragonCamera/src/com/android/camera/CaptureModule.java
index c25c1f6..0fb7920 100644
--- a/packages/apps/SnapdragonCamera/src/com/android/camera/CaptureModule.java
+++ b/packages/apps/SnapdragonCamera/src/com/android/camera/CaptureModule.java
@@ -680,7 +680,7 @@ public class CaptureModule implements CameraModule, PhotoController,
public void onCaptureCompleted(CameraCaptureSession session,
CaptureRequest request,
TotalCaptureResult result) {
- if (DEBUG) {Log.d(TAG, "onCaptureCompleted ");}
+ if (DEBUG) {Log.d(TAG, "onCaptureCompleted ");}
int id = (int) result.getRequest().getTag();
if (id == getMainCameraId()) {
updateFocusStateChange(result);
@@ -1749,6 +1749,7 @@ if (DEBUG) {Log.d(TAG, "CameraCaptureSession---onConfigured");}
CaptureRequest.Builder builder = getRequestBuilder(id);
builder.setTag(id);
addPreviewSurface(builder, null, id);
+ //triggerFocusAtPoint(900, 550, BAYER_ID);
applySettingsForLockFocus(builder, id);
CaptureRequest request = builder.build();
@@ -2814,8 +2815,9 @@ installIntentFilter();
}
private void updatePreviewSize() {
- int width = mPreviewSize.getWidth();
- int height = mPreviewSize.getHeight();
+ //int width = mPreviewSize.getWidth();
+ int width = mPreviewSize.getHeight();
+ int height = mPreviewSize.getWidth();
String makeup = mSettingsManager.getValue(SettingsManager.KEY_MAKEUP);
boolean makeupOn = makeup != null && !makeup.equals("0");
@@ -2831,10 +2833,7 @@ installIntentFilter();
}
Log.d(TAG, "updatePreviewSize final preview size = " + width + ", " + height);
- //if (android.os.SystemProperties.get("ro.build.product").equals("msm8953_64_c806")||android.os.SystemProperties.get("ro.build.product").equals("msm8953_64_c806e")) {
- // width=1280;
- //height=768;
- // }
+
mPreviewSize = new Size(width, height);
mUI.setPreviewSize(mPreviewSize.getWidth(), mPreviewSize.getHeight());
}
@@ -5075,7 +5074,8 @@ installIntentFilter();
request.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON);
request.set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_TORCH);
} else {
- request.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON_ALWAYS_FLASH);
+ //request.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON_ALWAYS_FLASH);
+ request.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON);
//request.set(CaptureRequest.CONTROL_AF_MODE, CameraMetadata.CONTROL_AF_MODE_MACRO);
request.set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_SINGLE);
}
diff --git a/packages/apps/SnapdragonCamera/src/com/android/camera/CaptureUI.java b/packages/apps/SnapdragonCamera/src/com/android/camera/CaptureUI.java
index 8f35bac..f29e130 100644
--- a/packages/apps/SnapdragonCamera/src/com/android/camera/CaptureUI.java
+++ b/packages/apps/SnapdragonCamera/src/com/android/camera/CaptureUI.java
@@ -271,6 +271,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
public void onLayoutChange(View v, int left, int top, int right,
int bottom, int oldLeft, int oldTop, int oldRight,
int oldBottom) {
+ Log.v(TAG, "onLayoutChange " +"left="+left +",top="+top+",right="+right+",bottom="+bottom);
int width = right - left;
int height = bottom - top;
if (mFaceView != null) {
@@ -1100,11 +1101,24 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
//exit recording mode needs to refresh scene mode label.
showSceneModeLabel();
}
-
+private int setOri(int mOrientation){
+ int orientation=0;
+ if(android.os.SystemProperties.get("persist.panel.orientation").equals("90")){
+ if(mOrientation==270){
+ orientation=0;
+ }else if(mOrientation==0){
+ orientation=90;
+ }else if(mOrientation==180){
+ orientation=270;
+ }else {
+ orientation=180;
+ }
+ }
+ return orientation;
+}
public void addFilterMode() {
if (mSettingsManager.getValue(SettingsManager.KEY_COLOR_EFFECT) == null)
return;
-
int rotation = CameraUtil.getDisplayRotation(mActivity);
boolean mIsDefaultToPortrait = CameraUtil.isDefaultToPortrait(mActivity);
if (!mIsDefaultToPortrait) {
@@ -1122,7 +1136,12 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
int gridRes;
boolean portrait = (rotation == 0) || (rotation == 180);
+ if(android.os.SystemProperties.get("persist.panel.orientation").equals("90")){
+ portrait = (mOrientation== 0) || (mOrientation == 180);
+ portrait =!portrait;
+ }
int size = height;
+ Log.w("fy","portrait---"+portrait+mOrientation);
if (!portrait) {
gridRes = R.layout.vertical_grid;
size = width;
@@ -1146,6 +1165,9 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
params = new ViewGroup.LayoutParams(size, FrameLayout.LayoutParams.MATCH_PARENT);
mFilterLayout.setLayoutParams(params);
((ViewGroup) mRootView).addView(mFilterLayout);
+ if(android.os.SystemProperties.get("persist.panel.orientation").equals("90")){
+ mFilterLayout.setX(1500);
+ }
} else {
params = new ViewGroup.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, size);
mFilterLayout.setLayoutParams(params);
@@ -1161,6 +1183,11 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
for (int i = 0; i < entries.length; i++) {
RotateLayout filterBox = (RotateLayout) inflater.inflate(
R.layout.filter_mode_view, null, false);
+ if(mOrientation==270){
+ filterBox.setOrientation(0,true);
+ }else if(mOrientation==0){
+ filterBox.setOrientation(90,true);
+ }
ImageView imageView = (ImageView) filterBox.findViewById(R.id.image);
final int j = i;
@@ -1386,7 +1413,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
mMakeupButton.setEnabled(enableMakeupMenu);
mFilterModeSwitcher.setEnabled(enableFilterMenu);
mSceneModeSwitcher.setEnabled(enableSceneMenu);
- Log.w("fy","updateMenus---"+mModule.isLowPower());
mFlashButton.setEnabled(!mModule.isLowPower());
}
@@ -1401,7 +1427,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
* Enables or disables the shutter button.
*/
public void enableShutter(boolean enabled) {
- android.util.Log.w("fy",enabled+"----enableShutter---"+Log.getStackTraceString(new Throwable()));
if (mShutterButton != null) {
mShutterButton.setEnabled(enabled);
}
@@ -1657,7 +1682,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
public Point getSurfaceViewSize() {
Point point = new Point();
- if (mSurfaceView != null) point.set(mSurfaceView.getWidth(), mSurfaceView.getHeight());
+ //if (mSurfaceView != null) point.set(mSurfaceView.getWidth(), mSurfaceView.getHeight());
+ if (mSurfaceView != null) point.set( mSurfaceView.getHeight(),mSurfaceView.getWidth());
return point;
}
@@ -1678,7 +1704,15 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
if (vg != null) {
for (int i = vg.getChildCount() - 1; i >= 0; --i) {
RotateLayout l = (RotateLayout) vg.getChildAt(i);
- l.setOrientation(orientation, animation);
+ if(android.os.SystemProperties.get("persist.panel.orientation").equals("90")){
+ if(mOrientation==270){
+ l.setOrientation(0, animation);
+ }else if(mOrientation==0){
+ l.setOrientation(90, animation);
+ }
+ }else {
+ l.setOrientation(orientation, animation);
+ }
}
}
}
@@ -1769,6 +1803,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
public boolean isOverSurfaceView(int[] xy) {
int x = xy[0];
int y = xy[1];
+
int[] surfaceViewLocation = new int[2];
mSurfaceView.getLocationInWindow(surfaceViewLocation);
int surfaceViewX = surfaceViewLocation[0];
@@ -1897,18 +1932,27 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
}
public void showSurfaceView() {
- Log.d(TAG, "showSurfaceView");
+ Log.d(TAG, "showSurfaceView---"+mPreviewWidth+",mPreviewHeight ="+mPreviewHeight);
mSurfaceView.getHolder().setFixedSize(mPreviewWidth, mPreviewHeight);
+ if(android.os.SystemProperties.get("persist.panel.orientation").equals("90")){
+ mSurfaceView.setAspectRatio(mPreviewWidth, mPreviewHeight);
+ } else {
mSurfaceView.setAspectRatio(mPreviewHeight, mPreviewWidth);
+ }
mSurfaceView.setVisibility(View.VISIBLE);
mIsVideoUI = false;
}
public boolean setPreviewSize(int width, int height) {
- Log.d(TAG, "setPreviewSize " + width + " " + height);
+ Log.d(TAG, "setPreviewSize width=" + width + ",height= " + height);
boolean changed = (width != mPreviewWidth) || (height != mPreviewHeight);
- mPreviewWidth = width;
- mPreviewHeight = height;
+ if(android.os.SystemProperties.get("persist.panel.orientation").equals("90")){
+ mPreviewWidth = height;
+ mPreviewHeight = width;
+ }else{
+ mPreviewWidth = width;
+ mPreviewHeight = height;
+ }
if (changed) {
showSurfaceView();
}
diff --git a/packages/apps/SnapdragonCamera/src/com/android/camera/ui/OneUICameraControls.java b/packages/apps/SnapdragonCamera/src/com/android/camera/ui/OneUICameraControls.java
index 94c8bfd..359aa77 100644
--- a/packages/apps/SnapdragonCamera/src/com/android/camera/ui/OneUICameraControls.java
+++ b/packages/apps/SnapdragonCamera/src/com/android/camera/ui/OneUICameraControls.java
@@ -326,7 +326,7 @@ public class OneUICameraControls extends RotatableLayout {
v.setX(bW * idx + (bW - w) / 2);
if(android.os.SystemProperties.get("persist.panel.orientation").equals("90")){
- if (mOrientation == 90 || mOrientation == 270) {
+ /*if (mOrientation == 90 || mOrientation == 270) {
if (top) {
v.setX(1055);
v.setY(mHeight/5f * idx+ (mHeight/5f - w) / 2);
@@ -334,7 +334,7 @@ public class OneUICameraControls extends RotatableLayout {
v.setX(40);
v.setY(mHeight/5f * idx+ (mHeight/5f - w) / 2);
}
- }
+ }*/
}
}
@@ -478,10 +478,10 @@ public class OneUICameraControls extends RotatableLayout {
mRemainingPhotos.setRotation(-mOrientation);
if(android.os.SystemProperties.get("persist.panel.orientation").equals("90")){
- if (mOrientation == 90 || mOrientation == 270) {
+ /* if (mOrientation == 90 || mOrientation == 270) {
mRemainingPhotos.setX(200);
mRemainingPhotos.setY(150);
- }
+ }*/
}
}
@@ -513,9 +513,17 @@ public class OneUICameraControls extends RotatableLayout {
}
public void setOrientation(int orientation, boolean animation) {
- /*if(android.os.SystemProperties.get("persist.panel.orientation").equals("90")){
+ if(android.os.SystemProperties.get("persist.panel.orientation").equals("90")){
+ if(orientation==270){
orientation=0;
- }*/
+ }else if(orientation==0){
+ orientation=90;
+ }else if(orientation==180){
+ orientation=270;
+ }else {
+ orientation=180;
+ }
+ }
mOrientation = orientation;
View[] views = {
mSceneModeSwitcher, mFilterModeSwitcher, mFrontBackSwitcher,
diff --git a/packages/apps/SnapdragonCamera/src/com/android/camera/ui/RotateLayout.java b/packages/apps/SnapdragonCamera/src/com/android/camera/ui/RotateLayout.java
index 49cacf9..19b689f 100644
--- a/packages/apps/SnapdragonCamera/src/com/android/camera/ui/RotateLayout.java
+++ b/packages/apps/SnapdragonCamera/src/com/android/camera/ui/RotateLayout.java
@@ -21,7 +21,7 @@ import android.graphics.Matrix;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
-
+import android.util.Log;
import android.widget.FrameLayout;
// A RotateLayout is designed to display a single item and provides the
@@ -130,10 +130,9 @@ public class RotateLayout extends ViewGroup implements Rotatable {
@Override
public void setOrientation(int orientation, boolean animation) {
-
- /*if(android.os.SystemProperties.get("persist.panel.orientation").equals("90")){
- orientation=0;
- }*/
+ if(android.os.SystemProperties.get("persist.panel.orientation").equals("90")){
+ //orientation=270;
+ }
orientation = orientation % 360;
if (mOrientation == orientation) return;
diff --git a/packages/apps/SnapdragonCamera/src/com/android/camera/util/CameraUtil.java b/packages/apps/SnapdragonCamera/src/com/android/camera/util/CameraUtil.java
index 0d68817..66ee3fc 100755
--- a/packages/apps/SnapdragonCamera/src/com/android/camera/util/CameraUtil.java
+++ b/packages/apps/SnapdragonCamera/src/com/android/camera/util/CameraUtil.java
@@ -565,7 +565,7 @@ public class CameraUtil {
public static int getOptimalPreviewSize(Activity currentActivity,
Point[] sizes, double targetRatio) {
// TODO(andyhuibers): Don't hardcode this but use device's measurements.
- final int MAX_ASPECT_HEIGHT = 1280;
+ final int MAX_ASPECT_HEIGHT = 1200;
// Use a very small tolerance because we want an exact match.
final double ASPECT_TOLERANCE = 0.01;
if (sizes == null) return -1;
@@ -585,7 +585,6 @@ public class CameraUtil {
Point size = sizes[i];
double ratio = (double) size.x / size.y;
if (Math.abs(ratio - targetRatio) > ASPECT_TOLERANCE) continue;
-
// Count sizes with height <= 1080p to mimic camera1 api behavior.
if (size.y > MAX_ASPECT_HEIGHT) continue;
欢迎使用Markdown编辑器
你好！ 这是你第一次使用 Markdown编辑器 所展示的欢迎页。如果你想学习如何使用Markdown编辑器, 可以仔细阅读这篇文章，了解一下Markdown的基本语法知识。
新的改变
我们对Markdown编辑器进行了一些功能拓展与语法支持，除了标准的Markdown编辑器功能，我们增加了如下几点新功能，帮助你用它写博客：
- 全新的界面设计 ，将会带来全新的写作体验；
- 在创作中心设置你喜爱的代码高亮样式，Markdown 将代码片显示选择的高亮样式 进行展示；
- 增加了 图片拖拽 功能，你可以将本地的图片直接拖拽到编辑区域直接展示；
- 全新的 KaTeX数学公式 语法；
- 增加了支持甘特图的mermaid语法1 功能；
- 增加了 多屏幕编辑 Markdown文章功能；
- 增加了 焦点写作模式、预览模式、简洁写作模式、左右区域同步滚轮设置 等功能，功能按钮位于编辑区域与预览区域中间；
- 增加了 检查列表 功能。
功能快捷键
撤销：Ctrl/Command + Z
重做：Ctrl/Command + Y
加粗：Ctrl/Command + B
斜体：Ctrl/Command + I
标题：Ctrl/Command + Shift + H
无序列表：Ctrl/Command + Shift + U
有序列表：Ctrl/Command + Shift + O
检查列表：Ctrl/Command + Shift + C
插入代码：Ctrl/Command + Shift + K
插入链接：Ctrl/Command + Shift + L
插入图片：Ctrl/Command + Shift + G
查找：Ctrl/Command + F
替换：Ctrl/Command + G
合理的创建标题，有助于目录的生成
直接输入1次#，并按下space后，将生成1级标题。
输入2次#，并按下space后，将生成2级标题。
以此类推，我们支持6级标题。有助于使用TOC语法后生成一个完美的目录。
如何改变文本的样式
强调文本 强调文本
加粗文本 加粗文本
标记文本
删除文本
引用文本
H2O is是液体。
210 运算结果是 1024.
插入链接与图片
链接: link.
图片:
带尺寸的图片:
居中的图片:
居中并且带尺寸的图片:
当然，我们为了让用户更加便捷，我们增加了图片拖拽功能。
如何插入一段漂亮的代码片
去博客设置页面，选择一款你喜欢的代码片高亮样式，下面展示同样高亮的 代码片.
// An highlighted block
var foo = 'bar';
生成一个适合你的列表
- 项目
- 项目
- 项目
- 项目
- 项目1
- 项目2
- 项目3
- 计划任务
- 完成任务
创建一个表格
一个简单的表格是这么创建的：
| 项目 | Value |
|---|---|
| 电脑 | $1600 |
| 手机 | $12 |
| 导管 | $1 |
设定内容居中、居左、居右
使用:---------:居中
使用:----------居左
使用----------:居右
| 第一列 | 第二列 | 第三列 |
|---|---|---|
| 第一列文本居中 | 第二列文本居右 | 第三列文本居左 |
SmartyPants
SmartyPants将ASCII标点字符转换为“智能”印刷标点HTML实体。例如：
| TYPE | ASCII | HTML |
|---|---|---|
| Single backticks | 'Isn't this fun?' |
‘Isn’t this fun?’ |
| Quotes | "Isn't this fun?" |
“Isn’t this fun?” |
| Dashes | -- is en-dash, --- is em-dash |
– is en-dash, — is em-dash |
创建一个自定义列表
- Markdown
- Text-to-HTML conversion tool
- Authors
- John
- Luke
如何创建一个注脚
一个具有注脚的文本。2
注释也是必不可少的
Markdown将文本转换为 HTML。
KaTeX数学公式
您可以使用渲染LaTeX数学表达式 KaTeX:
Gamma公式展示 是通过欧拉积分
你可以找到更多关于的信息 LaTeX 数学表达式here.
新的甘特图功能，丰富你的文章
- 关于 甘特图 语法，参考 这儿,
UML 图表
可以使用UML图表进行渲染。 Mermaid. 例如下面产生的一个序列图：
这将产生一个流程图。:
- 关于 Mermaid 语法，参考 这儿,
FLowchart流程图
我们依旧会支持flowchart的流程图：
- 关于 Flowchart流程图 语法，参考 这儿.
导出与导入
导出
如果你想尝试使用此编辑器, 你可以在此篇文章任意编辑。当你完成了一篇文章的写作, 在上方工具栏找到 文章导出 ，生成一个.md文件或者.html文件进行本地保存。
导入
如果你想加载一篇你写过的.md文件，在上方工具栏可以选择导入功能进行对应扩展名的文件导入，
继续你的创作。
注脚的解释 ↩︎