Commit Graph

7426 Commits

Author SHA1 Message Date
Zoltan Szatmary-Ban
876a21bae8 Remove backup preferences if backup service is inactive
Also show informative message instead.

Bug: 16641441
Change-Id: I9920c07d56c4c0ccb1f3dce637c0fb390902d2ff
2014-11-20 20:20:49 +00:00
Zoltan Szatmary-Ban
548460bda5 Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev 2014-11-20 14:06:14 +00:00
Simranjit Singh Kohli
7df0b799a8 [New RemoveAccount API in Settings App]:
Modify Settings app to use the new account remove API

Bug: 18292092
Change-Id: I5f02d71bc0c7ca3e38157d38dea077c6fe6eb34e
2014-11-19 17:01:32 -08:00
Fyodor Kupolov
5925e1912e Merge "Added a check if a custom activity can be started" into lmp-mr1-dev 2014-11-19 22:20:25 +00:00
Paul Crowley
1cb45399d3 Prevent factory reset for short passwords in CryptKeeper
automerge: 8fca3fc

* commit '8fca3fcc06cfa7c4baf16b3bc53c4e52c9678fbb':
  Prevent factory reset for short passwords in CryptKeeper
2014-11-19 20:49:13 +00:00
Sanket Padawe
79e44da1ba Changing sim selection dialog in Settings to use phoneAccount
Changing sim selection dialog in Settings UI to select Call to display icons using
 phoneAccount.

Bug: 18435598
Change-Id: Ib89344be123c77a56e04a65dbb9e297f05e204eb
2014-11-19 18:45:27 +00:00
Wink Saville
1285f74fcb Additional changes to SubscriptionManager API as per API council.
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
2014-11-19 10:34:28 -08:00
Paul Crowley
8fca3fcc06 Prevent factory reset for short passwords in CryptKeeper
Since patterns and passwords can't be shorter than 4
elements, we shouldn't count them against attempts to unlock
the device.  If we do, we risk resetting the device
due to stray input.

Bug: 18211475
Bug: 18273380

Change-Id: Ib329cd3383471483cda68bfac4278b17d0c09c57

Conflicts:
	src/com/android/settings/CryptKeeper.java

Conflicts:
	src/com/android/settings/CryptKeeper.java
2014-11-19 12:00:32 +00:00
Fyodor Kupolov
07ab95c43e Added a check if a custom activity can be started
AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.

Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
2014-11-18 17:12:54 -08:00
Zoltan Szatmary-Ban
cfe521e6e3 Stop background processes if TrustedCredentialSettings fragment gets detached
Otherwise getActivity() returns null and other nasty null pointer dereferencings happen.

Bug: 17976307
Change-Id: If867785f991217267e0bf0ad3058a62177509852
2014-11-18 18:02:48 +00:00
Alexandra Gherghina
3a84d40133 Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev 2014-11-18 10:02:37 +00:00
Sanket Padawe
d85aa17894 Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 2014-11-17 23:53:13 +00:00
PauloftheWest
79381a928b Merge "Created Multi-SIM notifications." into lmp-mr1-dev 2014-11-17 22:50:08 +00:00
Sanket Padawe
a8bd025d35 Adding icons to sim color selection in settings UI.
Adding icons to sim color selection of sim settings UI.

Bug: 18380838
Change-Id: I98f07721aa234ff58a64a0c694206b085385bdec
2014-11-17 10:43:37 -08:00
Elliott Hughes
02c4c517df Remove vestigial "Choose date format" option.
Almost all of our date formatting goes via icu these days, so this is
a no-op almost everywhere. (And should be a no-op everywhere soon.)
There's no obvious way to fix it, so remove it. UI guidelines say we
should use spelled out month names anyway.

Bug: 18322220

(cherry picked from commit 30cc30864b)

