Merge "Remove unused time tile and resources" into klp-dev
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 454 B |
|
Before Width: | Height: | Size: 462 B |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 411 B |
|
Before Width: | Height: | Size: 404 B |
|
Before Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 493 B |
|
Before Width: | Height: | Size: 504 B |
|
Before Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
@@ -1,39 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- Copyright (C) 2012 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.
|
|
||||||
-->
|
|
||||||
<LinearLayout
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:orientation="vertical">
|
|
||||||
<AnalogClock
|
|
||||||
android:id="@+id/analog_clock"
|
|
||||||
android:layout_width="32dp"
|
|
||||||
android:layout_height="32dp"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:layout_marginBottom="10dp"
|
|
||||||
android:dial="@drawable/ic_qs_clock_circle"
|
|
||||||
android:hand_hour="@drawable/ic_qs_clock_hour"
|
|
||||||
android:hand_minute="@drawable/ic_qs_clock_minute"
|
|
||||||
/>
|
|
||||||
<com.android.systemui.statusbar.policy.DateView
|
|
||||||
android:textAppearance="@style/TextAppearance.QuickSettings.TileView"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_horizontal"
|
|
||||||
android:gravity="center"
|
|
||||||
/>
|
|
||||||
</LinearLayout>
|
|
||||||
@@ -358,26 +358,6 @@ class QuickSettings {
|
|||||||
parent.addView(brightnessTile);
|
parent.addView(brightnessTile);
|
||||||
mDynamicSpannedTiles.add(brightnessTile);
|
mDynamicSpannedTiles.add(brightnessTile);
|
||||||
|
|
||||||
// Time tile
|
|
||||||
/*
|
|
||||||
QuickSettingsTileView timeTile = (QuickSettingsTileView)
|
|
||||||
inflater.inflate(R.layout.quick_settings_tile, parent, false);
|
|
||||||
timeTile.setContent(R.layout.quick_settings_tile_time, inflater);
|
|
||||||
timeTile.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
// Quick. Clock. Quick. Clock. Quick. Clock.
|
|
||||||
startSettingsActivity(Intent.ACTION_QUICK_CLOCK);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
mModel.addTimeTile(timeTile, new QuickSettingsModel.RefreshCallback() {
|
|
||||||
@Override
|
|
||||||
public void refreshView(QuickSettingsTileView view, State alarmState) {}
|
|
||||||
});
|
|
||||||
parent.addView(timeTile);
|
|
||||||
mDynamicSpannedTiles.add(timeTile);
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Settings tile
|
// Settings tile
|
||||||
final QuickSettingsBasicTile settingsTile = new QuickSettingsBasicTile(mContext);
|
final QuickSettingsBasicTile settingsTile = new QuickSettingsBasicTile(mContext);
|
||||||
settingsTile.setImageResource(R.drawable.ic_qs_settings);
|
settingsTile.setImageResource(R.drawable.ic_qs_settings);
|
||||||
|
|||||||