Commit Graph

15737 Commits

Author SHA1 Message Date
Maurice Lam
01aab29343 [WifiSetup] Update title string
Bug: 17887844
Change-Id: I08df121e2c5a6bcb919d3b372df71c9df0983f43
2014-11-21 11:59:34 -08:00
Amith Yamasani
0cc764beed Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev 2014-11-21 01:47:20 +00:00
Amith Yamasani
45f86236e4 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
2014-11-20 13:19:18 -08:00
Wink Saville
b9b69faf5f Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 2014-11-20 20:30:48 +00:00
Wink Saville
9aa0dd69c5 Revert "Additional changes to SubscriptionManager API as per API council."
This reverts commit 1285f74fcb.

Change-Id: I366556368a9c429d8c356bcdb8e29af9c6c4c71e
2014-11-20 20:27:34 +00:00
Wink Saville
db2e05d89e Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-20 20:21:29 +00:00
Jeff Davidson
101743f9ec Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev 2014-11-20 18:37:53 +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
Paul Crowley
67b4af148d Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev
Conflicts:
	src/com/android/settings/CryptKeeper.java

Change-Id: I3d16d6b571e9c493df23cb6cedd7e9ed929a43da
2014-11-20 10:37:39 +00: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
Jeff Davidson
13b2a28463 Final strings for Wi-Fi Assistant in platform settings.
Bug: 13780935
Change-Id: I70a22b3f439d05570d2508f8e05ed3aa9627e8f1
2014-11-19 11:59:11 -08:00
Geoff Mendal
36d2656f96 Import translations. DO NOT MERGE
Change-Id: Id90b273276938939b6e68b00149e54e8ec146ca6
Auto-generated-cl: translation import
2014-11-19 11:03:40 -08: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
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
Geoff Mendal
2321682d5a am f0450338: (-s ours) Import translations. DO NOT MERGE
* commit 'f04503387498337787e315979dd30bfeedb88b68':
  Import translations. DO NOT MERGE
2014-11-17 22:16:23 +00:00
Geoff Mendal
f045033874 Import translations. DO NOT MERGE
Change-Id: I8742961e8d64b9b83cb3e3583c4316cd31399621
Auto-generated-cl: translation import
2014-11-17 14:12:53 -08:00
Geoff Mendal
383d2ab6bd Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-17 22:06:48 +00:00
Geoff Mendal
1244b64f88 Import translations. DO NOT MERGE
Change-Id: Idcf2d15fa650fc675efa5b7e5dbc0d86ed8aa4b8
Auto-generated-cl: translation import
2014-11-17 14:04:27 -08: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
Geoff Mendal
c5079a06dc am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '827ad0c38c76b932237fc22ecfcb35bff8de148f':
  Import translations. DO NOT MERGE
2014-11-12 23:34:27 +00:00
Geoff Mendal
827ad0c38c Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-12 23:30:10 +00: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
Geoff Mendal
c9e7209ca8 Import translations. DO NOT MERGE
Change-Id: I99007a120d90a442a65f31ab35b8da3d1aa8524e
Auto-generated-cl: translation import
2014-11-12 14:48:49 -08:00
Sanket Padawe
6416bec01d Merge "UI changes for icons in sim settings" into lmp-mr1-dev 2014-11-12 22:08:53 +00:00
Geoff Mendal
fbce961b80 am 9ae3bf2d: (-s ours) Import translations. DO NOT MERGE
* commit '9ae3bf2d3fca27966328e68263880080a1bdd79e':
  Import translations. DO NOT MERGE
2014-11-12 22:04:57 +00: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