Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mm6.0 #30

Open
wants to merge 14 commits into
base: mm6.0
Choose a base branch
from
Open

Mm6.0 #30

wants to merge 14 commits into from

Conversation

BlackDeaths
Copy link

No description provided.

* base: Allow custom density setting (1/2)

Use system property persist.sys.lcd_density to set custom density. The
custom setting affects the entire UI. It is independent of
ro.sf.lcd_density and has no effect on play store compatibility.

Code distilled from PA project via PAC project.

Conflicts:
	graphics/java/android/graphics/Bitmap.java

Change-Id: I8d26405d5d33bdf2890a0e9f67f113a4dc3e763b

* fix CTS DisplayTest.testGetMetrics()

The test asserts the second display's DPI settings are what they should
be that it creates. However, DisplayInfo.getMetricsWithSize() method was
calling updateDensity() which actually resets internal members to the
primary screen's current setup (which is persisted via a build.prop
setting).

Change-Id: I589d56e98fd76f091e3105df099e5d7efd8b853e
Signed-off-by: Roman Birg <[email protected]>

* unbreak density scaling

- Only apply density scaling to built in screens so we don't affect
overlays.

- Only apply density scaling for activities which fall under the
  'default' compatibility bucket. Some apps may  have different
  compatibility info setup (e.g. scaling) and we do not
  need to apply the user density to this activity.

Change-Id: I0b4849141cf081694aae5668ae60764e70be7db1
Signed-off-by: Roman Birg <[email protected]>

Density scaling: scale compatibility apps, wm command support

Density scaling should work across all apps and different density
configurations. It should also pass CTS.

- force compatibility density if calculated compatibility density is
  different than what the user has requested

- hook in "wm density" support, should behave the same as setting the
  density from Settings

- clean up some logic

Change-Id: I52c7c2ca200b78f9a5ee9170871ca62e1cab3bcb
Signed-off-by: Roman Birg <[email protected]>

Fix typo in density assignment.

Change-Id: I35b3860a4991ebaee70c91f3878d63b8f28d7fce

Density scaling: return device's default density

When an application requests the Display's display metrics, always
override the returned densityDpi to be the device's original density to
ensure compatibility.

Change-Id: I465d53bc189d4596aba0269f124ddc9d0d8097da
Signed-off-by: Roman Birg <[email protected]>

return default density only for primary display

Change-Id: I70b35a7f4ba77d7c5744fdcb6c19ef78de3dcb15
Signed-off-by: Roman Birg <[email protected]>

density: do not apply to virtual displays

Check the incoming configuration density to ensure that it is the same
as the device's default density before forcing preferred values.

Only apply display metrics if the display is not a presentation.

Ref: CYNGNOS-338
Change-Id: I437ac8cf45f1a6c568707e0733364b2495791d8a
Signed-off-by: Roman Birg <[email protected]>

* DisplayMetrics: set noncompat DPI as well

A lot of UI elements (especially Holo, but also Material toggles) appear
visually broken when the noncompat scale doesn't match the regular
scale.

Change-Id: I76013e4d0fce7accac1cb6b85121c94fab5872ea

* fix metrics density comparisons

In Resources.java, we explicitly call setDensity() on the local
DisplayMetircs object when there is a configuration update - which
sets some more fields than the original implementation.

In fw/b/core/java/android/app/Presentation.java there is a DisplayInfo
comparison which fails because our getMetricsWithSize() did not always
set those fields that updateConfiguration would always set.

So now we always return a DisplayMetrics object with the fields filled
out as expected.

Ref: OPO-539

Change-Id: Ie80e7a9cfd249ec59d31b4044ad09e07e34d1194
Signed-off-by: Roman Birg <[email protected]>
* base: Allow custom density setting (1/2)

Use system property persist.sys.lcd_density to set custom density. The
custom setting affects the entire UI. It is independent of
ro.sf.lcd_density and has no effect on play store compatibility.

Code distilled from PA project via PAC project.

Conflicts:
	graphics/java/android/graphics/Bitmap.java

Change-Id: I8d26405d5d33bdf2890a0e9f67f113a4dc3e763b

* fix CTS DisplayTest.testGetMetrics()

The test asserts the second display's DPI settings are what they should
be that it creates. However, DisplayInfo.getMetricsWithSize() method was
calling updateDensity() which actually resets internal members to the
primary screen's current setup (which is persisted via a build.prop
setting).

