Merge lp://qastaging/~mterry/dialer-app/no-ubuntu-colors into lp://qastaging/dialer-app
| Status: | Needs review | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~mterry/dialer-app/no-ubuntu-colors | ||||
| Merge into: | lp://qastaging/dialer-app | ||||
| Diff against target: |
378 lines (+31/-38) 17 files modified
src/qml/DialerPage/CallButton.qml (+2/-2) src/qml/DialerPage/CustomButton.qml (+1/-1) src/qml/DialerPage/DialerPage.qml (+2/-2) src/qml/DialerPage/KeypadButton.qml (+2/-2) src/qml/DialerPage/KeypadEntry.qml (+3/-3) src/qml/Dialogs/DisableFlightModeDialog.qml (+1/-2) src/qml/Dialogs/NoDefaultSIMCardDialog.qml (+1/-3) src/qml/Dialogs/NotificationDialog.qml (+0/-1) src/qml/Dialogs/SetDefaultSIMCardDialog.qml (+1/-2) src/qml/Dialogs/SimLockedDialog.qml (+3/-3) src/qml/HistoryPage/HistoryDelegate.qml (+1/-1) src/qml/HistoryPage/HistoryDetailsPage.qml (+2/-2) src/qml/HistoryPage/SwipeItemDemo.qml (+2/-2) src/qml/LiveCallPage/ConferenceCallDisplay.qml (+3/-3) src/qml/LiveCallPage/HangupButton.qml (+2/-4) src/qml/LiveCallPage/LiveCall.qml (+4/-4) src/qml/LiveCallPage/MultiCallDisplay.qml (+1/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~mterry/dialer-app/no-ubuntu-colors | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Pending | |
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
Commit message
Fix colors to use theme colors more consistently.
Description of the change
See bug 1581047 for full rationale.
Here is a list of potentially noticeable changes:
- Orange buttons are now green.
- Some less important buttons that were orange are now neutral grey: DisableFlightMo
- Call button went from a dark green to theme green.
- Hangup button no longer changes to half-opacity orange when pressed. Instead it simply changes to half-opacity theme red. Didn't seem necessary to also change color on top of opacity when pressing.
- KeypadEntry cursor went from orange to blue, the new theme color for text cursors.
- Unrelated to color, but I was right there, so... SimLockedDialog's Ok button is now spelled OK. (OK and Okay are words, Ok is not.)
And some less noticeable changes:
- Simply switching hard-coded names to theme equivalents (like darkGrey to backgroundSecon
- Small changes like off-brand "red" to theme red
Unmerged revisions
- 532. By Michael Terry
-
Don't change color of button sublabels
- 531. By Michael Terry
-
Don't use UbuntuColors
