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

Merge "Allow more than one temp view to be registered at a time" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-20 01:23:05 +00:00
committed by Android (Google) Code Review
parent 96b4b4bd4e 2f3444f9e1
commit 501889c7d1
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/car/CarFacetButtonController.java
View File

@@ -75,7 +75,8 @@ public class CarFacetButtonController {
int displayId = getDisplayId();
for (ActivityManager.StackInfo stackInfo :stackInfoList) {
// if the display id is known and does not match the stack we skip
if (displayId != -1 && displayId != stackInfo.displayId) {
if (displayId != -1 && displayId != stackInfo.displayId ||
stackInfo.topActivity == null) {
continue;
}

30
packages/SystemUI/src/com/android/systemui/statusbar/car/hvac/HvacController.java
View File

@@ -28,8 +28,10 @@ import android.os.Handler;
import android.os.IBinder;
import android.util.Log;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -46,7 +48,7 @@ public class HvacController {
private Handler mHandler;
private Car mCar;
private CarHvacManager mHvacManager;
private HashMap<HvacKey, TemperatureView> mTempComponents = new HashMap<>();
private HashMap<HvacKey, List<TemperatureView>> mTempComponents = new HashMap<>();
public HvacController(Context context) {
mContext = context;
@@ -114,18 +116,24 @@ public class HvacController {
* @param temperatureView
*/
public void addHvacTextView(TemperatureView temperatureView) {
mTempComponents.put(
new HvacKey(temperatureView.getPropertyId(), temperatureView.getAreaId()),
temperatureView);
HvacKey hvacKey = new HvacKey(temperatureView.getPropertyId(), temperatureView.getAreaId());
if (!mTempComponents.containsKey(hvacKey)) {
mTempComponents.put(hvacKey, new ArrayList<>());
}
mTempComponents.get(hvacKey).add(temperatureView);
initComponent(temperatureView);
}
private void initComponents() {
Iterator<Map.Entry<HvacKey, TemperatureView>> iterator =
Iterator<Map.Entry<HvacKey, List<TemperatureView>>> iterator =
mTempComponents.entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry<HvacKey, TemperatureView> next = iterator.next();
initComponent(next.getValue());
Map.Entry<HvacKey, List<TemperatureView>> next = iterator.next();
List<TemperatureView> temperatureViews = next.getValue();
for (TemperatureView view : temperatureViews) {
initComponent(view);
}
}
}
@@ -155,11 +163,13 @@ public class HvacController {
try {
int areaId = val.getAreaId();
int propertyId = val.getPropertyId();
TemperatureView temperatureView = mTempComponents.get(
List<TemperatureView> temperatureViews = mTempComponents.get(
new HvacKey(propertyId, areaId));
if (temperatureView != null) {
if (temperatureViews != null && !temperatureViews.isEmpty()) {
float value = (float) val.getValue();
temperatureView.setTemp(value);
for (TemperatureView tempView : temperatureViews) {
tempView.setTemp(value);
}
} // else the data is not of interest
} catch (Exception e) {
// catch all so we don't take down the sysui if a new data type is