Change-Id: I589d56e98fd76f091e3105df099e5d7efd8b853e
Signed-off-by: Roman Birg <[email protected]>

* unbreak density scaling

- Only apply density scaling to built in screens so we don't affect
overlays.

- Only apply density scaling for activities which fall under the
  'default' compatibility bucket. Some apps may  have different
  compatibility info setup (e.g. scaling) and we do not
  need to apply the user density to this activity.

Change-Id: I0b4849141cf081694aae5668ae60764e70be7db1
Signed-off-by: Roman Birg <[email protected]>

Density scaling: scale compatibility apps, wm command support

Density scaling should work across all apps and different density
configurations. It should also pass CTS.

- force compatibility density if calculated compatibility density is
  different than what the user has requested

- hook in "wm density" support, should behave the same as setting the
  density from Settings

- clean up some logic

Change-Id: I52c7c2ca200b78f9a5ee9170871ca62e1cab3bcb
Signed-off-by: Roman Birg <[email protected]>

Fix typo in density assignment.

Change-Id: I35b3860a4991ebaee70c91f3878d63b8f28d7fce

Density scaling: return device's default density

When an application requests the Display's display metrics, always
override the returned densityDpi to be the device's original density to
ensure compatibility.

Change-Id: I465d53bc189d4596aba0269f124ddc9d0d8097da
Signed-off-by: Roman Birg <[email protected]>

return default density only for primary display

Change-Id: I70b35a7f4ba77d7c5744fdcb6c19ef78de3dcb15
Signed-off-by: Roman Birg <[email protected]>

density: do not apply to virtual displays

Check the incoming configuration density to ensure that it is the same
as the device's default density before forcing preferred values.

Only apply display metrics if the display is not a presentation.

Ref: CYNGNOS-338
Change-Id: I437ac8cf45f1a6c568707e0733364b2495791d8a
Signed-off-by: Roman Birg <[email protected]>

* DisplayMetrics: set noncompat DPI as well

A lot of UI elements (especially Holo, but also Material toggles) appear
visually broken when the noncompat scale doesn't match the regular
scale.

Change-Id: I76013e4d0fce7accac1cb6b85121c94fab5872ea

* fix metrics density comparisons

In Resources.java, we explicitly call setDensity() on the local
DisplayMetircs object when there is a configuration update - which
sets some more fields than the original implementation.

In fw/b/core/java/android/app/Presentation.java there is a DisplayInfo
comparison which fails because our getMetricsWithSize() did not always
set those fields that updateConfiguration would always set.

So now we always return a DisplayMetrics object with the fields filled
out as expected.

Ref: OPO-539

Change-Id: Ie80e7a9cfd249ec59d31b4044ad09e07e34d1194
Signed-off-by: Roman Birg <[email protected]>

* Show icon of package associated with Toast

For all those times you have some random app or background service
that posts a Toast and you have no idea who's posting it.  This adds
an icon badge to the top left corner of the Toast to show the app's
icon the Toast belongs to.

Change-Id: I82bf23664eea134f3b1f89ad5a99f6be73906ba8
@ghost
Copy link

ghost commented Jun 3, 2016

plz merge it , this is very importatant

* base: Allow custom density setting (1/2)

Use system property persist.sys.lcd_density to set custom density. The
custom setting affects the entire UI. It is independent of
ro.sf.lcd_density and has no effect on play store compatibility.

Code distilled from PA project via PAC project.

Conflicts:
	graphics/java/android/graphics/Bitmap.java

Change-Id: I8d26405d5d33bdf2890a0e9f67f113a4dc3e763b

* fix CTS DisplayTest.testGetMetrics()

The test asserts the second display's DPI settings are what they should
be that it creates. However, DisplayInfo.getMetricsWithSize() method was
calling updateDensity() which actually resets internal members to the
primary screen's current setup (which is persisted via a build.prop
setting).

Change-Id: I589d56e98fd76f091e3105df099e5d7efd8b853e
Signed-off-by: Roman Birg <[email protected]>

* unbreak density scaling

- Only apply density scaling to built in screens so we don't affect
overlays.

- Only apply density scaling for activities which fall under the
  'default' compatibility bucket. Some apps may  have different
  compatibility info setup (e.g. scaling) and we do not
  need to apply the user density to this activity.

Change-Id: I0b4849141cf081694aae5668ae60764e70be7db1
Signed-off-by: Roman Birg <[email protected]>

