Commit Graph

17849 Commits

Author SHA1 Message Date
Jeff Sharkey
c88cdea2bb Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev 2014-11-14 19:24:43 +00:00
Elliott Hughes
30cc30864b 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
Change-Id: Ic9e903eceab3c096426f313bf4ef3a38644774e1
2014-11-14 11:16:16 -08: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
53ad5ec71b am 983253d1: am e464d9b9: Merge "Forward wifi cert install intents to primary user" into lmp-mr1-dev
* commit '983253d18acef74ea1f35e20085e8fb1b5fe2265':
  Forward wifi cert install intents to primary user
2014-11-14 11:32:04 +00:00
Robin Lee
983253d18a am e464d9b9: Merge "Forward wifi cert install intents to primary user" into lmp-mr1-dev
* commit 'e464d9b9ee133d366bec1b6c879889572c9996d8':
  Forward wifi cert install intents to primary user
2014-11-14 11:28:43 +00: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
PauloftheWest
f95f2590c1 am 0f4254fa: am 26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev
* commit '0f4254fab38fc7b47e4532446dd13338aa4c2cf0':
  Adding Sim Status menu to Settings.
2014-11-13 15:15:46 +00:00
PauloftheWest
0f4254fab3 am 26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev
* commit '26104298eb53d2dfa693eec32934f9ac0aa3d525':
  Adding Sim Status menu to Settings.
2014-11-13 15:08:03 +00: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
Geoff Mendal
22ab79dd47 am 28408035: (-s ours) am c5079a06: (-s ours) am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '28408035173a5e15f6ccc119bc61127cfd989f0c':
  Import translations. DO NOT MERGE
2014-11-13 00:00:37 +00:00
Sanket Padawe
2856fb31e8 am f722ff93: am 6416bec0: Merge "UI changes for icons in sim settings" into lmp-mr1-dev
* commit 'f722ff93fc2c2e6799970a29e59d5db0a152b1e4':
  UI changes for icons in sim settings
2014-11-12 23:50:34 +00:00
Geoff Mendal
b05537c0ae am 15034064: (-s ours) am fbce961b: (-s ours) am 9ae3bf2d: (-s ours) Import translations. DO NOT MERGE
* commit '1503406487bb2f0412fce00c83533093006b04d7':
  Import translations. DO NOT MERGE
2014-11-12 23:50:33 +00:00
Geoff Mendal
2840803517 am c5079a06: (-s ours) am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit 'c5079a06dc2f57718cd781ae855b687a14cc1c2f':
  Import translations. DO NOT MERGE
2014-11-12 23:41:23 +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
f722ff93fc am 6416bec0: Merge "UI changes for icons in sim settings" into lmp-mr1-dev
* commit '6416bec01de67492ac761ba84c8b86c59e4dee28':
  UI changes for icons in sim settings
2014-11-12 22:46:03 +00:00
Geoff Mendal
1503406487 am fbce961b: (-s ours) am 9ae3bf2d: (-s ours) Import translations. DO NOT MERGE
* commit 'fbce961b80d731e6eb473de4c1ae5e683bed5566':
  Import translations. DO NOT MERGE
2014-11-12 22:45:59 +00: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
Geoff Mendal
9ae3bf2d3f Import translations. DO NOT MERGE
Change-Id: I8170fefa7733e2feddad643069cc0407631a2b96
Auto-generated-cl: translation import
2014-11-12 12:07:20 -08:00
Geoff Mendal
6065a571ac am 7897993b: (-s ours) am cdbba048: (-s ours) Import translations. DO NOT MERGE
* commit '7897993b6175d605dcf6d3318388005ea693ad4a':
  Import translations. DO NOT MERGE
2014-11-12 18:25:16 +00:00
Geoff Mendal
37b06e06dd am a1486acf: (-s ours) Import translations. DO NOT MERGE
* commit 'a1486acfeff910751b255b597383e5465670cdf0':
  Import translations. DO NOT MERGE
