Merge "Add transient taskbar sizing for twoPanel devices." into tm-qpr-dev
This commit is contained in:
commit
01e90b7787
5 files changed
+18
-6
No files matched your search
@@ -270,9 +270,11 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
|
||||
}
|
||||
|
||||
private void updateIconSize(Resources resources) {
|
||||
float taskbarIconSize = DisplayController.isTransientTaskbar(this)
|
||||
? resources.getDimension(R.dimen.transient_taskbar_icon_size)
|
||||
: resources.getDimension(R.dimen.taskbar_icon_size);
|
||||
float taskbarIconSize = resources.getDimension(DisplayController.isTransientTaskbar(this)
|
||||
? mDeviceProfile.isTwoPanels
|
||||
? R.dimen.transient_taskbar_two_panels_icon_size
|
||||
: R.dimen.transient_taskbar_icon_size
|
||||
: R.dimen.taskbar_icon_size);
|
||||
mDeviceProfile.updateIconSize(1, resources);
|
||||
float iconScale = taskbarIconSize / mDeviceProfile.iconSizePx;
|
||||
mDeviceProfile.updateIconSize(iconScale, resources);
|
||||
@@ -681,7 +683,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
|
||||
}
|
||||
|
||||
if (DisplayController.isTransientTaskbar(this)) {
|
||||
return resources.getDimensionPixelSize(R.dimen.transient_taskbar_size)
|
||||
int taskbarSize = resources.getDimensionPixelSize(mDeviceProfile.isTwoPanels
|
||||
? R.dimen.transient_taskbar_two_panels_size
|
||||
: R.dimen.transient_taskbar_size);
|
||||
return taskbarSize
|
||||
+ (2 * resources.getDimensionPixelSize(R.dimen.transient_taskbar_margin))
|
||||
+ resources.getDimensionPixelSize(R.dimen.transient_taskbar_shadow_blur);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user