OSDN Git Service
Wink Saville [Tue, 9 Dec 2014 17:52:19 +0000 (17:52 +0000)]
Merge "Add debug dataEnable." into lmp-mr1-dev
Prem Kumar [Tue, 9 Dec 2014 02:25:14 +0000 (02:25 +0000)]
Merge "Fixed a SIM Cards crash." into lmp-mr1-dev
John Spurlock [Mon, 8 Dec 2014 20:27:01 +0000 (20:27 +0000)]
Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev
PauloftheWest [Mon, 8 Dec 2014 20:23:34 +0000 (12:23 -0800)]
Fixed a SIM Cards crash.
+ Added a check if getActiveSubscriptionInfoList returns null.
Bug:
18634751
Change-Id: Ib6012816c26525a61fb199912d06d6c1572e0fd6
John Spurlock [Mon, 8 Dec 2014 20:20:33 +0000 (15:20 -0500)]
Settings: Rebind to volume sliders after returning from stopped.
Bug:
18118623
Change-Id: I29fb22a1a4476639a4f5cce06affd8ce58b6105d
Jeff Sharkey [Mon, 8 Dec 2014 17:57:29 +0000 (17:57 +0000)]
Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
PauloftheWest [Mon, 8 Dec 2014 17:01:35 +0000 (17:01 +0000)]
Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev
PauloftheWest [Mon, 8 Dec 2014 17:01:22 +0000 (17:01 +0000)]
Merge "Fixed a SimSettings issue" into lmp-mr1-dev
Jeff Sharkey [Wed, 3 Dec 2014 21:44:26 +0000 (13:44 -0800)]
Offer to "merge" subscribers for data usage.
When picking a template to use for querying statistics and setting
policies, normalize it so we widen the template to cover any merged
subscribers.
Also remove some code related to long-dormant split policies.
Bug:
18012787
Change-Id: I1e07dc09016df21ecfd7b3fad49759fa57570391
John Spurlock [Sun, 30 Nov 2014 21:22:09 +0000 (16:22 -0500)]
Settings: Hide downtime settings if not supported.
Depends on frameworks/base:
I4f801018ddb0beb6eb9fa03a81c79f7949888a3f
Bug:
16373455
Change-Id: I88b526d947fb697a7abd4d4cf4225f926434915a
Geoff Mendal [Mon, 8 Dec 2014 14:25:15 +0000 (06:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I961eb0c06458b16d134c52d5748954f7c359b053
Auto-generated-cl: translation import
Zoltan Szatmary-Ban [Mon, 8 Dec 2014 12:50:10 +0000 (12:50 +0000)]
Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev
Lucky Zhang [Mon, 8 Dec 2014 09:32:00 +0000 (09:32 +0000)]
Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev
Lucky Zhang [Mon, 8 Dec 2014 09:31:45 +0000 (09:31 +0000)]
Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev
Maurice Lam [Sat, 6 Dec 2014 03:03:55 +0000 (03:03 +0000)]
Merge "[FRP] Don't extract IME for PIN / Password during setup" into lmp-mr1-dev
Lucky Zhang [Fri, 5 Dec 2014 23:00:20 +0000 (15:00 -0800)]
[FRP] Remove None and Swipe from screen lock options
Removed "None" and "Swipe" from screen lock options in the choosing
lock screen during setup wizard, because at this step, the user has
already chosen to pick a screen lock, hence it's unnecessory to show
"none" and "swipe".
Implemented this by overriding the DisableUnusablePreferences in
SetupChooseLockGenericFragment to disable the insecure lock methods
and adding a flag to hide disabled methods for setup wizard.
Bug:
18631416
Change-Id: I3feccf591da25bd6eadcc03c75b28cfc1d069db7
Lucky Zhang [Sat, 6 Dec 2014 02:20:27 +0000 (18:20 -0800)]
[FRP] Screen Lock for Setup Wizard shows wrong title
Changed to the string lock_setting_picker_title that says "Choose a
screen lock".
Bug:
18631416
Change-Id: I2e400f3fdf7e89d4e70a60e1aec6df9ed77653b2
Jeff Davidson [Sat, 6 Dec 2014 02:07:30 +0000 (02:07 +0000)]
Merge "Final platform settings UX for ephemeral networks." into lmp-mr1-dev
Wink Saville [Fri, 5 Dec 2014 23:34:46 +0000 (15:34 -0800)]
Add debug dataEnable.
Change-Id: I4c2c49d9283652429affc190abacf7775ef3fe43
Maurice Lam [Fri, 5 Dec 2014 21:56:59 +0000 (21:56 +0000)]
Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev
Sanket Padawe [Fri, 5 Dec 2014 20:55:42 +0000 (20:55 +0000)]
Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev
Sanket Padawe [Fri, 5 Dec 2014 20:55:28 +0000 (20:55 +0000)]
Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev
Maurice Lam [Fri, 5 Dec 2014 20:19:05 +0000 (12:19 -0800)]
[FRP] Use Lock type as header instead of "Encryption"
Bug:
18631620
Change-Id: I41799642cd019d7b33f754dc7b7305ea8a6cdac1
Justin Harrison [Fri, 5 Dec 2014 19:41:54 +0000 (19:41 +0000)]
Merge "Check remote device uuids for phone book access permission" into lmp-mr1-dev
Zoltan Szatmary-Ban [Wed, 15 Oct 2014 10:35:55 +0000 (11:35 +0100)]
Make Location Settings multiprofile aware
Injected location services and location access status are shown
for managed profiles on Settings > Location
Bug:
18602878
Change-Id: Ic6232f3dc03d9675b90fbfd0163fe5bae4bd13c6
Fyodor Kupolov [Fri, 5 Dec 2014 19:28:42 +0000 (19:28 +0000)]
Merge "Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED" into lmp-mr1-dev
Shishir Agrawal [Fri, 5 Dec 2014 19:25:59 +0000 (19:25 +0000)]
Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev
Maurice Lam [Fri, 5 Dec 2014 19:14:01 +0000 (11:14 -0800)]
[FRP] Don't extract IME for PIN / Password during setup
Add the flagNoExtractUi to the password / PIN entry field so that it
will not be extracted to a fullscreen mode in phone landscape.
The phone landscape UI currently provides a poor experience because
it masks the message shown to the user (e.g. Passwords require at
least 4 characters)
Bug:
18640065
Change-Id: If67c8f9ae761f1ffda4f841e421e0fd651651649
Adrian Roos [Fri, 5 Dec 2014 18:25:58 +0000 (18:25 +0000)]
Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev
Jeff Davidson [Wed, 26 Nov 2014 23:29:36 +0000 (15:29 -0800)]
Final platform settings UX for ephemeral networks.
Show "Connected via Wi-Fi assistant" instead of just "Connected" when
a Wi-Fi connection is ephemeral. Otherwise, treat ephemeral
connections just like saved ones - show (read-only) connection stats
when you click the network, and offer the ability to "forget" the
network, which prevents further ephemeral connections.
Bug:
18525241
Change-Id: I0d2146ab47b82d32c50b2ef883f176a6b6066713
Adrian Roos [Fri, 5 Dec 2014 17:47:12 +0000 (18:47 +0100)]
Fix race leading to spuriously disabled trust agents
If TrustManagerService is able to refresh the trust agents before
the Settings activity gets a chance to reenable the lock pattern,
the TrustManagerService won't see a secure credential and won't
load any agents. This was introduced when we switched to isSecure
instead of getKeyguardStoredPasswordQuality. The latter ignored
the lockPatternEnabled flag.
Bug:
18596036
Change-Id: I2734899f7684916fc84bc3a07edca29310887103
Maurice Lam [Fri, 5 Dec 2014 03:21:51 +0000 (03:21 +0000)]
Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev
Justin Harrison [Fri, 5 Dec 2014 02:17:23 +0000 (02:17 +0000)]
Merge "Removed the application SIM Cards from application list" into lmp-mr1-dev
Maurice Lam [Fri, 5 Dec 2014 00:22:59 +0000 (00:22 +0000)]
Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev
Sanket Padawe [Thu, 4 Dec 2014 22:49:32 +0000 (14:49 -0800)]
Change default sim selection text in sim settings ui.
Bug:
18611090
Change-Id: Ifd2c26e02f1051536c4113b4351cefa51c2d5210
Maurice Lam [Thu, 4 Dec 2014 23:04:36 +0000 (23:04 +0000)]
Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev
Maurice Lam [Thu, 4 Dec 2014 05:44:37 +0000 (21:44 -0800)]
[FRP] Give pattern lock colors
Bug:
18482708
Change-Id: Id471ee66902742b34fdd6ae3312d37d34094d493
PauloftheWest [Thu, 4 Dec 2014 20:32:40 +0000 (12:32 -0800)]
Removed the application SIM Cards from application list
Bug:
18623155
Change-Id: Ic9ef449136fb6ef854727ad994976a5dc6d8ee8c
Maurice Lam [Wed, 3 Dec 2014 23:17:46 +0000 (15:17 -0800)]
[FRP] Use setup wizard nav bar buttons
Use setup wizard nav bar buttons instead of custom button bar for
lock screen setup.
Bug:
18482708
Change-Id: I471f475ebe6bc7ba8cfbd179daddd854c1b6982a
Sanket Padawe [Thu, 4 Dec 2014 20:10:15 +0000 (12:10 -0800)]
Removing checks from EnableWifiTether which are done in SystemUI
Bug:
18368949
Change-Id: Ib80e7b4adaf4d5fb6029bbee0f6fdf5a99e18018
PauloftheWest [Thu, 4 Dec 2014 19:56:35 +0000 (11:56 -0800)]
SIM cards in Setting will only show on Multi-SIM devices
Bug:
16808006
Change-Id: Iecba1a1dabecf20ac8fa8c137f4eef4555ddceaf
PauloftheWest [Thu, 4 Dec 2014 18:25:33 +0000 (18:25 +0000)]
Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev
Sanket Padawe [Thu, 4 Dec 2014 18:12:40 +0000 (18:12 +0000)]
Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev
PauloftheWest [Thu, 4 Dec 2014 18:09:28 +0000 (10:09 -0800)]
Fixed a Settings crash when entering SIM status
Bug:
18596763
Change-Id: I699268345c342be05814bb531027dd53cba1c370
Geoff Mendal [Thu, 4 Dec 2014 05:46:50 +0000 (05:46 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Maurice Lam [Thu, 4 Dec 2014 00:12:31 +0000 (16:12 -0800)]
[FRP] Add illustration to lock screen setup
Added the illustration JPG files, and added
SetupWizardUtils.setIllustration method that will change the
illustrations in the layout.
Bug:
18482708
Change-Id: I8c6758113f07cd33f85eaf6bc019e8194d9a17ce
Shishir Agrawal [Thu, 4 Dec 2014 01:36:28 +0000 (17:36 -0800)]
Settings app - read phone number from TelephonyManager.
The phone number needs to be always read from the TelephonyManager
since it can be overridden.
Bug:
18487514
Change-Id: If72094eb230c41b4f70146b0ccb012c9f9860626
Amith Yamasani [Thu, 4 Dec 2014 01:50:05 +0000 (01:50 +0000)]
Merge "Fix padding in user type selection dialog" into lmp-mr1-dev
Maurice Lam [Thu, 4 Dec 2014 00:25:22 +0000 (00:25 +0000)]
Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev
Maurice Lam [Wed, 3 Dec 2014 23:47:49 +0000 (15:47 -0800)]
[FRP] Transitions for lock screen setup
Use the slide transition for activities using the setup theme.
Bug:
18482708
Change-Id: I1a60a24f426118a63ec219bfbb378f255f362fa7
Wink Saville [Wed, 3 Dec 2014 23:33:00 +0000 (23:33 +0000)]
Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev
PauloftheWest [Wed, 3 Dec 2014 23:30:52 +0000 (23:30 +0000)]
Merge "Add SIM notification pop-ups." into lmp-mr1-dev
Sanket Padawe [Wed, 3 Dec 2014 23:23:14 +0000 (15:23 -0800)]
Removed unnecessary heading in Sim settings
Bug:
17321738
Change-Id: If60d5539e67ca0f57b4d4fc62cb55118f8e0d3b2
Amith Yamasani [Wed, 3 Dec 2014 01:21:23 +0000 (17:21 -0800)]
Fix padding in user type selection dialog
Use preferred list item padding for the list items
and use the dialog context for creating the adapter.
Bug:
18509286
Change-Id: Ia5791a6283723a0ab458f24ec22b8890ab627657
Geoff Mendal [Wed, 3 Dec 2014 20:39:08 +0000 (12:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I09102039883ee5ee63f0f58f26ea2a2239b8d047
Auto-generated-cl: translation import
John Spurlock [Wed, 3 Dec 2014 20:03:54 +0000 (15:03 -0500)]
Settings: Don't lose the switch bar returning to saver settings.
Bug:
18595359
Change-Id: I01c24fd8ed304837338c2b353805b3d3324e1639
PauloftheWest [Wed, 3 Dec 2014 18:16:52 +0000 (10:16 -0800)]
Fixed a SimSettings issue
+ SimSettings will not automatically select the first SIM for the user.
Bug:
18528013
Change-Id: I4c2024860231f6124a801feda821bc16bc2c4772
Alexandra Gherghina [Wed, 3 Dec 2014 12:15:37 +0000 (12:15 +0000)]
Merge "Modify account settings for better locale resolution" into lmp-mr1-dev
Alexandra Gherghina [Mon, 11 Aug 2014 11:40:13 +0000 (12:40 +0100)]
Modify account settings for better locale resolution
Bug:
16282173
Change-Id: I2ab861464cdbbb1c1b0a5a7231f960d8ed9e90c6
Zoltan Szatmary-Ban [Wed, 3 Dec 2014 10:23:27 +0000 (10:23 +0000)]
Merge "Show account icons for managed profiles on Settings > Factory Reset" into lmp-mr1-dev
Sanket Padawe [Wed, 3 Dec 2014 01:36:09 +0000 (01:36 +0000)]
Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev
Sanket Padawe [Wed, 3 Dec 2014 01:33:58 +0000 (01:33 +0000)]
Merge "New activity for enabling tethering using Quick Settings" into lmp-mr1-dev
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
Fyodor Kupolov [Wed, 26 Nov 2014 01:34:22 +0000 (17:34 -0800)]
Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED
Added BroadcastReceiver for ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED to
refresh the list, if event has been received. It could be that checkboxes
need to be updated. Also disable the checkbox while admin is being removed.
Bug:
17609838
Change-Id: Id1f72c27111c280a77a03ba6ba26bcdbbb10bb58
Wink Saville [Wed, 3 Dec 2014 01:12:08 +0000 (17:12 -0800)]
Change initMobileTabTag to use subInfoList
Also add additional debug.
Bug:
18364932
Change-Id: I836b751a443635efcfb9987bb3b91f55c4dff9d6
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
PauloftheWest [Tue, 18 Nov 2014 15:12:48 +0000 (07:12 -0800)]
Add SIM notification pop-ups.
+ Added a SimDialogActivity so any application can iniate a request to
se tthe default Data, Calls, and SMS.
Bug:
18293625
Change-Id: I60535125b40ece5ebc14542d732e4493bddefbae
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:19:51 +0000 (21:19 +0000)]
Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev
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: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 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:50:30 +0000 (17:50 +0000)]
Merge "Remove extraneous SIM status information" into lmp-mr1-dev
Sanket Padawe [Tue, 2 Dec 2014 17:45:35 +0000 (09:45 -0800)]
New activity for enabling tethering using Quick Settings
Added a new activity which would handle tethering on clicking Tethering
tile of Quick Settings.
Bug:
18368949
Change-Id: I77057f3ccd26263831ba88e426b5f8d3ad1fa788
Zoltan Szatmary-Ban [Tue, 2 Dec 2014 17:22:10 +0000 (17:22 +0000)]
Show account icons for managed profiles on Settings > Factory Reset
Fixing a bug where managed profile's accounts where shown without
the account icon.
Bug:
18555032
Change-Id: I5a1094e795b31a00599bc4df413573030693b436
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 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 [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
Sanket Padawe [Wed, 26 Nov 2014 20:00:58 +0000 (12:00 -0800)]
Fixed improper capitalization related to trademark term in BT
Bug:
18362051
Change-Id: I3074e120a5b261fbcb5d429bae47d233ad6fd695
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 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: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:37:07 +0000 (15:37 -0800)]
Add string for "Connected via Wi-Fi assistant".
Bug:
18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d
Matthew Xie [Fri, 21 Nov 2014 05:41:10 +0000 (21:41 -0800)]
Check remote device uuids for phone book access permission
Only give phone book access permission for remote devices that
handle PBAP.
Bug:
18140961
Change-Id: I128f15460b151d7e0a47cd9b4b15dae10ec586c5
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: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: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: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