Change-Id: I2a84d69a1f21f71d8bce5b69202b07f1b422aa57
2014-11-17 10:43:20 -08:00
PauloftheWest
acb160baa3 Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-dev 2014-11-17 16:12:44 +00:00
Paul Crowley
bf88566dc7 Merge "Force power cycle on cooldown." into lmp-mr1-dev 2014-11-17 13:29:50 +00:00
Alexandra Gherghina
2a3d649766 Fix NPE caused by status update outside activity lifecycle
Bug: 18373656
Change-Id: I3c7db15df7c47b65a42a13fc7a3a077c3ad48f77
2014-11-17 12:12:11 +00:00
Prem Kumar
b4e9a055bf Merge "Fix Sim Setting OOB error." into lmp-mr1-dev 2014-11-15 02:15:10 +00:00
Amith Yamasani
c395b9f37a Merge "Don't show SMS app settings for restricted profiles" into lmp-mr1-dev 2014-11-15 00:50:15 +00:00
Jeff Davidson
c01754bac9 Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-dev 2014-11-15 00:17:03 +00:00
Jeff Davidson
ce32b21727 Final UX for Wi-Fi assistant platform settings.
When one app is available, the toggle works as before. When multiple
apps are available, we allow the user to choose the app in a dialog
before turning on the setting.

Bug: 13780935
Change-Id: I1c4391bf97a53febe580fb2b896b4850372062e7
2014-11-14 15:27:21 -08:00
John Spurlock
fdebfc35c4 Settings: Add effects suppression text to Ring volume.
If the effects are being muted by a notification listener, display
a "Muted by <x>" msg instead of an active slider inside the
Ring/Notification volume setting pref.

Update volume pref design to optimize for this new custom appearance.

Depends on frameworks/base:
  Icdb5f85eb4bcaa1ead7d77c1460e06ad3f0604d5

Bug: 17461563
Change-Id: I6da871e16009370402451a2ff507de4762644a80
2014-11-14 14:38:03 -05:00
Jeff Sharkey
c88cdea2bb Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev 2014-11-14 19:24:43 +00:00
PauloftheWest
1d891b4caa Added tabs for Multi-SIM SIM Lock.
Bug: 18147652
Change-Id: I89d3ffb0b1451d263d7c913ac210d52d5308f3c0
2014-11-14 10:38:43 -08:00
PauloftheWest
0ee68facad Fix Sim Setting OOB error.
+ Cleanup: deleted dead code.

Bug: 18380862
Change-Id: Ie5dc44c6c0fe50cd9243a19050b6d79732d2d014
2014-11-14 10:18:07 -08:00
Jeff Sharkey
e16e44f756 Migrate license display to HTMLViewer.
For security purposes, we're no longer allowing WebView to be loaded
when running as system UID.  Instead, we now launch HTMLViewer to
show the details.

Bug: 18376908
Change-Id: I3c6a7897ab4ad0fc2c5463e5d69c7f53fb934e31
2014-11-14 09:46:33 -08:00
Robin Lee
e464d9b9ee Merge "Forward wifi cert install intents to primary user" into lmp-mr1-dev 2014-11-14 11:26:39 +00:00
PauloftheWest
63f7bc87d8 Created Multi-SIM notifications.
+ On Multi-SIM devices a notificaiton will pop up when a SIM card is
added, removed, or replaced.
+ The notification informs the user there has been a change in SIMs and
they can tap the notification to go SIM Card Settings.

Bug: 18293625

Change-Id: Iad1e5e0cf469e7bdfc43b2c18dd0586d042bb784
2014-11-13 15:05:02 -08:00
Paul Crowley
51e0811a7a Force power cycle on cooldown.
Bug: 18292029
Change-Id: I02b6eff56902859ae3aba4909656553f4b322b0c
2014-11-13 14:52:19 +00:00
PauloftheWest
26104298eb Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev 2014-11-13 13:57:09 +00:00
Robin Lee
8823c3eda2 Forward wifi cert install intents to primary user
Wifi certificates need to be installed on behalf of UID 1010 which
belongs to user 0, even if the installer is another user. This
requires a cross-profile switch before performing the install.

Bug: 17605542
Change-Id: Ib3dfb4c280f1686d29005c7a044bf80dc00e963a
2014-11-13 11:19:15 +00:00
Amith Yamasani
32505ac699 Don't show SMS app settings for restricted profiles
Restricted profiles might not have an SMS app and there is
currently no UI to enable/disable SMS for restricted profiles. SMS
is disabled by default in this case. So hide the SMS app picker
option in restricted profiles.

