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

am ff95f657: Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1

Browse Source 
* commit 'ff95f6572596c48b58f5a73d23b2273866ea3fab':
  Fix 5579440: Add transport control view to tablet unlock screens
This commit is contained in:
Jim Miller
2011-11-14 16:16:41 -08:00
committed by Android Git Automerger
parent 464945d18f ff95f65725
commit 00a4ac1d43
15 changed files with 392 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/widget/DigitalClock.java
View File

@@ -106,7 +106,8 @@ public class DigitalClock extends RelativeLayout {
private String mAmString, mPmString;
AmPm(View parent, Typeface tf) {
mAmPmTextView = (TextView) parent.findViewById(R.id.am_pm);
// No longer used, uncomment if we decide to use AM/PM indicator again
// mAmPmTextView = (TextView) parent.findViewById(R.id.am_pm);
if (mAmPmTextView != null && tf != null) {
mAmPmTextView.setTypeface(tf);
}