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

am 7e55c292: Merge "Fix typos in previous bugfixes." into lmp-dev

Browse Source 
* commit '7e55c29281f8a62154451e87b45d95ec5f97c5ac':
  Fix typos in previous bugfixes.
This commit is contained in:
Deepanshu Gupta
2014-12-03 20:58:19 +00:00
committed by Android Git Automerger
parent b769fc0c57 7e55c29281
commit fb30a783d3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/layoutlib/bridge/src/android/widget/TimePickerSpinnerDelegate_Delegate.java
View File

@@ -30,7 +30,7 @@ public class TimePickerSpinnerDelegate_Delegate {
private static final int PM = 1;
@LayoutlibDelegate
static int getAmOrPmKeyCode(int amOrPm) {
static int getAmOrPmKeyCode(TimePickerSpinnerDelegate tpsd, int amOrPm) {
// We don't care about locales here.
if (amOrPm == AM) {
return KeyEvent.KEYCODE_A;

2
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
View File

@@ -482,7 +482,7 @@ public final class BridgeContext extends Context {
// In some cases, style may not be a dynamic id, so we do a full search.
ResourceReference ref = resolveId(resid);
if (ref != null) {
mRenderResources.getStyle(ref.getName(), ref.isFramework());
style = mRenderResources.getStyle(ref.getName(), ref.isFramework());
}
}