OSDN Git Service
Sanket Padawe [Wed, 3 Dec 2014 02:29:03 +0000 (02:29 +0000)]
am
37a0c07b: Merge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev
* commit '
37a0c07b9b73b8d99c43cfdce2bd0b78fdec2a2a':
Fixed crash in sim settings due to wrong toString() call.
Sanket Padawe [Wed, 3 Dec 2014 02:29:02 +0000 (02:29 +0000)]
am
430e01d0: Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev
* commit '
430e01d01fb8ab51a4975d8f8d46760c7873f425':
Fixing "SMS Messages" to "SMS messages" as per UX requirement.
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
Sanket Padawe [Wed, 3 Dec 2014 01:32:26 +0000 (01:32 +0000)]
Merge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev
Sanket Padawe [Wed, 3 Dec 2014 01:31:43 +0000 (01:31 +0000)]
Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev
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 [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
Sanket Padawe [Tue, 2 Dec 2014 23:40:23 +0000 (15:40 -0800)]
Fixing "SMS Messages" to "SMS messages" as per UX requirement.
Bug:
17322866
Change-Id: Id4dcfc70ef4675adabeb42c3f6bdf5bdbe5f71f1
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: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: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
Sanket Padawe [Tue, 2 Dec 2014 18:52:22 +0000 (10:52 -0800)]
Fixed crash in sim settings due to wrong toString() call.
Bug:
18589605
Change-Id: I2ae756f113904e1325ad3cc686cee0300cbd71e4
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 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 [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: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: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 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.
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 [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
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: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
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 15:04:25 +0000 (15:04 +0000)]
am
647f9752: Merge "Don\'t show RedactionInterstitial when changing password" into lmp-mr1-dev
* commit '
647f9752ce1bdd4c02cd44028dac769369140764':
Don't show RedactionInterstitial when changing password
Adrian Roos [Tue, 25 Nov 2014 14:59:59 +0000 (14:59 +0000)]
Merge "Don't show RedactionInterstitial when changing password" into lmp-mr1-dev
PauloftheWest [Tue, 25 Nov 2014 12:40:45 +0000 (04:40 -0800)]
Added color to Data Usage graph
+ Fixed some issues with displaying multiple SIMs in Data Usage.
Bug:
18466592
Bug:
18291246
Change-Id: I77417be995761ce62e464c7d21a34af1334aac17
Lucky Zhang [Mon, 24 Nov 2014 20:01:20 +0000 (20:01 +0000)]
am
74896d6f: Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev
* commit '
74896d6f1d6e2b5507f3e1b2c6d40d6ae1bfde37':
[WifiSetup] Wifi setup text wrapping problem
Lucky Zhang [Mon, 24 Nov 2014 19:33:12 +0000 (19:33 +0000)]
Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev
Geoff Mendal [Mon, 24 Nov 2014 18:27:37 +0000 (18:27 +0000)]
am
faf1dd20: (-s ours) Import translations. DO NOT MERGE
* commit '
faf1dd2062390250f4622583dc651e5dd0685f6b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Nov 2014 18:20:28 +0000 (10:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1f4c7ef53f323dfab3afc7978d7c90c05e5865a3
Auto-generated-cl: translation import
Geoff Mendal [Mon, 24 Nov 2014 18:07:28 +0000 (10:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib35d3ce45d8d18a16ea37d1348a64ac621a54b1f
Auto-generated-cl: translation import
Adrian Roos [Mon, 24 Nov 2014 16:17:13 +0000 (17:17 +0100)]
Don't show RedactionInterstitial when changing password
Only show when going from an insecure to secure lock.
Bug:
18467783
Change-Id: Ia73682d45b1dcd9ad61a00abeac099a94256e3b7
Paul Crowley [Mon, 24 Nov 2014 15:26:56 +0000 (15:26 +0000)]
am
95a28c3f: Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev
* commit '
95a28c3f10b3f9a2fdcebcd1019f97989e2393c5':
Reduce number of attempts before factory reset to 30.
Paul Crowley [Mon, 24 Nov 2014 15:21:55 +0000 (15:21 +0000)]
Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev
Selim Cinek [Mon, 24 Nov 2014 13:39:38 +0000 (13:39 +0000)]
am
44b50ad3: Merge "Fixed build breakage due to api change." into lmp-mr1-dev
* commit '
44b50ad313e827f03391ebac47f3db6308b52d42':
Fixed build breakage due to api change.
Selim Cinek [Mon, 24 Nov 2014 13:35:53 +0000 (13:35 +0000)]
Merge "Fixed build breakage due to api change." into lmp-mr1-dev
Selim Cinek [Mon, 24 Nov 2014 13:09:51 +0000 (14:09 +0100)]
Fixed build breakage due to api change.
Bug:
16239208
Change-Id: I9c2b13d3687f9f61307e0c13b6940425faebfa9f
Zoltan Szatmary-Ban [Mon, 24 Nov 2014 12:13:10 +0000 (12:13 +0000)]
am
6ad85792: Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev
* commit '
6ad8579262dbc059472a2cbe1ff4b675f01e4268':
Stop background processes if TrustedCredentialSettings fragment gets detached
Zoltan Szatmary-Ban [Mon, 24 Nov 2014 12:08:00 +0000 (12:08 +0000)]
Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev
PauloftheWest [Mon, 17 Nov 2014 20:47:38 +0000 (12:47 -0800)]
Changed SIM lock toggle to a switch
Bug:
18408617
Change-Id: Iea14f40082aa9b7fd6c1925ee5ca5e6bc6841140
Wink Saville [Sat, 22 Nov 2014 20:22:57 +0000 (20:22 +0000)]
am
239d185a: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
* commit '
239d185aa727a0930f1983cd77ddaeb268adc315':
Additional changes to SubscriptionManager API as per API council.
Wink Saville [Sat, 22 Nov 2014 20:19:54 +0000 (20:19 +0000)]
Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
Wink Saville [Sat, 22 Nov 2014 18:11:39 +0000 (10:11 -0800)]
Additional changes to SubscriptionManager API as per API council.
bug:
17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
Lajos Molnar [Sat, 22 Nov 2014 06:51:13 +0000 (06:51 +0000)]
am
c3245a05: Reword NuPlayer developer settings to say AwesomePlayer
* commit '
c3245a0555fbd9b02407edebfdac386a62a4af0a':
Reword NuPlayer developer settings to say AwesomePlayer
Lajos Molnar [Sat, 22 Nov 2014 05:01:40 +0000 (21:01 -0800)]
Reword NuPlayer developer settings to say AwesomePlayer
Bug:
18489541
Change-Id: Iab3ad293fb6689949e57375371fa6ac649b4ff0c
Andres Morales [Sat, 22 Nov 2014 03:32:52 +0000 (03:32 +0000)]
am
7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev
* commit '
7090c92f3933238a06a6d799e49ae6b13d09cbb4':
Update enable oem unlock warning
Andres Morales [Sat, 22 Nov 2014 03:28:44 +0000 (03:28 +0000)]
Merge "Update enable oem unlock warning" into lmp-mr1-dev
Lucky Zhang [Sat, 22 Nov 2014 02:33:50 +0000 (18:33 -0800)]
[WifiSetup] Wifi setup text wrapping problem
Fixed the text orientation for items in wifi settings on 600dp screens
in portrait mode. This bug only happens in such a setup, because
there is a mistake in the corresponding style file.
Bug:
18323509
Change-Id: I7ca6a3b27c8ab32481e02590f7ea78d452ab8090
Andres Morales [Wed, 19 Nov 2014 21:55:44 +0000 (13:55 -0800)]
Update enable oem unlock warning
updating the strings from bug previously fixed
Bug:
18227644
Change-Id: I2b651c807df7585f4d08a26a2a09895100ae2cd6
Sanket Padawe [Fri, 21 Nov 2014 23:37:47 +0000 (23:37 +0000)]
am
9209ce85: Merge "Changing sim selection dialog in Settings to use phoneAccount" into lmp-mr1-dev
* commit '
9209ce852ab7fbed10772af20aa7ff75ec69a96c':
Changing sim selection dialog in Settings to use phoneAccount
Sanket Padawe [Fri, 21 Nov 2014 23:37:46 +0000 (23:37 +0000)]
am
cd1846fa: Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev
* commit '
cd1846fa6bed76532bc66182fe6a9a87e6e7edd6':
Changing hint string inside sim name editor dialog in settings.
Sanket Padawe [Fri, 21 Nov 2014 23:34:31 +0000 (23:34 +0000)]
Merge "Changing sim selection dialog in Settings to use phoneAccount" into lmp-mr1-dev
Sanket Padawe [Fri, 21 Nov 2014 23:32:50 +0000 (23:32 +0000)]
Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev
Lucky Zhang [Fri, 21 Nov 2014 21:44:47 +0000 (21:44 +0000)]
am
0e606a2a: Merge "[SetupWizard] Warn user of missing FRP if skipping wi-fi" into lmp-mr1-dev
* commit '
0e606a2a301b91669af59e61f3e607463d49ed56':
[SetupWizard] Warn user of missing FRP if skipping wi-fi
Lucky Zhang [Fri, 21 Nov 2014 21:40:43 +0000 (21:40 +0000)]
Merge "[SetupWizard] Warn user of missing FRP if skipping wi-fi" into lmp-mr1-dev
Maurice Lam [Fri, 21 Nov 2014 21:36:22 +0000 (21:36 +0000)]
am
485a7e59: Merge "[WifiSetup] Update title string" into lmp-mr1-dev
* commit '
485a7e5989823ff30e6ef61064a592d42f49a1f0':
[WifiSetup] Update title string
Maurice Lam [Fri, 21 Nov 2014 21:33:40 +0000 (21:33 +0000)]
Merge "[WifiSetup] Update title string" into lmp-mr1-dev
Maurice Lam [Fri, 21 Nov 2014 19:59:34 +0000 (11:59 -0800)]
[WifiSetup] Update title string
Bug:
17887844
Change-Id: I08df121e2c5a6bcb919d3b372df71c9df0983f43
Lucky Zhang [Thu, 20 Nov 2014 04:36:48 +0000 (20:36 -0800)]
[SetupWizard] Warn user of missing FRP if skipping wi-fi
Change the skip string in wifi settings to warn user of missing
out on device protection.
Bug:
18391349
Change-Id: Ica2434589ece60205cd9a06088a8eb65d5edfd0d
Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:29:01 +0000 (15:29 +0000)]
am
5875aefa: Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev
* commit '
5875aefa8a48cd90a1245303c42c171c2f4962b4':
Remove backup preferences if backup service is inactive
Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:21:34 +0000 (15:21 +0000)]
Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev
Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:18:59 +0000 (15:18 +0000)]
am
b85025d9: Strings for multiprofile Location Settings.
* commit '
b85025d98b7c9d28c9ee2b26ce3c9d11929aeb3a':
Strings for multiprofile Location Settings.
Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:10:23 +0000 (15:10 +0000)]
Strings for multiprofile Location Settings.
Bug:
17680368
Change-Id: I5f7f0891740b200322f99b2974d21b3dd33a5fd3
Paul Crowley [Fri, 21 Nov 2014 09:43:17 +0000 (09:43 +0000)]
Reduce number of attempts before factory reset to 30.
Bug:
18292029
Change-Id: I2a78775d0505a3064838443ea631fee0ad612e5c
Amith Yamasani [Fri, 21 Nov 2014 01:50:50 +0000 (01:50 +0000)]
am
0cc764be: Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev
* commit '
0cc764beed2b816ee7e092591c7f205601e1b596':
Watch out for deleted user when exiting async task
Amith Yamasani [Fri, 21 Nov 2014 01:47:20 +0000 (01:47 +0000)]
Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev
Amith Yamasani [Thu, 20 Nov 2014 01:12:46 +0000 (17:12 -0800)]
Watch out for deleted user when exiting async task
Fixes a problem where the async task can take a while to execute
and in the meantime the user can be removed. On exiting the async
task and updating the UI, make sure the user hasn't been deleted.
Bug:
18411181
Change-Id: I1831f3e53084c49e27557cb7aacec78c753a611b
Wink Saville [Thu, 20 Nov 2014 20:34:30 +0000 (20:34 +0000)]
am
b9b69faf: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev
* commit '
b9b69faf5ff4ba1a944b180b7240ad1f95e9acea':
Revert "Additional changes to SubscriptionManager API as per API council."
OSDN Git Service
