Commit Graph

7192 Commits

Author SHA1 Message Date
Alexandra Gherghina
7db037a989 Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev 2014-11-05 10:06:36 +00:00
Sanket Padawe
8942c62165 Change for setting transparency of sim colors.
Changes for setting transparency of sim colors in sim settings UI.

Change-Id: I5717da94bfb6bb260864a46c3898d347be96d6af
2014-11-04 18:14:39 -08:00
Sanket Padawe
c9f823e22a Sim name doesn't persist on reboot
Sim name was not persisting on changed by user because of wrong api call.

Bug: 18024820
Change-Id: I7dee4a181f17f8cfabe48fefb92d7fc407efbe59
2014-11-04 17:34:47 -08:00
Paul Crowley
01fbd9fd3c Don't show a pattern-specific prompt at encryption time.
Bug: 18054895
Change-Id: I8a029142085b9e7f59efc8e313b6438734d5a1bb
2014-11-05 00:43:33 +00:00
Alexandra Gherghina
6911af1cbe Save missing state in ConfirmAutoSyncChangeFragment
Bug: 18117345
Change-Id: I5f176f330e51b23fe0935d435aa8bc3904e42d36
2014-11-04 23:00:34 +00:00
Stuart Scott
b153181c9c Use CharSequence for DisplayName
Change-Id: I2601eb9dc1edf585ad3b48da9fb97c65cb1face5
2014-11-04 14:52:23 -08:00
vandwalle
508a693c9a Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev 2014-11-04 20:07:44 +00:00
vandwalle
b245731e88 sanitize strings and error messages in wiFi picker
Change-Id: I642e79b40902bb45a503be949dea6a09d94b3bc8
2014-11-04 12:05:30 -08:00
Andres Morales
48b0b241aa Confirm enabling OEM unlock with warning dialog
Bug: 18227644
Change-Id: I326a4cf215ef0e30fd8a054964e0efeb3f627d89
2014-11-04 10:58:19 -08:00
Alexandra Gherghina
2a03d8e299 Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev 2014-11-04 13:51:05 +00:00
Alexandra Gherghina
d47f15a474 Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev 2014-11-04 13:50:52 +00:00
Andres Morales
73bbd4cbff Request PIN confirmation to enable OEM unlock
Bug: 18191568
Change-Id: I1cfce5131c96711876953a28d8d642342d15201e
2014-11-03 17:02:11 -08:00
Stuart Scott
3ada2ecbe0 Clean up public API of SubInfoRecord.
bug: 17575308
Change-Id: I38afd507b1c004fd566214c0b3812cab226936df
2014-11-03 16:00:10 -08:00
PauloftheWest
ba53a846b1 Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev 2014-11-03 23:00:19 +00:00
Andrew Lee
8d4f7f94eb Merge "Update class name for FdnList." into lmp-mr1-dev 2014-11-03 21:00:04 +00:00
Jason Monk
8f5c0e4660 Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev 2014-11-03 14:37:52 +00:00
Andrew Lee
da90d68b58 Update class name for FdnList.
Bug: 18114923
Change-Id: If32383b08e9a217d4f6b16208a74ca546572acc0
2014-10-31 13:21:57 -07:00
Jason Monk
78121d9d10 Bring screen lock setting back to screen pinning
The material design of the request has removed this option from
the dialog, and now needs to be in settings.  When screen
pinning is off it shows a description of how to use the feature,
however when on it shows a switch to control whether it locks
the device on exit.  This setting defaults to on if there is a
lock pin/pattern.

Bug: 16957435
Change-Id: I59e0d64964cee4302e6ecff59e622cfe11422807
2014-10-31 15:45:12 -04:00
Alexandra Gherghina
c41d613751 Hide managed profile entry in secondary users
Bug: 18132630
Change-Id: I0395373ac6f088f8fc880110c740cb5f05827901
2014-10-31 12:04:02 +00:00
Alexandra Gherghina
0f5440f6e2 Apply predefined icon and label to managed profiles
Bug: 18132630
Change-Id: Ie6cfee420847d6992accb0bc0ca3f5535260bc55
2014-10-31 12:03:53 +00:00
PauloftheWest
a7b5d2b384 Changed SIM calls to use PhoneAccount instead of SubInfoRecord.
+ Some import cleanup on SimSettings.

Change-Id: Ib18673f4eb0ce404bf13a58e0979401cca91385d
2014-10-30 14:16:18 -07:00
PauloftheWest
de33844d81 Added cellular data popup in DataUsage
+ If the user attempts to enable data usage on a SIM that is not the
default, the system will confirm that the user wants data to go through
the new SIM.

Change-Id: Ia1652a30a3641bb29eadad20b2dc61321227a961
2014-10-30 13:56:23 -07:00
PauloftheWest
98523c8b8b Added Cellular Data for Multi-Sim Data Usage
+ Bug Fix: SimSettings would crash if a SIM was not in the first slot.

Change-Id: Iee75ea78dde72dc7d2d588caff1ddd451347a8f5
2014-10-29 12:48:39 -07:00
Sanket Padawe
917aaf9ebd Merge "Add sim color selection in settings" into lmp-mr1-dev 2014-10-28 22:48:33 +00:00
PauloftheWest
93c10334c8 Merge "Added IMEI status activity." into lmp-mr1-dev 2014-10-28 22:45:34 +00:00
Sanket Padawe
abc505aac3 Add sim color selection in settings
Adding a dropdown list to select sim color from sim settings UI.

Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
2014-10-28 14:01:50 -07:00
PauloftheWest
f41aaa249b Added IMEI status activity.
+ Added IMEI support from MTK with formatting changes.  Now extra SIM
  IMEI information is displayed in a seperate activity.