Density scaling: scale compatibility apps, wm command support

Density scaling should work across all apps and different density
configurations. It should also pass CTS.

- force compatibility density if calculated compatibility density is
  different than what the user has requested

- hook in "wm density" support, should behave the same as setting the
  density from Settings

- clean up some logic

Change-Id: I52c7c2ca200b78f9a5ee9170871ca62e1cab3bcb
Signed-off-by: Roman Birg <[email protected]>

Fix typo in density assignment.

Change-Id: I35b3860a4991ebaee70c91f3878d63b8f28d7fce

Density scaling: return device's default density

When an application requests the Display's display metrics, always
override the returned densityDpi to be the device's original density to
ensure compatibility.

Change-Id: I465d53bc189d4596aba0269f124ddc9d0d8097da
Signed-off-by: Roman Birg <[email protected]>

return default density only for primary display

Change-Id: I70b35a7f4ba77d7c5744fdcb6c19ef78de3dcb15
Signed-off-by: Roman Birg <[email protected]>

density: do not apply to virtual displays

Check the incoming configuration density to ensure that it is the same
as the device's default density before forcing preferred values.

Only apply display metrics if the display is not a presentation.

Ref: CYNGNOS-338
Change-Id: I437ac8cf45f1a6c568707e0733364b2495791d8a
Signed-off-by: Roman Birg <[email protected]>

* DisplayMetrics: set noncompat DPI as well

A lot of UI elements (especially Holo, but also Material toggles) appear
visually broken when the noncompat scale doesn't match the regular
scale.

Change-Id: I76013e4d0fce7accac1cb6b85121c94fab5872ea

* fix metrics density comparisons

In Resources.java, we explicitly call setDensity() on the local
DisplayMetircs object when there is a configuration update - which
sets some more fields than the original implementation.

In fw/b/core/java/android/app/Presentation.java there is a DisplayInfo
comparison which fails because our getMetricsWithSize() did not always
set those fields that updateConfiguration would always set.

So now we always return a DisplayMetrics object with the fields filled
out as expected.

Ref: OPO-539

Change-Id: Ie80e7a9cfd249ec59d31b4044ad09e07e34d1194
Signed-off-by: Roman Birg <[email protected]>

* SystemUI: Undo CAF telephony mess

  Keeps more of a aosp behaviour

Revert "Add support for LTE, LTE+ data icons display"

This reverts commit 0d6d29e.

Change-Id: Id05f7ce59763f5f56de94538d1b83f668a5fc73e

Revert "Fix data icon issue for LTE_CA"

This reverts commit 0985ad8.

Change-Id: Ifee19883d3a74889a5415ce38631f80ef4dc18e6

Revert "Add new roaming data icons"

This reverts commit e8e431a.

Change-Id: Iae4885afbc6821b14f1512f997818866c353923a

Revert "Roaming indication not shown on UE when camped on VPLMN"

This reverts commit 72ebf0d.

Change-Id: Id6f7553412cc4758bfef631252ddbf059f1125c2

Revert "Adding HD icon for IMS registration"

This reverts commit 79b8407.

Change-Id: I63dfb593cf712710aee434b47f8a250d410d8b4b

Revert "SystemUI: Show carrier specific network indicators"

This reverts commit a35c2d3.

Change-Id: I39f5da70dde395c1294aa14bec5a348aa25070ab

Revert "SystemUI: show "4GLTE" indicator for LTE network"

This reverts commit a74fb0a.

Conflicts:
	packages/SystemUI/res/values/config.xml

Change-Id: I1d2c843165665f2d672b33510fecb08188979be6

Revert "Frameworks: Customize network name and indicator on status bar"

This reverts commit 93d9213.

Conflicts:
	core/res/res/values/symbols.xml
	packages/SystemUI/res/values/config.xml

Change-Id: I671558a3caf996c40880a72109f097f17653cc1e

Revert "SystemUI: Provide correct resource type"

This reverts commit 36ef3e3.

Change-Id: I8ae599a0bc7798650ef557085a0519a167ecbc02

Revert "Framework: Add config for data switch"

This reverts commit 0f9ebc1.

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml

Change-Id: I7ea212275b4c765c9afdc634145e7cac92b531c3

Revert "SystemUI: Support display for radio tech"

This reverts commit 3259cb7.

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

Change-Id: Idf5bf2c4f51bb33626ba27ee36947195c70e5f2e

Revert "SystemUI: Customize StatusBar for Chinese carrier"

