Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup trying to move to bp

Browse Source 
- Remove some resources that don't appear to do anything
 - Don't assume resource ids are final, because they aren't when
   compiled as a library

Test: build
Change-Id: I498bc2612d3f47df5f567c18c29e1666431e971c
Merged-In: I498bc2612d3f47df5f567c18c29e1666431e971c
(cherry picked from commit 05dd567172)
This commit is contained in:
Jason Monk
2018-08-09 09:38:21 -04:00
committed by Colin Cross
parent df80c8d7cc
commit a9b2fcad7a
18 changed files with 76 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/Android.mk
View File

@@ -7,7 +7,6 @@ LOCAL_MODULE := SystemUI-proto
LOCAL_SRC_FILES := $(call all-proto-files-under,src)
LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors
include $(BUILD_STATIC_JAVA_LIBRARY)

24
packages/SystemUI/res/values-bg/donottranslate.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. Day of week precedes date by default,
but this may be overridden on a per-locale basis if necessary. -->
<string name="status_bar_date_formatter">%2$s\n%1$s</string>
</resources>

24
packages/SystemUI/res/values-hu/donottranslate.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. Day of week precedes date by default,
but this may be overridden on a per-locale basis if necessary. -->
<string name="status_bar_date_formatter">%2$s\n%1$s</string>
</resources>

24
packages/SystemUI/res/values-ja/donottranslate.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. Day of week precedes date by default,
but this may be overridden on a per-locale basis if necessary. -->
<string name="status_bar_date_formatter">%2$s\n%1$s</string>
</resources>

24
packages/SystemUI/res/values-ko/donottranslate.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. Day of week precedes date by default,
but this may be overridden on a per-locale basis if necessary. -->
<string name="status_bar_date_formatter">%2$s\n%1$s</string>
</resources>

24
packages/SystemUI/res/values-lt/donottranslate.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. Day of week precedes date by default,
but this may be overridden on a per-locale basis if necessary. -->
<string name="status_bar_date_formatter">%2$s\n%1$s</string>
</resources>

27
packages/SystemUI/res/values-sw720dp/donottranslate.xml
View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2011, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. %1$s is DOW, %2$s is date.
We show both (DOW on one line, then the date) but this can be overridden for locales as
necessary.
-->
<string name="status_bar_date_formatter">%1$s\n%2$s</string>
</resources>

24
packages/SystemUI/res/values-tr/donottranslate.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. Day of week precedes date by default,
but this may be overridden on a per-locale basis if necessary. -->
<string name="status_bar_date_formatter">%2$s\n%1$s</string>
</resources>

24
packages/SystemUI/res/values-zh-rCN/donottranslate.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. Day of week precedes date by default,
but this may be overridden on a per-locale basis if necessary. -->
<string name="status_bar_date_formatter">%2$s\n%1$s</string>
</resources>

24
packages/SystemUI/res/values-zh-rTW/donottranslate.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- For formatting day of week and date in DateView. Day of week precedes date by default,
but this may be overridden on a per-locale basis if necessary. -->
<string name="status_bar_date_formatter">%2$s\n%1$s</string>
</resources>

40
packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java
View File

