OSDN Git Service
Jason Monk [Fri, 7 Nov 2014 16:58:37 +0000 (16:58 +0000)]
Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev
Jason Monk [Fri, 7 Nov 2014 16:23:02 +0000 (11:23 -0500)]
Screen pinning: fix strings and add scrollview
Update strings as requested from ewong, and add scrollview around
description for large-text/small-device case.
Bug:
18287056
Bug:
17177672
Change-Id: Ie34007d263a1fbc77fc8f435dbcd23a36f1766c3
Baligh Uddin [Fri, 7 Nov 2014 15:08:07 +0000 (15:08 +0000)]
am
960c98f9: (-s ours) Import translations. DO NOT MERGE
* commit '
960c98f91d44a9f9dfa5276f62e55f16e557e685':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Nov 2014 15:03:14 +0000 (15:03 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Alexandra Gherghina [Fri, 7 Nov 2014 10:35:52 +0000 (10:35 +0000)]
Merge "Disable app notifications checkbox for uninstalled apps" into lmp-mr1-dev
Alexandra Gherghina [Fri, 7 Nov 2014 10:35:37 +0000 (10:35 +0000)]
Merge "Update text for apps installed for other users" into lmp-mr1-dev
Alexandra Gherghina [Wed, 5 Nov 2014 13:20:56 +0000 (13:20 +0000)]
Disable app notifications checkbox for uninstalled apps
Bug:
18253810
Change-Id: I99fb2ae34b16944fd839db4e7c380b2d32f3b85d
Alexandra Gherghina [Wed, 29 Oct 2014 15:29:17 +0000 (15:29 +0000)]
Update text for apps installed for other users
This also refactors the layout to accommodate longer text
Bug:
16364316
Change-Id: I41eacba5b09a4f13af9695594c1a53eae075554f
Fabrice Di Meglio [Fri, 7 Nov 2014 01:39:24 +0000 (01:39 +0000)]
Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev
Fabrice Di Meglio [Fri, 7 Nov 2014 00:57:04 +0000 (16:57 -0800)]
Update synonyms and fix some issues related to them
- update synonyms definitions
- fix issue with L release regression for indexing "Backup & reset":
was missing the marker interface "Indexable"
- fix non working synonyms for "Language & input": their declaration
was done in the XML preference file but was not used because the
SearchIndexProvider was built "by hand"
See bug #
17474866 Settings search synonyms needs an update
Change-Id: Iceab71a0e3214f3a8ba0dcd77756c3632609c5ce
Paul Crowley [Fri, 7 Nov 2014 00:26:44 +0000 (00:26 +0000)]
Merge "Add a new flow for decryption checking." into lmp-mr1-dev
Jeff Davidson [Thu, 6 Nov 2014 21:30:34 +0000 (13:30 -0800)]
Remove the Wi-Fi Assistant card.
Per the latest mocks, advanced wireless settings will be the only
location in platform settings where Wi-Fi Assistants are configured.
The card is no longer being used.
Bug:
13780935
Change-Id: Idddf971404532256165045665bd0a6b19966d2bd
Stuart Scott [Thu, 6 Nov 2014 18:25:49 +0000 (18:25 +0000)]
Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev
Baligh Uddin [Thu, 6 Nov 2014 17:49:04 +0000 (09:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: I18ddc7f1f2104dad793af6e7a8978b0d36758258
Auto-generated-cl: translation import
Baligh Uddin [Thu, 6 Nov 2014 17:37:03 +0000 (09:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8bac21044a928351bf38da831b7239694756fb2d
Auto-generated-cl: translation import
Paul Crowley [Tue, 21 Oct 2014 09:12:47 +0000 (10:12 +0100)]
Add a new flow for decryption checking.
Bug:
17875087
Change-Id: I78ba98901bc74ae654414c0a4a303b104a629965
Stuart Scott [Wed, 5 Nov 2014 23:08:16 +0000 (15:08 -0800)]
Fix NPE when parceling SubInfoRecord
bug:
18256375
Change-Id: I04ab5086e3f06abc6ce44ef69501022564a95b88
Jeff Davidson [Tue, 4 Nov 2014 02:47:28 +0000 (18:47 -0800)]
Show accurate connection status for ephemeral networks.
Configurations for these networks are not returned in
getConfiguredNetworks() and likely shouldn't be as clients of this API
would not expect them. (Note also that the ephemeral bit is marked
@hide). But the framework may connect to them regardless.
In these cases, as long as the connection status is something other
than the coarse-level DISCONNECTED, we show the status to be an
accurate representation of Wi-Fi state. (To make this possible, we
pass around the full NetworkInfo instead of just the DetailedState,
allowing us to get the coarse state where needed).
When long pressing on a non-DISCONNECTED ephemeral network, we offer
the ability to save the configuration. (Note that this flow is
currently broken and being tracked by another bug, but the behavior is
consistent with what happens when you simply click on the SSID).
Bug:
18205278
Change-Id: I30592c89546068c796f458a86bb26eb3b28c64df
Sanket Padawe [Wed, 5 Nov 2014 20:30:26 +0000 (20:30 +0000)]
Merge "Change for setting transparency of sim colors." into lmp-mr1-dev
John Spurlock [Wed, 5 Nov 2014 19:17:49 +0000 (19:17 +0000)]
Merge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-dev
Sanket Padawe [Wed, 5 Nov 2014 17:59:40 +0000 (17:59 +0000)]
Merge "Sim name doesn't persist on reboot" into lmp-mr1-dev
John Spurlock [Wed, 5 Nov 2014 17:04:16 +0000 (12:04 -0500)]
Settings: Allow user to configure "None" for downtime.
New setting under Zen > Downtime subcategory. Also rename the
category header, remove obsolete parenthetical.
Bug:
16373455
Change-Id: Ic3430e1795fc79c315dea3c24d88dfcde6742849
Andres Morales [Wed, 5 Nov 2014 16:31:54 +0000 (16:31 +0000)]
Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev
* changes:
Confirm enabling OEM unlock with warning dialog
Request PIN confirmation to enable OEM unlock
Paul Crowley [Wed, 5 Nov 2014 15:57:08 +0000 (15:57 +0000)]
Merge "Don't show a pattern-specific prompt at encryption time." into lmp-mr1-dev
Alexandra Gherghina [Wed, 5 Nov 2014 10:06:35 +0000 (10:06 +0000)]
Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev
Sanket Padawe [Wed, 5 Nov 2014 02:14:39 +0000 (18:14 -0800)]
Change for setting transparency of sim colors.
Changes for setting transparency of sim colors in sim settings UI.
Change-Id: I5717da94bfb6bb260864a46c3898d347be96d6af
Sanket Padawe [Wed, 5 Nov 2014 01:34:47 +0000 (17:34 -0800)]
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
Paul Crowley [Tue, 4 Nov 2014 22:51:36 +0000 (22:51 +0000)]
Don't show a pattern-specific prompt at encryption time.
Bug:
18054895
Change-Id: I8a029142085b9e7f59efc8e313b6438734d5a1bb
Alexandra Gherghina [Tue, 4 Nov 2014 14:06:47 +0000 (14:06 +0000)]
Save missing state in ConfirmAutoSyncChangeFragment
Bug:
18117345
Change-Id: I5f176f330e51b23fe0935d435aa8bc3904e42d36
Stuart Scott [Tue, 4 Nov 2014 22:52:23 +0000 (14:52 -0800)]
Use CharSequence for DisplayName
Change-Id: I2601eb9dc1edf585ad3b48da9fb97c65cb1face5
vandwalle [Tue, 4 Nov 2014 20:07:44 +0000 (20:07 +0000)]
Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev
vandwalle [Tue, 4 Nov 2014 01:07:05 +0000 (17:07 -0800)]
sanitize strings and error messages in wiFi picker
Change-Id: I642e79b40902bb45a503be949dea6a09d94b3bc8
Andres Morales [Tue, 4 Nov 2014 18:58:19 +0000 (10:58 -0800)]
Confirm enabling OEM unlock with warning dialog
Bug:
18227644
Change-Id: I326a4cf215ef0e30fd8a054964e0efeb3f627d89
Alexandra Gherghina [Tue, 4 Nov 2014 13:51:04 +0000 (13:51 +0000)]
Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev
Alexandra Gherghina [Tue, 4 Nov 2014 13:50:51 +0000 (13:50 +0000)]
Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev
Andres Morales [Sat, 1 Nov 2014 01:23:47 +0000 (18:23 -0700)]
Request PIN confirmation to enable OEM unlock
Bug:
18191568
Change-Id: I1cfce5131c96711876953a28d8d642342d15201e
Stuart Scott [Fri, 31 Oct 2014 21:11:24 +0000 (14:11 -0700)]
Clean up public API of SubInfoRecord.
bug:
17575308
Change-Id: I38afd507b1c004fd566214c0b3812cab226936df
PauloftheWest [Mon, 3 Nov 2014 23:00:19 +0000 (23:00 +0000)]
Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev
Andrew Lee [Mon, 3 Nov 2014 21:00:04 +0000 (21:00 +0000)]
Merge "Update class name for FdnList." into lmp-mr1-dev
Geoff Mendal [Mon, 3 Nov 2014 18:32:51 +0000 (18:32 +0000)]
am
f6b60987: (-s ours) Import translations. DO NOT MERGE
* commit '
f6b609872c3a1dc3cb34e8eb78641df3a9dbc29b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 18:07:02 +0000 (10:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia602c0a9ac55f054d0c01cc742d085da1fcef19e
Auto-generated-cl: translation import
Geoff Mendal [Mon, 3 Nov 2014 18:01:40 +0000 (18:01 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 3 Nov 2014 17:58:33 +0000 (09:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6ec1f3604264e67b37956a3e6f0960ddfc0f8ee7
Auto-generated-cl: translation import
Jason Monk [Mon, 3 Nov 2014 14:37:51 +0000 (14:37 +0000)]
Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev
Andrew Lee [Fri, 31 Oct 2014 20:12:20 +0000 (13:12 -0700)]
Update class name for FdnList.
Bug:
18114923
Change-Id: If32383b08e9a217d4f6b16208a74ca546572acc0
Jason Monk [Mon, 4 Aug 2014 20:08:51 +0000 (16:08 -0400)]
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
Alexandra Gherghina [Thu, 30 Oct 2014 18:06:55 +0000 (18:06 +0000)]
Hide managed profile entry in secondary users
Bug:
18132630
Change-Id: I0395373ac6f088f8fc880110c740cb5f05827901
Alexandra Gherghina [Thu, 30 Oct 2014 11:56:18 +0000 (11:56 +0000)]
Apply predefined icon and label to managed profiles
Bug:
18132630
Change-Id: Ie6cfee420847d6992accb0bc0ca3f5535260bc55
PauloftheWest [Wed, 29 Oct 2014 19:28:24 +0000 (12:28 -0700)]
Changed SIM calls to use PhoneAccount instead of SubInfoRecord.
+ Some import cleanup on SimSettings.
Change-Id: Ib18673f4eb0ce404bf13a58e0979401cca91385d
PauloftheWest [Wed, 29 Oct 2014 21:46:44 +0000 (14:46 -0700)]
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
Geoff Mendal [Wed, 29 Oct 2014 20:56:00 +0000 (20:56 +0000)]
am
4c79a9ec: (-s ours) Import translations. DO NOT MERGE
* commit '
4c79a9ecc0124d85e66aa3041c6b65b8582f4c87':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Oct 2014 20:45:54 +0000 (20:45 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Wed, 29 Oct 2014 20:38:11 +0000 (13:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I61c6746c6591894d13cf5ee2f3fd70ab4fc2762e
Auto-generated-cl: translation import
Geoff Mendal [Wed, 29 Oct 2014 20:28:44 +0000 (13:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2b2810ffec88c69ab46b6672df00d381ce2429b2
Auto-generated-cl: translation import
PauloftheWest [Tue, 28 Oct 2014 15:30:05 +0000 (08:30 -0700)]
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
Sanket Padawe [Tue, 28 Oct 2014 22:48:33 +0000 (22:48 +0000)]
Merge "Add sim color selection in settings" into lmp-mr1-dev
PauloftheWest [Tue, 28 Oct 2014 22:45:33 +0000 (22:45 +0000)]
Merge "Added IMEI status activity." into lmp-mr1-dev
Sanket Padawe [Tue, 28 Oct 2014 21:01:50 +0000 (14:01 -0700)]
Add sim color selection in settings
Adding a dropdown list to select sim color from sim settings UI.
Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
Paul Lawrence [Tue, 28 Oct 2014 20:08:33 +0000 (20:08 +0000)]
Merge "Make emergency button right size" into lmp-mr1-dev
PauloftheWest [Mon, 20 Oct 2014 18:26:13 +0000 (11:26 -0700)]
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
Paul Lawrence [Tue, 28 Oct 2014 18:32:42 +0000 (11:32 -0700)]
Make emergency button right size
Bug:
18123894
Bug:
17394128
Change-Id: I248890b82f62146e1814172fd8b67e9a39661997
Jason Monk [Tue, 28 Oct 2014 18:45:24 +0000 (18:45 +0000)]
Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev
vandwalle [Tue, 28 Oct 2014 18:34:32 +0000 (18:34 +0000)]
Merge "prettify debug informations" into lmp-mr1-dev
Jason Monk [Mon, 27 Oct 2014 15:35:16 +0000 (11:35 -0400)]
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
John Spurlock [Tue, 28 Oct 2014 17:08:50 +0000 (17:08 +0000)]
Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev
John Spurlock [Tue, 28 Oct 2014 15:25:37 +0000 (11:25 -0400)]
Settings: Follow update to common conditions call.
Bug:
16824863
Change-Id: I4a4e455b99e1c68a65c63bfd3a9972e57555825f
Alexandra Gherghina [Tue, 28 Oct 2014 15:29:37 +0000 (15:29 +0000)]
Merge "Close account settings if there's no account to show" into lmp-mr1-dev
Wink Saville [Mon, 27 Oct 2014 17:35:43 +0000 (17:35 +0000)]
Merge "Change subId to int from long" into lmp-mr1-dev
Geoff Mendal [Mon, 27 Oct 2014 17:11:43 +0000 (17:11 +0000)]
Import translations. DO NOT MERGE
automerge:
c7df50c -s ours
* commit '
c7df50c5fdb8e4e3b26ff1647047e9e31c444994':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Oct 2014 16:49:35 +0000 (09:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id43df7ce7c8056dcdd1813ddc804acbc3ba46dd6
Auto-generated-cl: translation import
Geoff Mendal [Mon, 27 Oct 2014 16:40:31 +0000 (09:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifc5fc4573b40b501282cb71a17ba8c6873dc64c6
Auto-generated-cl: translation import
vandwalle [Sun, 26 Oct 2014 21:15:33 +0000 (14:15 -0700)]
prettify debug informations
Change-Id: I8e5c982f882a333e3f5ffdde6418447572547ea5
Jim Miller [Sat, 25 Oct 2014 01:01:16 +0000 (01:01 +0000)]
Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
Jim Miller [Fri, 24 Oct 2014 22:41:44 +0000 (15:41 -0700)]
Minor cleanup in EncryptionInterstitial
Fixes bug
18037481
Change-Id: I4e9dcc86a2d3db5c9311d5f743f03db19ca164e6
Michael Wright [Fri, 24 Oct 2014 22:33:50 +0000 (22:33 +0000)]
Skip Misc/Overcounted battery stats in release builds. automerge:
f7a5017
automerge:
95f29a1
* commit '
95f29a1930244b9978a55073326c9fb071c2615f':
Skip Misc/Overcounted battery stats in release builds.
Wink Saville [Thu, 23 Oct 2014 17:16:26 +0000 (10:16 -0700)]
Change subId to int from long
Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
Michael Wright [Fri, 24 Oct 2014 22:04:21 +0000 (22:04 +0000)]
Skip Misc/Overcounted battery stats in release builds.
automerge:
f7a5017
* commit '
f7a5017fa60d4cd3c802a45a7b04a4c8f34d969e':
Skip Misc/Overcounted battery stats in release builds.
Michael Wright [Fri, 24 Oct 2014 21:25:49 +0000 (14:25 -0700)]
Skip Misc/Overcounted battery stats in release builds.
Bug:
18090734
Change-Id: I24d8eea9fcb0d0b9e50d512325ed91ce70eb16ac
Sanket Padawe [Fri, 24 Oct 2014 18:15:11 +0000 (11:15 -0700)]
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
Sanket Padawe [Fri, 24 Oct 2014 18:01:15 +0000 (11:01 -0700)]
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
Sanket Padawe [Fri, 24 Oct 2014 17:39:21 +0000 (17:39 +0000)]
am
5fd97c55: Merge "WIP support icon" into lmp-sprout-dev
* commit '
5fd97c551fb8cbcc43d762d9c609be1061cc5170':
WIP support icon
Sanket Padawe [Fri, 24 Oct 2014 17:34:23 +0000 (17:34 +0000)]
Merge "WIP support icon" into lmp-sprout-dev
Sanket Padawe [Fri, 24 Oct 2014 17:17:08 +0000 (10:17 -0700)]
WIP support icon
Added static sim icon to alert box for selecting different sim accounts.
Change-Id: Ib22ceba4b96d636754d7946859f194488517ff9d
Alexandra Gherghina [Tue, 21 Oct 2014 21:39:03 +0000 (22:39 +0100)]
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
Baligh Uddin [Thu, 23 Oct 2014 22:10:38 +0000 (22:10 +0000)]
am
cc5b08b6: (-s ours) am
8d7fdc61: (-s ours) Import translations. DO NOT MERGE
* commit '
cc5b08b63c997acd13d566045d12ff232630e521':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 23 Oct 2014 22:10:38 +0000 (22:10 +0000)]
am
526e4b41: am
c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
* commit '
526e4b41550fa70e08cfcfc7bfbc2aa88a9f71d7':
Disable factory reset for secondary users
Baligh Uddin [Thu, 23 Oct 2014 21:52:59 +0000 (21:52 +0000)]
am
8d7fdc61: (-s ours) Import translations. DO NOT MERGE
* commit '
8d7fdc618a914d6c35f1033dafac5ab3cf0c930e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 23 Oct 2014 21:37:38 +0000 (14:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e17d1cbaab06ef2e48001b946476e99d70ba195
Auto-generated-cl: translation import
Geoff Mendal [Thu, 23 Oct 2014 00:14:41 +0000 (00:14 +0000)]
am
5b7e25aa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
5b7e25aa7cfa2e39f4168049eda0b435e87e147a':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 23 Oct 2014 00:02:44 +0000 (00:02 +0000)]
am
c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
* commit '
c1dc875224f9b2286bfe455f37006aabaa057431':
Disable factory reset for secondary users
Amith Yamasani [Wed, 22 Oct 2014 23:59:18 +0000 (23:59 +0000)]
Merge "Disable factory reset for secondary users" into lmp-dev
Geoff Mendal [Wed, 22 Oct 2014 23:57:24 +0000 (23:57 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Wed, 22 Oct 2014 23:29:28 +0000 (16:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I895931be5f341683d3bed7a087b3b1c4dc5a0359
Auto-generated-cl: translation import
Geoff Mendal [Wed, 22 Oct 2014 23:22:01 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Wed, 22 Oct 2014 23:20:52 +0000 (16:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a571f71af317a655f81d6446aebbd5912cd9089
Auto-generated-cl: translation import
Sanket Padawe [Wed, 22 Oct 2014 21:22:25 +0000 (21:22 +0000)]
am
59dc8d1d: SIM settings display name changes
* commit '
59dc8d1db4c557ace1ded52122993be2e73f6863':
SIM settings display name changes
Paul Jensen [Wed, 22 Oct 2014 21:22:20 +0000 (21:22 +0000)]
am
a1640daf: am
d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
* commit '
a1640daf6202b12e64bcc26647449695f9ef2a61':
Launch browser directly when user selects "Mobile Plan".
Amith Yamasani [Wed, 22 Oct 2014 20:51:53 +0000 (13:51 -0700)]
Disable factory reset for secondary users
Search in Settings makes it possible to find the factory reset screen.
Disable the search index in PrivacySettings so that backup and reset
keywords don't get indexed for secondary users.
Also add additional safeguards for other entry points such as public
intents, so that the backup/reset screen does not show any options.
Bug:
18076086
Change-Id: Ie5135fbf4084038c99947a1a107ab4758f0c15a9
Sanket Padawe [Wed, 22 Oct 2014 20:45:40 +0000 (20:45 +0000)]
am
266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
* commit '
266e429657774dc7aa14029629a9e78c942c6104':
Commit with dialog box but using subinfo records
Sanket Padawe [Wed, 22 Oct 2014 18:36:08 +0000 (11:36 -0700)]
SIM settings display name changes
Resubmitting the change for displaying SIM name in SIM settings.
Change-Id: I22d368c3880eaa54d37c9afcfd63d4e94e41fea8
OSDN Git Service