Bug: 17521457
Change-Id: Id2bb3e4690a4afba75ebcec8531727ec150c5632
2014-11-12 15:35:17 -08:00
PauloftheWest
76b0801173 Adding Sim Status menu to Settings.
+ Added tabs for Multi-SIM devices.
+ Most of the code was taken from MediaTek
(https://partner-android-review.googlesource.com/#/c/181417)

Bug: 18195254
Change-Id: If6f7d5cfa4d41adb52dfc1bd035b4ff79d926bd8
2014-11-12 14:52:18 -08:00
Sanket Padawe
0381f6c675 UI changes for icons in sim settings
+ UI changes relate to displaying sim icons in sim settings
+ Correcting way to display phone number inside sim settings dialog

Bug: 18356419
Change-Id: I1fe025fac52f20b607d4492b99cfef9588ec9416
2014-11-12 12:41:35 -08:00
vandwalle
53ad50b05b Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev 2014-11-12 01:18:38 +00:00
Zoltan Szatmary-Ban
7cc1b9e63e Show managed profile accounts on Settings > Factory Reset
List both primary profile's and managed profile's accounts. Also notify the user
if there are other users present on the device.

Bug: 17899181
Change-Id: I5401722e65305861edeed60cfe926fca5c81a418
2014-11-12 01:18:29 +00:00
Wink Saville
588611eea5 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-12 01:13:27 +00:00
Amith Yamasani
ceceb2ab07 Fix a regression in enabling unknown sources toggle
In Security Settings, allow unknown sources to be
toggled for primary and secondary users unless it
is a restricted profile or there is a device policy
restriction to disallow installing apps or installing
from unknown sources.

Bug: 18277370
Change-Id: I9f0b6cd603c4c8deb77d36af1b82cace43ba195f
2014-11-11 23:39:58 +00:00
Alexandra Gherghina
aa76283172 Merge "Reorganize sync state menu options for accounts settings" into lmp-mr1-dev 2014-11-11 22:27:47 +00:00
Wink Saville
ca7566125e Update SubscriptionManager API as per API council.
bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
2014-11-11 07:06:03 -08:00
Alexandra Gherghina
b2d9795cda Reorganize sync state menu options for accounts settings
Fixes inverted condition for displaying the buttons, updates
at the right time and removes the useless dependence on mFirstAccount

Bug: 18310988
Change-Id: Id55e11a210aa58a10ee9613891470862d42b65ad
2014-11-11 14:36:09 +00:00
John Spurlock
64cb79bb69 Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev 2014-11-11 02:22:19 +00:00
Fabrice Di Meglio
ded5a85aad Merge "Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button" into lmp-mr1-dev 2014-11-11 00:48:19 +00:00
Fabrice Di Meglio
c66a878813 Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button
- prevent sending onRadioButtonClicked() if the radio button is already checked
- check the new current radio button

Change-Id: I7e4457bcba6eb1abf51fbe3902bc0f6df0f4bdcf
2014-11-10 16:35:06 -08:00
John Spurlock
49300d19ab Settings: Update preference summary per new downtime behavior.
Bug: 16373455
Change-Id: I399b23ed09973c32c60b37612fd714198297b1a7
2014-11-10 14:49:10 -05:00
Jeff Davidson
76f0133831 Merge "Don't allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev 2014-11-10 17:35:29 +00:00
Alexandra Gherghina
095521b287 Merge "Update sync state immediately after accounts are shown" into lmp-mr1-dev 2014-11-10 10:13:00 +00:00
vandwalle
8be7ee3aac dont blacklist wifi config that have had validated internet status in the past
Change-Id: I66f7fffe33b5dbe861445775dcc6135c6cbedf62
2014-11-07 19:01:58 -08:00
Paul Crowley
2555e5f104 Prevent factory reset for short passwords in CryptKeeper
Since patterns and passwords can't be shorter than 4
elements, we shouldn't count them against attempts to unlock
the device.  If we do, we risk resetting the device
due to stray input.

Bug: 18211475
Bug: 18273380

Change-Id: Ib329cd3383471483cda68bfac4278b17d0c09c57

Conflicts:
	src/com/android/settings/CryptKeeper.java
2014-11-08 01:43:45 +00:00