@@ -101,31 +101,31 @@ public class SensorLoggerSession {
public Session toProto() {
Session proto = new Session();
proto.setStartTimestampMillis(mStartTimestampMillis);
proto.setDurationMillis(mEndTimestampMillis - mStartTimestampMillis);
proto.setBuild(Build.FINGERPRINT);
proto.setResult(mResult);
proto.setType(mType);
proto.startTimestampMillis = mStartTimestampMillis;
proto.durationMillis = mEndTimestampMillis - mStartTimestampMillis;
proto.build = Build.FINGERPRINT;
proto.result = mResult;
proto.type = mType;
proto.sensorEvents = mSensorEvents.toArray(proto.sensorEvents);
proto.touchEvents = mMotionEvents.toArray(proto.touchEvents);
proto.phoneEvents = mPhoneEvents.toArray(proto.phoneEvents);
proto.setTouchAreaWidth(mTouchAreaWidth);
proto.setTouchAreaHeight(mTouchAreaHeight);
proto.touchAreaWidth = mTouchAreaWidth;
proto.touchAreaHeight = mTouchAreaHeight;
return proto;
}
private PhoneEvent phoneEventToProto(int eventType, long sysTimeNanos) {
PhoneEvent proto = new PhoneEvent();
proto.setType(eventType);
proto.setTimeOffsetNanos(sysTimeNanos - mStartSystemTimeNanos);
proto.type = eventType;
proto.timeOffsetNanos = sysTimeNanos - mStartSystemTimeNanos;
return proto;
}
private SensorEvent sensorEventToProto(android.hardware.SensorEvent ev, long sysTimeNanos) {
SensorEvent proto = new SensorEvent();
proto.setType(ev.sensor.getType());
proto.setTimeOffsetNanos(sysTimeNanos - mStartSystemTimeNanos);
proto.setTimestamp(ev.timestamp);
proto.type = ev.sensor.getType();
proto.timeOffsetNanos = sysTimeNanos - mStartSystemTimeNanos;
proto.timestamp = ev.timestamp;
proto.values = ev.values.clone();
return proto;
}
@@ -133,17 +133,17 @@ public class SensorLoggerSession {
private TouchEvent motionEventToProto(MotionEvent ev) {
int count = ev.getPointerCount();
TouchEvent proto = new TouchEvent();
proto.setTimeOffsetNanos(ev.getEventTimeNano() - mStartSystemTimeNanos);
proto.setAction(ev.getActionMasked());
proto.setActionIndex(ev.getActionIndex());
proto.timeOffsetNanos = ev.getEventTimeNano() - mStartSystemTimeNanos;
proto.action = ev.getActionMasked();
proto.actionIndex = ev.getActionIndex();
proto.pointers = new TouchEvent.Pointer[count];
for (int i = 0; i < count; i++) {
TouchEvent.Pointer p = new TouchEvent.Pointer();
p.setX(ev.getX(i));
p.setY(ev.getY(i));
p.setSize(ev.getSize(i));
p.setPressure(ev.getPressure(i));
p.setId(ev.getPointerId(i));
p.x = ev.getX(i);
p.y = ev.getY(i);
p.size = ev.getSize(i);
p.pressure = ev.getPressure(i);
p.id = ev.getPointerId(i);
proto.pointers[i] = p;
}
return proto;

16
packages/SystemUI/src/com/android/systemui/qs/PseudoGridView.java
View File

@@ -47,16 +47,12 @@ public class PseudoGridView extends ViewGroup {
final int N = a.getIndexCount();
for (int i = 0; i < N; i++) {
int attr = a.getIndex(i);
switch (attr) {
case R.styleable.PseudoGridView_numColumns:
mNumColumns = a.getInt(attr, 3);
break;
case R.styleable.PseudoGridView_verticalSpacing:
mVerticalSpacing = a.getDimensionPixelSize(attr, 0);
break;
case R.styleable.PseudoGridView_horizontalSpacing:
mHorizontalSpacing = a.getDimensionPixelSize(attr, 0);
break;
if (attr == R.styleable.PseudoGridView_numColumns) {
mNumColumns = a.getInt(attr, 3);
} else if (attr == R.styleable.PseudoGridView_verticalSpacing) {
mVerticalSpacing = a.getDimensionPixelSize(attr, 0);
} else if (attr == R.styleable.PseudoGridView_horizontalSpacing) {
mHorizontalSpacing = a.getDimensionPixelSize(attr, 0);
}
}

11
packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java
View File

@@ -69,13 +69,10 @@ public class UserDetailItemView extends LinearLayout {
final int N = a.getIndexCount();
for (int i = 0; i < N; i++) {
int attr = a.getIndex(i);
switch (attr) {
case R.styleable.UserDetailItemView_regularFontFamily:
mRegularTypeface = Typeface.create(a.getString(attr), 0 /* style */);
break;
case R.styleable.UserDetailItemView_activatedFontFamily:
mActivatedTypeface = Typeface.create(a.getString(attr), 0 /* style */);
break;
if (attr == R.styleable.UserDetailItemView_regularFontFamily) {
mRegularTypeface = Typeface.create(a.getString(attr), 0 /* style */);
} else if (attr == R.styleable.UserDetailItemView_activatedFontFamily) {
mActivatedTypeface = Typeface.create(a.getString(attr), 0 /* style */);
}
}
a.recycle();

26
packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java
View File

@@ -226,22 +226,16 @@ public class DividerView extends FrameLayout implements OnTouchListener,
public boolean performAccessibilityAction(View host, int action, Bundle args) {
int currentPosition = getCurrentPosition();
SnapTarget nextTarget = null;
switch (action) {
case R.id.action_move_tl_full:
nextTarget = mSnapAlgorithm.getDismissEndTarget();
break;
case R.id.action_move_tl_70:
nextTarget = mSnapAlgorithm.getLastSplitTarget();
break;
case R.id.action_move_tl_50:
nextTarget = mSnapAlgorithm.getMiddleTarget();
break;
case R.id.action_move_tl_30:
nextTarget = mSnapAlgorithm.getFirstSplitTarget();
break;
case R.id.action_move_rb_full:
nextTarget = mSnapAlgorithm.getDismissStartTarget();
break;
if (action == R.id.action_move_tl_full) {
nextTarget = mSnapAlgorithm.getDismissEndTarget();
} else if (action == R.id.action_move_tl_70) {
nextTarget = mSnapAlgorithm.getLastSplitTarget();
} else if (action == R.id.action_move_tl_50) {
nextTarget = mSnapAlgorithm.getMiddleTarget();
} else if (action == R.id.action_move_tl_30) {
nextTarget = mSnapAlgorithm.getFirstSplitTarget();
} else if (action == R.id.action_move_rb_full) {
nextTarget = mSnapAlgorithm.getDismissStartTarget();
}
if (nextTarget != null) {
startDragging(true /* animate */, false /* touching */);

20
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
View File

@@ -2747,16 +2747,18 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
case AccessibilityNodeInfo.ACTION_LONG_CLICK:
doLongClickCallback();
return true;
case R.id.action_snooze:
NotificationMenuRowPlugin provider = getProvider();
if (provider == null) {
provider = createMenu();
default:
if (action == R.id.action_snooze) {
NotificationMenuRowPlugin provider = getProvider();
if (provider == null) {
provider = createMenu();
}
MenuItem snoozeMenu = provider.getSnoozeMenuItem(getContext());
if (snoozeMenu != null) {
doLongClickCallback(getWidth() / 2, getHeight() / 2, snoozeMenu);
}
return true;
}
MenuItem snoozeMenu = provider.getSnoozeMenuItem(getContext());
if (snoozeMenu != null) {
doLongClickCallback(getWidth() / 2, getHeight() / 2, snoozeMenu);
}
return true;
}
return false;
}

12
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
View File

@@ -256,13 +256,11 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
@Override
public boolean performAccessibilityAction(View host, int action, Bundle args) {
switch (action) {
case R.id.action_toggle_overview:
SysUiServiceProvider.getComponent(getContext(), Recents.class)
.toggleRecentApps();
break;
default:
return super.performAccessibilityAction(host, action, args);
if (action == R.id.action_toggle_overview) {
SysUiServiceProvider.getComponent(getContext(), Recents.class)
.toggleRecentApps();
} else {
return super.performAccessibilityAction(host, action, args);
}
return true;
}

31
packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java
View File

@@ -45,25 +45,18 @@ public class UserAvatarView extends View {
final int N = a.getIndexCount();
for (int i = 0; i < N; i++) {
int attr = a.getIndex(i);
switch (attr) {
case R.styleable.UserAvatarView_avatarPadding:
setAvatarPadding(a.getDimension(attr, 0));
break;
case R.styleable.UserAvatarView_frameWidth:
setFrameWidth(a.getDimension(attr, 0));
break;
case R.styleable.UserAvatarView_framePadding:
setFramePadding(a.getDimension(attr, 0));
break;
case R.styleable.UserAvatarView_frameColor:
setFrameColor(a.getColorStateList(attr));
break;
case R.styleable.UserAvatarView_badgeDiameter:
setBadgeDiameter(a.getDimension(attr, 0));
break;
case R.styleable.UserAvatarView_badgeMargin:
setBadgeMargin(a.getDimension(attr, 0));
break;
if (attr == R.styleable.UserAvatarView_avatarPadding) {
setAvatarPadding(a.getDimension(attr, 0));
} else if (attr == R.styleable.UserAvatarView_frameWidth) {
setFrameWidth(a.getDimension(attr, 0));
} else if (attr == R.styleable.UserAvatarView_framePadding) {
setFramePadding(a.getDimension(attr, 0));
} else if (attr == R.styleable.UserAvatarView_frameColor) {
setFrameColor(a.getColorStateList(attr));
} else if (attr == R.styleable.UserAvatarView_badgeDiameter) {
setBadgeDiameter(a.getDimension(attr, 0));
} else if (attr == R.styleable.UserAvatarView_badgeMargin) {
setBadgeMargin(a.getDimension(attr, 0));
}
}
a.recycle();

21
packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java
View File

@@ -127,19 +127,14 @@ public class SmartReplyView extends ViewGroup {
final int length = arr.getIndexCount();
for (int i = 0; i < length; i++) {
int attr = arr.getIndex(i);
switch (attr) {
case R.styleable.SmartReplyView_spacing:
spacing = arr.getDimensionPixelSize(i, 0);
break;
case R.styleable.SmartReplyView_singleLineButtonPaddingHorizontal:
singleLineButtonPaddingHorizontal = arr.getDimensionPixelSize(i, 0);
break;
case R.styleable.SmartReplyView_doubleLineButtonPaddingHorizontal:
doubleLineButtonPaddingHorizontal = arr.getDimensionPixelSize(i, 0);
break;
case R.styleable.SmartReplyView_buttonStrokeWidth:
strokeWidth = arr.getDimensionPixelSize(i, 0);
break;
if (attr == R.styleable.SmartReplyView_spacing) {
spacing = arr.getDimensionPixelSize(i, 0);
} else if (attr == R.styleable.SmartReplyView_singleLineButtonPaddingHorizontal) {
singleLineButtonPaddingHorizontal = arr.getDimensionPixelSize(i, 0);
} else if (attr == R.styleable.SmartReplyView_doubleLineButtonPaddingHorizontal) {
doubleLineButtonPaddingHorizontal = arr.getDimensionPixelSize(i, 0);
} else if (attr == R.styleable.SmartReplyView_buttonStrokeWidth) {
strokeWidth = arr.getDimensionPixelSize(i, 0);
}
}
arr.recycle();