Bug: 17935115
Change-Id: I48942d77650bef2a1778996db3b1ec3a9d87492c
2014-10-28 13:00:11 -07:00
Jason Monk
496b3f6471 Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev 2014-10-28 18:45:24 +00:00
vandwalle
10a4cacc0f Merge "prettify debug informations" into lmp-mr1-dev 2014-10-28 18:34:33 +00:00
Jason Monk
36760c108b Allow QS to launch adding network dialog
This allows QS to set an extra that will launch the adding network
dialog directly for a specified ssid.  It will be used to take users
straight from QS to the password entry, when a secure network is
selected.

Bug: 17722817
Change-Id: I570596af906de005c505678b539f915c06e6fd14
2014-10-28 13:21:12 -04:00
John Spurlock
90674e53fc Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev 2014-10-28 17:08:51 +00:00
John Spurlock
24791abae1 Settings: Follow update to common conditions call.
Bug: 16824863
Change-Id: I4a4e455b99e1c68a65c63bfd3a9972e57555825f
2014-10-28 12:33:30 -04:00
Alexandra Gherghina
9f0bab9bcb Merge "Close account settings if there's no account to show" into lmp-mr1-dev 2014-10-28 15:29:38 +00:00
Wink Saville
4aab7ecb56 Merge "Change subId to int from long" into lmp-mr1-dev 2014-10-27 17:35:44 +00:00
vandwalle
30ac117228 prettify debug informations
Change-Id: I8e5c982f882a333e3f5ffdde6418447572547ea5
2014-10-26 14:15:33 -07:00
Jim Miller
dd932476b9 Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev 2014-10-25 01:01:17 +00:00
Jim Miller
59864d2ce7 Minor cleanup in EncryptionInterstitial
Fixes bug 18037481

Change-Id: I4e9dcc86a2d3db5c9311d5f743f03db19ca164e6
2014-10-24 15:41:44 -07:00
Michael Wright
ca6bc2aefa Skip Misc/Overcounted battery stats in release builds. automerge: f7a5017
automerge: 95f29a1

* commit '95f29a1930244b9978a55073326c9fb071c2615f':
  Skip Misc/Overcounted battery stats in release builds.
2014-10-24 22:33:50 +00:00
Wink Saville
b003a85941 Change subId to int from long
Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
2014-10-24 15:08:44 -07:00
Michael Wright
95f29a1930 Skip Misc/Overcounted battery stats in release builds.
automerge: f7a5017

* commit 'f7a5017fa60d4cd3c802a45a7b04a4c8f34d969e':
  Skip Misc/Overcounted battery stats in release builds.
2014-10-24 22:04:21 +00:00
Michael Wright
f7a5017fa6 Skip Misc/Overcounted battery stats in release builds.
Bug: 18090734
Change-Id: I24d8eea9fcb0d0b9e50d512325ed91ce70eb16ac
2014-10-24 14:25:49 -07:00
Sanket Padawe
745046c157 Default sim name set to carrier name in sim settings
Default sim name in SIM settings UI should be carrier name untill user
specifies a name for SIM.

Bug: 17732079
Change-Id: I302ad00095fd06b393dbe358b135f031390a3678
2014-10-24 11:51:44 -07:00
Sanket Padawe
22eb414bbd Set subscription id for "ask everytime" in sim settings
Added default subscription id when user selects "Ask everytime"
while selecting sim card to select for phone calls.

Change-Id: I7f720f919850a85b65af648c9a7e078a0c05815e
2014-10-24 18:24:51 +00:00
Sanket Padawe
7ff1718e1f am 5fd97c55: Merge "WIP support icon" into lmp-sprout-dev
* commit '5fd97c551fb8cbcc43d762d9c609be1061cc5170':
  WIP support icon
2014-10-24 17:39:21 +00:00
Sanket Padawe
5fd97c551f Merge "WIP support icon" into lmp-sprout-dev 2014-10-24 17:34:24 +00:00
Sanket Padawe
0f596b90fe WIP support icon
Added static sim icon to alert box for selecting different sim accounts.

Change-Id: Ib22ceba4b96d636754d7946859f194488517ff9d
2014-10-24 10:17:08 -07:00
Alexandra Gherghina
14819b0d3d Close account settings if there's no account to show
This makes sure we don't keep the Settings screen on when there are no
accounts left to show.

Bug: 17713957
Change-Id: I6e1d6819477f051e3a521360aa3138b18fdd3fe2
2014-10-24 17:00:38 +01:00
Amith Yamasani
0e64404a94 am 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
* commit '526e4b41550fa70e08cfcfc7bfbc2aa88a9f71d7':
  Disable factory reset for secondary users
2014-10-23 22:10:38 +00:00
Amith Yamasani
526e4b4155 am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
* commit 'c1dc875224f9b2286bfe455f37006aabaa057431':
  Disable factory reset for secondary users
2014-10-23 00:02:44 +00:00
Amith Yamasani
c1dc875224 Merge "Disable factory reset for secondary users" into lmp-dev 2014-10-22 23:59:19 +00:00