2014-11-12 18:25:15 +00:00
Geoff Mendal
7897993b61 am cdbba048: (-s ours) Import translations. DO NOT MERGE
* commit 'cdbba0489bec3a889c457312183ab9ab855cfc51':
  Import translations. DO NOT MERGE
2014-11-12 18:23:10 +00:00
Geoff Mendal
a1486acfef Import translations. DO NOT MERGE
Change-Id: Id80c19a2c80275ea0c63e12d23761e5bed47f0b8
Auto-generated-cl: translation import
2014-11-12 09:53:14 -08:00
Geoff Mendal
cdbba0489b Import translations. DO NOT MERGE
Change-Id: I628e96983ed2224fb17081a509a7de379b89b88b
Auto-generated-cl: translation import
2014-11-12 09:48:33 -08:00
vandwalle
bf1dcec15f Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev automerge: 53ad50b
automerge: 4f2c003

* commit '4f2c003d6ae0db4b6d929e2de5e40d7ab01a76dc':
  dont blacklist wifi config that have had validated internet status in the past
2014-11-12 03:24:47 +00:00
Wink Saville
324cabb2d8 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 588611e
automerge: 754da43

* commit '754da436c9ccae525af19a590533307f0ec9c6c5':
  Update SubscriptionManager API as per API council.
2014-11-12 03:23:15 +00:00
Amith Yamasani
db0e866d57 Fix a regression in enabling unknown sources toggle automerge: ceceb2a
automerge: 8b955d1

* commit '8b955d1d47e1bcf1e989fb437f50dd7f82f1e567':
  Fix a regression in enabling unknown sources toggle
2014-11-12 03:12:40 +00:00
vandwalle
4f2c003d6a Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev
automerge: 53ad50b

* commit '53ad50b05bd95157c1b0bcefe321b2a561dc2696':
  dont blacklist wifi config that have had validated internet status in the past
2014-11-12 02:25:43 +00:00
Wink Saville
754da436c9 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev
automerge: 588611e

* commit '588611eea55ee3ef617d17ea89c16174935a6a1a':
  Update SubscriptionManager API as per API council.
2014-11-12 02:24:06 +00: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
Amith Yamasani
8b955d1d47 Fix a regression in enabling unknown sources toggle
automerge: ceceb2a

* commit 'ceceb2ab07aab457a4229d051de222ad88ed62a1':
  Fix a regression in enabling unknown sources toggle
2014-11-12 01:13:42 +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
Alexandra Gherghina
0c0b8a62ec am aa762831: Merge "Reorganize sync state menu options for accounts settings" into lmp-mr1-dev
automerge: 5fc5de1

* commit '5fc5de1f6acdc255ae1f9b21380fe8adad791080':
  Reorganize sync state menu options for accounts settings
2014-11-12 00:25:54 +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
5fc5de1f6a am aa762831: Merge "Reorganize sync state menu options for accounts settings" into lmp-mr1-dev
* commit 'aa762831729e7c91c10184f11b978bd501b94e71':
  Reorganize sync state menu options for accounts settings
2014-11-11 22:48:25 +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
John Spurlock
32830286e8 am 0193911e: Settings: Tweak doze settings description.
automerge: 9259316

* commit '925931601d48a0cdec885f1a381339f78c282bcf':
  Settings: Tweak doze settings description.
2014-11-11 18:51:45 +00:00
John Spurlock
925931601d am 0193911e: Settings: Tweak doze settings description.
* commit '0193911ea5a81e772a3d07e62af768559c36f1d5':
  Settings: Tweak doze settings description.
2014-11-11 18:18:20 +00:00
John Spurlock
0193911ea5 Settings: Tweak doze settings description.
Change-Id: If9241fabf8e097ef57049cfb2c7f75513f978759
2014-11-11 13:07:09 -05:00