This reverts commit 75e20b5.

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java

Change-Id: Iff733c62b7ae3a47281cd224b63a9d526a931898

Revert "SystemUI: show "4G" indicator for HSPA+ network"

This reverts commit bd7ff5c.

Conflicts:
	packages/SystemUI/res/values/config.xml

Change-Id: I10f984c7fd68d8ca2c3f720193ea04a5eefcf681

Revert "Statusbar: Add customized icons for Chinese carrier"

This reverts commit b734a52.

Change-Id: Ia3475f3adf250bb01114a26e53566363aceb7d83

Revert "SystemUI: Show carrier info when SIM is NOT_READY state"

This reverts commit 100f65f.

Change-Id: Iaeddd91ebf3b7970da2f0da7fb8d16616ac4a6d3

* Show icon of package associated with Toast

For all those times you have some random app or background service
that posts a Toast and you have no idea who's posting it.  This adds
an icon badge to the top left corner of the Toast to show the app's
icon the Toast belongs to.

Change-Id: I82bf23664eea134f3b1f89ad5a99f6be73906ba8

* Add helper functions for slim actions

Change-Id: Id33bf9d68b43254d20eeab9aee6afe5f05237925

* [2/2] base: add SystemSettingSwitchPreference

Factor out preference-in-storage check to overridable method.

Fixes SecureSettingSwitchPreference & SettingSwitchPreference in packages_apps_Settings (isPersisted)

Change-Id: I2fff3192802f8a180330fda66388eda394334a5a
* base: Allow custom density setting (1/2)

Use system property persist.sys.lcd_density to set custom density. The
custom setting affects the entire UI. It is independent of
ro.sf.lcd_density and has no effect on play store compatibility.

Code distilled from PA project via PAC project.

Conflicts:
	graphics/java/android/graphics/Bitmap.java

Change-Id: I8d26405d5d33bdf2890a0e9f67f113a4dc3e763b

* fix CTS DisplayTest.testGetMetrics()

The test asserts the second display's DPI settings are what they should
be that it creates. However, DisplayInfo.getMetricsWithSize() method was
calling updateDensity() which actually resets internal members to the
primary screen's current setup (which is persisted via a build.prop
setting).

Change-Id: I589d56e98fd76f091e3105df099e5d7efd8b853e
Signed-off-by: Roman Birg <[email protected]>

* unbreak density scaling

- Only apply density scaling to built in screens so we don't affect
overlays.

- Only apply density scaling for activities which fall under the
  'default' compatibility bucket. Some apps may  have different
  compatibility info setup (e.g. scaling) and we do not
  need to apply the user density to this activity.

Change-Id: I0b4849141cf081694aae5668ae60764e70be7db1
Signed-off-by: Roman Birg <[email protected]>

Density scaling: scale compatibility apps, wm command support

Density scaling should work across all apps and different density
configurations. It should also pass CTS.

- force compatibility density if calculated compatibility density is
  different than what the user has requested

- hook in "wm density" support, should behave the same as setting the
  density from Settings

- clean up some logic

Change-Id: I52c7c2ca200b78f9a5ee9170871ca62e1cab3bcb
Signed-off-by: Roman Birg <[email protected]>

Fix typo in density assignment.

Change-Id: I35b3860a4991ebaee70c91f3878d63b8f28d7fce

Density scaling: return device's default density

When an application requests the Display's display metrics, always
override the returned densityDpi to be the device's original density to
ensure compatibility.

Change-Id: I465d53bc189d4596aba0269f124ddc9d0d8097da
Signed-off-by: Roman Birg <[email protected]>

return default density only for primary display

Change-Id: I70b35a7f4ba77d7c5744fdcb6c19ef78de3dcb15
Signed-off-by: Roman Birg <[email protected]>

density: do not apply to virtual displays

Check the incoming configuration density to ensure that it is the same
as the device's default density before forcing preferred values.

Only apply display metrics if the display is not a presentation.

Ref: CYNGNOS-338
Change-Id: I437ac8cf45f1a6c568707e0733364b2495791d8a
Signed-off-by: Roman Birg <[email protected]>

* DisplayMetrics: set noncompat DPI as well

A lot of UI elements (especially Holo, but also Material toggles) appear
visually broken when the noncompat scale doesn't match the regular
scale.

Change-Id: I76013e4d0fce7accac1cb6b85121c94fab5872ea

* fix metrics density comparisons

