PauloftheWest
1d0667a07b
am 50bbce77: am cbf347c4: am 794cbd70: Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev
...
* commit '50bbce771324a264f720e402615fe6555b6c6e3b':
Changed SIM lock toggle to a switch
2014-12-03 00:29:33 +00:00
PauloftheWest
50bbce7713
am cbf347c4: am 794cbd70: Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev
...
* commit 'cbf347c42d06e27785ccde70763a2c4dbc45542d':
Changed SIM lock toggle to a switch
2014-12-02 21:34:58 +00:00
PauloftheWest
794cbd70fa
Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev
2014-12-02 21:19:52 +00:00
PauloftheWest
5754547733
am b07cd343: am 3fd2fa7b: am 003aee5f: Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev
...
* commit 'b07cd343158e5726487f360c55bcbeb654263b99':
Bug Fix: SIM Status will display the proper network type
2014-12-02 20:22:55 +00:00
PauloftheWest
b07cd34315
am 3fd2fa7b: am 003aee5f: Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev
...
* commit '3fd2fa7b96a72f63afd9e4495fde4d31fa42edd5':
Bug Fix: SIM Status will display the proper network type
2014-12-02 20:15:25 +00:00
PauloftheWest
003aee5f0a
Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev
2014-12-02 20:01:40 +00:00
PauloftheWest
6fc9207ebe
Bug Fix: SIM Status will display the proper network type
...
Bug: 18414792
Change-Id: I41f838ab95eaf9d546e59c9e2a793bbab393cb27
2014-12-02 11:59:17 -08:00
Simranjit Singh Kohli
31a262e739
am eeaf8608: am 04f2391d: am 61066c13: Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev
...
* commit 'eeaf8608d3892337cd47635e4b6ba80c7ca7852b':
[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API
2014-12-02 19:40:21 +00:00
Simranjit Singh Kohli
eeaf8608d3
am 04f2391d: am 61066c13: Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev
...
* commit '04f2391d17ce994b6d1da5907c7b5010621091b2':
[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API
2014-12-02 19:31:26 +00:00
Simranjit Singh Kohli
61066c13ed
Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev
2014-12-02 19:09:01 +00:00
PauloftheWest
b1178d36a6
am 96ba998a: am 99348d69: am da02111f: Merge "Added color to Data Usage graph" into lmp-mr1-dev
...
* commit '96ba998a0b8d03cab6fa8558a0bfe3487de97158':
Added color to Data Usage graph
2014-12-02 18:19:48 +00:00
PauloftheWest
3969b6b7b2
am c33b2ee3: am f28bd654: am fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev
...
* commit 'c33b2ee31acffd9a729351452f5f0d3bbec87dba':
Fixed a Wi-Fi dialog crash
2014-12-02 18:19:47 +00:00
PauloftheWest
96ba998a0b
am 99348d69: am da02111f: Merge "Added color to Data Usage graph" into lmp-mr1-dev
...
* commit '99348d6911ec15d9a93a2ce72b9c276929789499':
Added color to Data Usage graph
2014-12-02 18:12:22 +00:00
PauloftheWest
c33b2ee31a
am f28bd654: am fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev
...
* commit 'f28bd654620102de2408383b9bba5114a9556267':
Fixed a Wi-Fi dialog crash
2014-12-02 18:12:21 +00:00
PauloftheWest
da02111f16
Merge "Added color to Data Usage graph" into lmp-mr1-dev
2014-12-02 17:58:47 +00:00
PauloftheWest
fc6a8bf2d7
Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev
2014-12-02 17:58:24 +00:00
Maurice Lam
2bb84de81f
am 62009bf8: am a2caf633: am 1dce16a6: Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev
...
* commit '62009bf8564accddf97ef3dbf6c90ae9286ea07c':
[WifiSetup] Swap buttons position in Skip dialog
2014-12-02 06:46:56 +00:00
Maurice Lam
62009bf856
am a2caf633: am 1dce16a6: Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev
...
* commit 'a2caf6332f2b55e1480724d025ffb7592dcd13f7':
[WifiSetup] Swap buttons position in Skip dialog
2014-12-02 03:12:18 +00:00
Maurice Lam
1dce16a61c
Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev
2014-12-02 02:59:10 +00:00
Maurice Lam
fcdc4dd32c
am 72b29f9b: am 86f184b3: am 6b19fa90: [FRP] Theming for Pattern and Password screens
...
* commit '72b29f9b7f6e9a0c0b9f8313df8897b29481292e':
[FRP] Theming for Pattern and Password screens
2014-12-02 01:35:45 +00:00
Maurice Lam
72b29f9b7f
am 86f184b3: am 6b19fa90: [FRP] Theming for Pattern and Password screens
...
* commit '86f184b3d66af3db1302471c44441e1d2dc1867e':
[FRP] Theming for Pattern and Password screens
2014-12-02 01:13:08 +00:00
Maurice Lam
6b19fa9017
[FRP] Theming for Pattern and Password screens
...
Basic theming for pattern and password screens. Create subclasses for
ChooseLockPassword and ChooseLockPattern, and copied their XML
layouts.
This CL mainly uses the buttons in the original screens as-is, with a
follow-up CL coming to change to use the nav bar buttons.
Bug: 18482708
Change-Id: I81751f781de633aff23fc68657589360007c235a
2014-12-01 16:18:27 -08:00
Maurice Lam
ab4fb49ab1
[WifiSetup] Swap buttons position in Skip dialog
...
According to material-spec, buttons that keep users in the same
screen should be on the left (negative button) while button that
intorduce changes should be on the right, even if the action is
destructive.
Bug: 18542108
Change-Id: I335f83c6bb810cd43aeda28566baacea39435c57
2014-12-01 12:09:10 -08:00
John Spurlock
efa9cfadd7
am 9b63186b: am 647bb8ff: am c868f703: Settings: Improve inline volume sliders.
...
* commit '9b63186b1f6b4bbfdb0ac8a33bccb70b3dd4b2e4':
Settings: Improve inline volume sliders.
2014-12-01 20:00:02 +00:00
John Spurlock
9f044dc8a4
am 99e6086b: am c5c0edae: am 7da7c222: Merge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev
...
* commit '99e6086bcdb16d65cb4016879c682077ef5d2a76':
Settings: Restart volumizers explicitly on resume.
2014-12-01 20:00:01 +00:00
John Spurlock
9b63186b1f
am 647bb8ff: am c868f703: Settings: Improve inline volume sliders.
...
* commit '647bb8ff7586f2157d6efbd872494109f0eb6139':
Settings: Improve inline volume sliders.
2014-12-01 19:48:00 +00:00
John Spurlock
99e6086bcd
am c5c0edae: am 7da7c222: Merge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev
...
* commit 'c5c0edae5804b813a4f1548574f72d7c2097cc7e':
Settings: Restart volumizers explicitly on resume.
2014-12-01 19:46:52 +00:00
John Spurlock
c868f7035a
Settings: Improve inline volume sliders.
...
- Track framework changes to show mute states for non-ringer streams
- Update vibrate icon in sync with other system components.
Depends on:
Ie2df52edb070055ef59c74039162a0e785d2fdbb
Bug: 17899613
Change-Id: Ib38c86600693e0f36fe72deb231ea751e0486af7
2014-12-01 11:58:25 -05:00
John Spurlock
7da7c2220d
Merge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev
2014-12-01 14:57:54 +00:00
Maurice Lam
66e911fb02
am edfc6a0a: am 628e89e9: am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev
...
* commit 'edfc6a0a5fb4d371272e4b4c80de22c4ff346214':
[Setup] Theme ChooseLockGeneric for setup wizard
2014-11-26 19:56:48 +00:00
Maurice Lam
edfc6a0a5f
am 628e89e9: am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev
...
* commit '628e89e94580cd0734fe9aa85065e58021e8e9d8':
[Setup] Theme ChooseLockGeneric for setup wizard
2014-11-26 18:42:34 +00:00
John Spurlock
04b2e7957d
Settings: Restart volumizers explicitly on resume.
...
onBindView is no longer called in all cases, so use
onResume as an additional signal that the user returned
to the settings page. onActivityStop is called in both
cases to cleanup.
Bug: 17461564
Change-Id: I73a6775260951d4fd82ca8c3d8eb852f8dcc7452
2014-11-26 11:08:43 -05:00
Maurice Lam
3f9d8b60ca
Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev
2014-11-26 01:15:36 +00:00
Maurice Lam
52c75baa12
[Setup] Theme ChooseLockGeneric for setup wizard
...
This is step one of theming the set-up lock screen flow to match the
setup wizard theme. This shows the general approach of creating a
subclass of both the activity and fragment and overriding methods to
achieve the desired behavior for setup.
ag/594000 is a much more comprehensive change for what the final
change will look like.
Bug: 18482708
Change-Id: Idff34937f39f46a0c488df2cae4c46155b80cab7
2014-11-25 16:52:10 -08:00
Fabrice Di Meglio
09d2763715
Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev
2014-11-26 00:31:50 +00:00
Fabrice Di Meglio
5de7509927
am d5a4dae8: am c5aa905a: Merge "IllegalStateException fixed in print service settings"
...
* commit 'd5a4dae8d8f16a42c32b4c0e63e4b1abbe7374e5':
IllegalStateException fixed in print service settings
2014-11-25 23:26:59 +00:00
Fabrice Di Meglio
d5a4dae8d8
am c5aa905a: Merge "IllegalStateException fixed in print service settings"
...
* commit 'c5aa905a31e48fdeb52a8591ebb018ff161d57ad':
IllegalStateException fixed in print service settings
2014-11-25 23:23:16 +00:00
Raju Yadav
21dba1f0e7
IllegalStateException fixed in print service settings
...
Settings crashed due to IllegalStateException
as OnQueryTextListener refers to an already
detached view. The listener is set to null
on press of home key (onPause).
Change-Id: I96052f95689ae17dd1b4e9d1c313100b7b47a599
2014-11-25 15:08:14 -08:00
PauloftheWest
ae680e3c67
Fixed a Wi-Fi dialog crash
...
Bug: 18498974
Change-Id: I00ba9828c4f15cefd143fc1c92e1c81f43e91c95
2014-11-25 12:27:07 -08:00
Adrian Roos
b00bf5b690
am 9fc6bf3f: am b3e88b6e: am 647f9752: Merge "Don\'t show RedactionInterstitial when changing password" into lmp-mr1-dev
...
* commit '9fc6bf3f3776fae1bcb8175b61e2c38744941312':
Don't show RedactionInterstitial when changing password
2014-11-25 18:57:18 +00:00
Adrian Roos
9fc6bf3f37
am b3e88b6e: am 647f9752: Merge "Don\'t show RedactionInterstitial when changing password" into lmp-mr1-dev
...
* commit 'b3e88b6e209992b5ce8dabfb95bb5dfb6aa79425':
Don't show RedactionInterstitial when changing password
2014-11-25 18:45:43 +00:00
Paul Crowley
15ad1bd3b0
am 1abdd7c9: am 7bd78237: am 95a28c3f: Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev
...
* commit '1abdd7c98137b9b1c4172f2247a2cae37117b262':
Reduce number of attempts before factory reset to 30.
2014-11-25 15:21:44 +00:00
Selim Cinek
bde3966a82
am 51a36c67: am 2a65b1b1: am 44b50ad3: Merge "Fixed build breakage due to api change." into lmp-mr1-dev
...
* commit '51a36c67666abd40188fdd182192a78c436c349e':
Fixed build breakage due to api change.
2014-11-25 15:21:43 +00:00
Zoltan Szatmary-Ban
0dccb9091b
am 7a2e5f1b: am 4a30d627: am 6ad85792: Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev
...
* commit '7a2e5f1b0370ce2f84b298659d3220ae592b1f74':
Stop background processes if TrustedCredentialSettings fragment gets detached
2014-11-25 15:21:41 +00:00
Paul Crowley
1abdd7c981
am 7bd78237: am 95a28c3f: Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev
...
* commit '7bd7823758fa88c295858466a0ffd5f5468a1452':
Reduce number of attempts before factory reset to 30.
2014-11-25 15:08:33 +00:00
Selim Cinek
51a36c6766
am 2a65b1b1: am 44b50ad3: Merge "Fixed build breakage due to api change." into lmp-mr1-dev
...
* commit '2a65b1b105b6b1b0ea8f8b82df6833f2eadca5bd':
Fixed build breakage due to api change.
2014-11-25 15:08:14 +00:00
Zoltan Szatmary-Ban
7a2e5f1b03
am 4a30d627: am 6ad85792: Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev
...
* commit '4a30d627a25f2e6cf3d699c4949919aae7ca7063':
Stop background processes if TrustedCredentialSettings fragment gets detached
2014-11-25 15:08:02 +00:00
Adrian Roos
647f9752ce
Merge "Don't show RedactionInterstitial when changing password" into lmp-mr1-dev
2014-11-25 15:00:00 +00:00
PauloftheWest
c80b7616ca
Added color to Data Usage graph
...
+ Fixed some issues with displaying multiple SIMs in Data Usage.
Bug: 18466592
Bug: 18291246
Change-Id: I77417be995761ce62e464c7d21a34af1334aac17
2014-11-25 04:58:22 -08:00
Raju Yadav
7468085405
IllegalStateException fixed in print service settings
...
Settings crashed due to IllegalStateException
as OnQueryTextListener refers to an already
detached view. The listener is set to null
on press of home key (onPause).
Change-Id: If9c76fe3ff040c295f0af9c092e8824b9a1371d7
2014-11-25 13:26:42 +01:00