OSDN Git Service
Maurice Lam [Wed, 3 Dec 2014 21:52:23 +0000 (21:52 +0000)]
am
2ecc0107: am
94c85309: am
7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev
* commit '
2ecc0107dcc939bd4e3b9f4c4359f9845cae1b82':
[FRP] Theme interstitials for lock screen setup
Baligh Uddin [Wed, 3 Dec 2014 21:52:22 +0000 (21:52 +0000)]
am
38fa4d01: (-s ours) am
47be93e9: (-s ours) am
18701587: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
38fa4d01c5ce9981026386d7328aab0c32fe7eb8':
Import translations. DO NOT MERGE
Maurice Lam [Wed, 3 Dec 2014 20:40:02 +0000 (20:40 +0000)]
am
94c85309: am
7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev
* commit '
94c85309b297e5c63d54b9a76f27e9119779411e':
[FRP] Theme interstitials for lock screen setup
Baligh Uddin [Wed, 3 Dec 2014 20:40:01 +0000 (20:40 +0000)]
am
47be93e9: (-s ours) am
18701587: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
47be93e97a238cb02766517d554ea704e72731fc':
Import translations. DO NOT MERGE
Maurice Lam [Wed, 3 Dec 2014 02:28:58 +0000 (02:28 +0000)]
am
7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev
* commit '
7b484b9af07aa92c530312507ee9a8ea85b00198':
[FRP] Theme interstitials for lock screen setup
Baligh Uddin [Wed, 3 Dec 2014 02:28:57 +0000 (02:28 +0000)]
am
18701587: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
187015873210af2923167d30f387e6d33fe01889':
Import translations. DO NOT MERGE
Maurice Lam [Wed, 3 Dec 2014 01:27:55 +0000 (01:27 +0000)]
Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:26:31 +0000 (01:26 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:01:39 +0000 (17:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: If02762d2b4f971f8ad83922eade1a2a8b85adca8
Auto-generated-cl: translation import
Lucky Zhang [Wed, 3 Dec 2014 00:32:01 +0000 (00:32 +0000)]
am
23ab054d: am
955f412c: am
91177d1c: Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev
* commit '
23ab054dd94a639ca43e011b931eb12c5122c596':
[FRP] Show FRP warning when disabling secure unlock
PauloftheWest [Wed, 3 Dec 2014 00:29:33 +0000 (00:29 +0000)]
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
Lucky Zhang [Wed, 3 Dec 2014 00:01:31 +0000 (00:01 +0000)]
am
955f412c: am
91177d1c: Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev
* commit '
955f412c4ba854c965f2aaf7ba96b4cda43b99b9':
[FRP] Show FRP warning when disabling secure unlock
Lucky Zhang [Tue, 2 Dec 2014 23:53:07 +0000 (23:53 +0000)]
am
91177d1c: Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev
* commit '
91177d1c1668d4efcffb69cc4cf9bf8bb7c96f19':
[FRP] Show FRP warning when disabling secure unlock
Lucky Zhang [Tue, 2 Dec 2014 23:45:55 +0000 (23:45 +0000)]
Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 21:34:58 +0000 (21:34 +0000)]
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
PauloftheWest [Tue, 2 Dec 2014 21:27:43 +0000 (21:27 +0000)]
am
794cbd70: Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev
* commit '
794cbd70fa3d101b1a8a587faf327c7700c946eb':
Changed SIM lock toggle to a switch
PauloftheWest [Tue, 2 Dec 2014 21:19:51 +0000 (21:19 +0000)]
Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 20:22:55 +0000 (20:22 +0000)]
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
PauloftheWest [Tue, 2 Dec 2014 20:15:25 +0000 (20:15 +0000)]
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
PauloftheWest [Tue, 2 Dec 2014 20:08:06 +0000 (20:08 +0000)]
am
003aee5f: Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev
* commit '
003aee5f0adfde950407380a5c738ed4bc59bf2b':
Bug Fix: SIM Status will display the proper network type
PauloftheWest [Tue, 2 Dec 2014 20:01:39 +0000 (20:01 +0000)]
Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev
PauloftheWest [Tue, 25 Nov 2014 20:15:35 +0000 (12:15 -0800)]
Bug Fix: SIM Status will display the proper network type
Bug:
18414792
Change-Id: I41f838ab95eaf9d546e59c9e2a793bbab393cb27
Simranjit Singh Kohli [Tue, 2 Dec 2014 19:40:21 +0000 (19:40 +0000)]
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
Simranjit Singh Kohli [Tue, 2 Dec 2014 19:31:26 +0000 (19:31 +0000)]
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
Simranjit Singh Kohli [Tue, 2 Dec 2014 19:18:50 +0000 (19:18 +0000)]
am
61066c13: Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev
* commit '
61066c13ed5ba493c58c76d84f489a35dc5af8d1':
[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API
Simranjit Singh Kohli [Tue, 2 Dec 2014 19:09:00 +0000 (19:09 +0000)]
Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 18:19:48 +0000 (18:19 +0000)]
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
PauloftheWest [Tue, 2 Dec 2014 18:19:47 +0000 (18:19 +0000)]
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
PauloftheWest [Tue, 2 Dec 2014 18:12:22 +0000 (18:12 +0000)]
am
99348d69: am
da02111f: Merge "Added color to Data Usage graph" into lmp-mr1-dev
* commit '
99348d6911ec15d9a93a2ce72b9c276929789499':
Added color to Data Usage graph
PauloftheWest [Tue, 2 Dec 2014 18:12:21 +0000 (18:12 +0000)]
am
f28bd654: am
fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev
* commit '
f28bd654620102de2408383b9bba5114a9556267':
Fixed a Wi-Fi dialog crash
PauloftheWest [Tue, 2 Dec 2014 18:12:01 +0000 (18:12 +0000)]
am
506607d1: am
21316f1d: am
41c29625: Merge "Remove extraneous SIM status information" into lmp-mr1-dev
* commit '
506607d1f8c9b05b230e3031e41c2d97f1c78e28':
Remove extraneous SIM status information
PauloftheWest [Tue, 2 Dec 2014 18:04:43 +0000 (18:04 +0000)]
am
da02111f: Merge "Added color to Data Usage graph" into lmp-mr1-dev
* commit '
da02111f16b7d2b09fb447342a9aa4640c75a117':
Added color to Data Usage graph
PauloftheWest [Tue, 2 Dec 2014 18:04:42 +0000 (18:04 +0000)]
am
fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev
* commit '
fc6a8bf2d729ad21fa8d7622f580401db351c269':
Fixed a Wi-Fi dialog crash
PauloftheWest [Tue, 2 Dec 2014 18:04:15 +0000 (18:04 +0000)]
am
21316f1d: am
41c29625: Merge "Remove extraneous SIM status information" into lmp-mr1-dev
* commit '
21316f1d1aedaffbd9f882f4cecdf518e8521212':
Remove extraneous SIM status information
PauloftheWest [Tue, 2 Dec 2014 17:58:46 +0000 (17:58 +0000)]
Merge "Added color to Data Usage graph" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 17:58:23 +0000 (17:58 +0000)]
Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 17:56:08 +0000 (17:56 +0000)]
am
41c29625: Merge "Remove extraneous SIM status information" into lmp-mr1-dev
* commit '
41c2962552b750a8e5fa07f283ba2b72b36d2298':
Remove extraneous SIM status information
PauloftheWest [Tue, 2 Dec 2014 17:50:30 +0000 (17:50 +0000)]
Merge "Remove extraneous SIM status information" into lmp-mr1-dev
Maurice Lam [Tue, 2 Dec 2014 06:46:56 +0000 (06:46 +0000)]
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
Maurice Lam [Mon, 1 Dec 2014 18:41:49 +0000 (10:41 -0800)]
[FRP] Theme interstitials for lock screen setup
Use the setup wizard theme for EncryptionInterstital and
RedactionInterstitial as they will show during the lock screen setup
as part of setup wizard.
Bug:
18482708
Change-Id: I65c8924952345a4e17fcf4ffb7d68df53244c5d7
Maurice Lam [Tue, 2 Dec 2014 03:12:18 +0000 (03:12 +0000)]
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
Maurice Lam [Tue, 2 Dec 2014 03:06:02 +0000 (03:06 +0000)]
am
1dce16a6: Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev
* commit '
1dce16a61c65ec9c1dd870edbd6dd3ef5d7ca703':
[WifiSetup] Swap buttons position in Skip dialog
Maurice Lam [Tue, 2 Dec 2014 02:59:09 +0000 (02:59 +0000)]
Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev
Lucky Zhang [Wed, 26 Nov 2014 02:22:14 +0000 (18:22 -0800)]
[FRP] Show FRP warning when disabling secure unlock
Added a dialog fragment to display warning message about disabling
device protection features when changing from a secure unlock
method to an insecure one.
Bug:
18509782
Change-Id: I0eaa9ff55c14092d8b3361d10da8b4530dd79bee
Maurice Lam [Tue, 2 Dec 2014 01:35:45 +0000 (01:35 +0000)]
am
72b29f9b: am
86f184b3: am
6b19fa90: [FRP] Theming for Pattern and Password screens
* commit '
72b29f9b7f6e9a0c0b9f8313df8897b29481292e':
[FRP] Theming for Pattern and Password screens
Maurice Lam [Tue, 2 Dec 2014 01:13:08 +0000 (01:13 +0000)]
am
86f184b3: am
6b19fa90: [FRP] Theming for Pattern and Password screens
* commit '
86f184b3d66af3db1302471c44441e1d2dc1867e':
[FRP] Theming for Pattern and Password screens
Maurice Lam [Tue, 2 Dec 2014 01:04:39 +0000 (01:04 +0000)]
am
6b19fa90: [FRP] Theming for Pattern and Password screens
* commit '
6b19fa9017800b94c75238339a337fd8f6c3e808':
[FRP] Theming for Pattern and Password screens
Maurice Lam [Wed, 26 Nov 2014 03:25:56 +0000 (19:25 -0800)]
[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
Maurice Lam [Mon, 1 Dec 2014 20:09:10 +0000 (12:09 -0800)]
[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
John Spurlock [Mon, 1 Dec 2014 20:00:02 +0000 (20:00 +0000)]
am
9b63186b: am
647bb8ff: am
c868f703: Settings: Improve inline volume sliders.
* commit '
9b63186b1f6b4bbfdb0ac8a33bccb70b3dd4b2e4':
Settings: Improve inline volume sliders.
John Spurlock [Mon, 1 Dec 2014 20:00:01 +0000 (20:00 +0000)]
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.
Geoff Mendal [Mon, 1 Dec 2014 19:59:59 +0000 (19:59 +0000)]
am
8b88bcc7: (-s ours) am
80e4465b: (-s ours) am
80986508: (-s ours) Import translations. DO NOT MERGE
* commit '
8b88bcc7513cdbf0c965cab7596bea39cb6a4405':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 19:59:58 +0000 (19:59 +0000)]
am
bfc2bfb5: (-s ours) am
3c1449d9: (-s ours) Import translations. DO NOT MERGE
* commit '
bfc2bfb5b6b7aa84fef6ce903dc8e9f1f10753c8':
Import translations. DO NOT MERGE
John Spurlock [Mon, 1 Dec 2014 19:48:00 +0000 (19:48 +0000)]
am
647bb8ff: am
c868f703: Settings: Improve inline volume sliders.
* commit '
647bb8ff7586f2157d6efbd872494109f0eb6139':
Settings: Improve inline volume sliders.
John Spurlock [Mon, 1 Dec 2014 19:46:52 +0000 (19:46 +0000)]
am
c5c0edae: am
7da7c222: Merge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev
* commit '
c5c0edae5804b813a4f1548574f72d7c2097cc7e':
Settings: Restart volumizers explicitly on resume.
Geoff Mendal [Mon, 1 Dec 2014 19:46:33 +0000 (19:46 +0000)]
am
80e4465b: (-s ours) am
80986508: (-s ours) Import translations. DO NOT MERGE
* commit '
80e4465b694bc67c39dab183fc5ea06f3c4ff04b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 19:46:32 +0000 (19:46 +0000)]
am
3c1449d9: (-s ours) Import translations. DO NOT MERGE
* commit '
3c1449d9f6bcad5773067b11a8be8d88f8336f63':
Import translations. DO NOT MERGE
John Spurlock [Mon, 1 Dec 2014 17:11:23 +0000 (17:11 +0000)]
am
c868f703: Settings: Improve inline volume sliders.
* commit '
c868f7035a6d05332b3d8afcde2ae27ad0413e79':
Settings: Improve inline volume sliders.
John Spurlock [Fri, 28 Nov 2014 20:39:11 +0000 (15:39 -0500)]
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
John Spurlock [Mon, 1 Dec 2014 15:04:03 +0000 (15:04 +0000)]
am
7da7c222: Merge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev
* commit '
7da7c2220d3a30fb3a1b57ee95caa9aec860a132':
Settings: Restart volumizers explicitly on resume.
Geoff Mendal [Mon, 1 Dec 2014 15:00:28 +0000 (07:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: I937420a98ee4ffd48c61126f1cec59978043c5d3
Auto-generated-cl: translation import
John Spurlock [Mon, 1 Dec 2014 14:57:53 +0000 (14:57 +0000)]
Merge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev
Geoff Mendal [Mon, 1 Dec 2014 14:52:54 +0000 (14:52 +0000)]
am
80986508: (-s ours) Import translations. DO NOT MERGE
* commit '
80986508fcf1ac52cb6665283d093c90115cc3fe':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 14:49:25 +0000 (06:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibcb289b8a0129d1c7c56151febfecd991ccf534e
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Dec 2014 14:36:03 +0000 (06:36 -0800)]
Import translations. DO NOT MERGE
Change-Id: I13501f8de184104974ced861598b0e87a52962f3
Auto-generated-cl: translation import
Jeff Davidson [Thu, 27 Nov 2014 00:00:15 +0000 (00:00 +0000)]
am
c18dfd69: am
a56714af: am
2d93f36f: Add string for "Connected via Wi-Fi assistant".
* commit '
c18dfd696e843892ca378319bfc4da60e7c61f3e':
Add string for "Connected via Wi-Fi assistant".
Jeff Davidson [Wed, 26 Nov 2014 23:52:57 +0000 (23:52 +0000)]
am
a56714af: am
2d93f36f: Add string for "Connected via Wi-Fi assistant".
* commit '
a56714af6ea18d9c4299170644c53e89be025f84':
Add string for "Connected via Wi-Fi assistant".
Jeff Davidson [Wed, 26 Nov 2014 23:46:46 +0000 (23:46 +0000)]
am
2d93f36f: Add string for "Connected via Wi-Fi assistant".
* commit '
2d93f36f00226a45adf9ad2f001e599f95e61692':
Add string for "Connected via Wi-Fi assistant".
Jeff Davidson [Wed, 26 Nov 2014 23:37:07 +0000 (15:37 -0800)]
Add string for "Connected via Wi-Fi assistant".
Bug:
18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d
Geoff Mendal [Wed, 26 Nov 2014 19:56:51 +0000 (19:56 +0000)]
am
5b09205c: (-s ours) am
237dbc45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
5b09205cc6576ab75e4b9827638044e42f746a7d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Nov 2014 19:56:50 +0000 (19:56 +0000)]
am
944c58a6: (-s ours) am
6ab687e1: (-s ours) am
645cf17f: (-s ours) Import translations. DO NOT MERGE
* commit '
944c58a6bd6858627e4ed8619d06c96c72481ca8':
Import translations. DO NOT MERGE
Maurice Lam [Wed, 26 Nov 2014 19:56:48 +0000 (19:56 +0000)]
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
Fabrice Di Meglio [Wed, 26 Nov 2014 19:56:47 +0000 (19:56 +0000)]
am
7a9494d5: am
e0658dda: am
09d27637: Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev
* commit '
7a9494d53e908cf340eb02351981e191afc778af':
IllegalStateException fixed in print service settings
Geoff Mendal [Wed, 26 Nov 2014 18:44:15 +0000 (18:44 +0000)]
am
237dbc45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
237dbc45c6558f6d93495f3580606f1a7cbf36b8':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Nov 2014 18:44:11 +0000 (18:44 +0000)]
am
6ab687e1: (-s ours) am
645cf17f: (-s ours) Import translations. DO NOT MERGE
* commit '
6ab687e1ee0d99b6a3cdd6270eebcb24dfb7795a':
Import translations. DO NOT MERGE
Maurice Lam [Wed, 26 Nov 2014 18:42:34 +0000 (18:42 +0000)]
am
628e89e9: am
3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev
* commit '
628e89e94580cd0734fe9aa85065e58021e8e9d8':
[Setup] Theme ChooseLockGeneric for setup wizard
Fabrice Di Meglio [Wed, 26 Nov 2014 18:41:28 +0000 (18:41 +0000)]
am
e0658dda: am
09d27637: Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev
* commit '
e0658ddafe8a73a551fc8626a96db07c9e905536':
IllegalStateException fixed in print service settings
John Spurlock [Wed, 26 Nov 2014 15:03:17 +0000 (10:03 -0500)]
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
Geoff Mendal [Wed, 26 Nov 2014 14:57:45 +0000 (14:57 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 26 Nov 2014 14:50:01 +0000 (14:50 +0000)]
am
645cf17f: (-s ours) Import translations. DO NOT MERGE
* commit '
645cf17f68bbf8580d9cc01a0527445c1c78e74d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Nov 2014 14:49:26 +0000 (06:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: I36312c2e5f3bf38ba107336920aae2083e75d0bb
Auto-generated-cl: translation import
Geoff Mendal [Wed, 26 Nov 2014 14:38:44 +0000 (06:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id6429feb2f156602b611e6578f624f30ff1997b7
Auto-generated-cl: translation import
Geoff Mendal [Wed, 26 Nov 2014 14:25:44 +0000 (06:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic5aaf08bc81e92023a18aafa0e5dde54adf8ea05
Auto-generated-cl: translation import
Maurice Lam [Wed, 26 Nov 2014 01:46:27 +0000 (01:46 +0000)]
am
3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev
* commit '
3f9d8b60ca9d3815736a4e11d17565fe18524a28':
[Setup] Theme ChooseLockGeneric for setup wizard
Maurice Lam [Wed, 26 Nov 2014 01:15:35 +0000 (01:15 +0000)]
Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev
Maurice Lam [Tue, 25 Nov 2014 22:06:38 +0000 (14:06 -0800)]
[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
Fabrice Di Meglio [Wed, 26 Nov 2014 00:37:43 +0000 (00:37 +0000)]
am
09d27637: Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev
* commit '
09d276371560a8e20e80a7f05a6807b5b8f0ace3':
IllegalStateException fixed in print service settings
Fabrice Di Meglio [Wed, 26 Nov 2014 00:31:49 +0000 (00:31 +0000)]
Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev
Fabrice Di Meglio [Tue, 25 Nov 2014 23:26:59 +0000 (23:26 +0000)]
am
d5a4dae8: am
c5aa905a: Merge "IllegalStateException fixed in print service settings"
* commit '
d5a4dae8d8f16a42c32b4c0e63e4b1abbe7374e5':
IllegalStateException fixed in print service settings
Fabrice Di Meglio [Tue, 25 Nov 2014 23:23:16 +0000 (23:23 +0000)]
am
c5aa905a: Merge "IllegalStateException fixed in print service settings"
* commit '
c5aa905a31e48fdeb52a8591ebb018ff161d57ad':
IllegalStateException fixed in print service settings
Fabrice Di Meglio [Tue, 25 Nov 2014 23:12:37 +0000 (23:12 +0000)]
Merge "IllegalStateException fixed in print service settings"
Raju Yadav [Tue, 25 Nov 2014 12:26:17 +0000 (13:26 +0100)]
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
PauloftheWest [Tue, 25 Nov 2014 20:36:40 +0000 (12:36 -0800)]
Remove extraneous SIM status information
Bug:
18467248
Change-Id: I59aff3f979f76ca622a6a9e944398042f236f0b7
PauloftheWest [Tue, 25 Nov 2014 13:16:22 +0000 (05:16 -0800)]
Fixed a Wi-Fi dialog crash
Bug:
18498974
Change-Id: I00ba9828c4f15cefd143fc1c92e1c81f43e91c95
Adrian Roos [Tue, 25 Nov 2014 18:57:18 +0000 (18:57 +0000)]
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
Adrian Roos [Tue, 25 Nov 2014 18:45:43 +0000 (18:45 +0000)]
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
Lucky Zhang [Tue, 25 Nov 2014 17:49:55 +0000 (17:49 +0000)]
am
e289815e: am
1d556fcc: am
74896d6f: Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev
* commit '
e289815ec02d30e9fe47197141efe141b68f6ba8':
[WifiSetup] Wifi setup text wrapping problem
Geoff Mendal [Tue, 25 Nov 2014 17:49:53 +0000 (17:49 +0000)]
am
02846117: (-s ours) am
4eed13ca: (-s ours) am
faf1dd20: (-s ours) Import translations. DO NOT MERGE
* commit '
028461176c44933737b19397b42b91cbed9cc08f':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 25 Nov 2014 17:49:52 +0000 (17:49 +0000)]
am
dfa717d7: (-s ours) am
709b12c1: (-s ours) Import translations. DO NOT MERGE
* commit '
dfa717d788188abf3966109815f06277d45d6654':
Import translations. DO NOT MERGE
Lucky Zhang [Tue, 25 Nov 2014 17:39:04 +0000 (17:39 +0000)]
am
1d556fcc: am
74896d6f: Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev
* commit '
1d556fcca25a68e35536e3d668bfb24bd2b62d0d':
[WifiSetup] Wifi setup text wrapping problem
OSDN Git Service