In Resources.java, we explicitly call setDensity() on the local
DisplayMetircs object when there is a configuration update - which
sets some more fields than the original implementation.

In fw/b/core/java/android/app/Presentation.java there is a DisplayInfo
comparison which fails because our getMetricsWithSize() did not always
set those fields that updateConfiguration would always set.

So now we always return a DisplayMetrics object with the fields filled
out as expected.

Ref: OPO-539

Change-Id: Ie80e7a9cfd249ec59d31b4044ad09e07e34d1194
Signed-off-by: Roman Birg <[email protected]>

* SystemUI: Undo CAF telephony mess

  Keeps more of a aosp behaviour

Revert "Add support for LTE, LTE+ data icons display"

This reverts commit 0d6d29e.

Change-Id: Id05f7ce59763f5f56de94538d1b83f668a5fc73e

Revert "Fix data icon issue for LTE_CA"

This reverts commit 0985ad8.

Change-Id: Ifee19883d3a74889a5415ce38631f80ef4dc18e6

Revert "Add new roaming data icons"

This reverts commit e8e431a.

Change-Id: Iae4885afbc6821b14f1512f997818866c353923a

Revert "Roaming indication not shown on UE when camped on VPLMN"

This reverts commit 72ebf0d.

Change-Id: Id6f7553412cc4758bfef631252ddbf059f1125c2

Revert "Adding HD icon for IMS registration"

This reverts commit 79b8407.

Change-Id: I63dfb593cf712710aee434b47f8a250d410d8b4b

Revert "SystemUI: Show carrier specific network indicators"

This reverts commit a35c2d3.

Change-Id: I39f5da70dde395c1294aa14bec5a348aa25070ab

Revert "SystemUI: show "4GLTE" indicator for LTE network"

This reverts commit a74fb0a.

Conflicts:
	packages/SystemUI/res/values/config.xml

Change-Id: I1d2c843165665f2d672b33510fecb08188979be6

Revert "Frameworks: Customize network name and indicator on status bar"

This reverts commit 93d9213.

Conflicts:
	core/res/res/values/symbols.xml
	packages/SystemUI/res/values/config.xml

Change-Id: I671558a3caf996c40880a72109f097f17653cc1e

Revert "SystemUI: Provide correct resource type"

This reverts commit 36ef3e3.

Change-Id: I8ae599a0bc7798650ef557085a0519a167ecbc02

Revert "Framework: Add config for data switch"

This reverts commit 0f9ebc1.

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml

Change-Id: I7ea212275b4c765c9afdc634145e7cac92b531c3

Revert "SystemUI: Support display for radio tech"

This reverts commit 3259cb7.

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

Change-Id: Idf5bf2c4f51bb33626ba27ee36947195c70e5f2e

Revert "SystemUI: Customize StatusBar for Chinese carrier"

This reverts commit 75e20b5.

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java

Change-Id: Iff733c62b7ae3a47281cd224b63a9d526a931898

Revert "SystemUI: show "4G" indicator for HSPA+ network"

This reverts commit bd7ff5c.

Conflicts:
	packages/SystemUI/res/values/config.xml

Change-Id: I10f984c7fd68d8ca2c3f720193ea04a5eefcf681

Revert "Statusbar: Add customized icons for Chinese carrier"

This reverts commit b734a52.

Change-Id: Ia3475f3adf250bb01114a26e53566363aceb7d83

Revert "SystemUI: Show carrier info when SIM is NOT_READY state"

This reverts commit 100f65f.

Change-Id: Iaeddd91ebf3b7970da2f0da7fb8d16616ac4a6d3

* Show icon of package associated with Toast

For all those times you have some random app or background service
that posts a Toast and you have no idea who's posting it.  This adds
an icon badge to the top left corner of the Toast to show the app's
icon the Toast belongs to.

Change-Id: I82bf23664eea134f3b1f89ad5a99f6be73906ba8

* Add helper functions for slim actions

Change-Id: Id33bf9d68b43254d20eeab9aee6afe5f05237925

* [2/2] base: add SystemSettingSwitchPreference

Factor out preference-in-storage check to overridable method.

Fixes SecureSettingSwitchPreference & SettingSwitchPreference in packages_apps_Settings (isPersisted)

Change-Id: I2fff3192802f8a180330fda66388eda394334a5a
@NoSpamDan
Copy link

Please submit to our Gerrit at https://review.slimroms.org

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants