OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam 449dc733: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Fri, 7 Nov 2014 15:06:32 +0000 (15:06 +0000)]
am 449dc733: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '449dc733e313b889a159a8776bd09cacbc0c34ae':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Fri, 7 Nov 2014 15:03:14 +0000 (15:03 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Baligh Uddin [Fri, 7 Nov 2014 15:03:00 +0000 (15:03 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoam c66eb698: Merge "Disable app notifications checkbox for uninstalled apps" into...
Alexandra Gherghina [Fri, 7 Nov 2014 10:39:43 +0000 (10:39 +0000)]
am c66eb698: Merge "Disable app notifications checkbox for uninstalled apps" into lmp-mr1-dev

* commit 'c66eb698a9e5e4b6e684ba38a92e7c0ce8bd596a':
  Disable app notifications checkbox for uninstalled apps

9 years agoam ee70c699: Merge "Update text for apps installed for other users" into lmp-mr1-dev
Alexandra Gherghina [Fri, 7 Nov 2014 10:39:42 +0000 (10:39 +0000)]
am ee70c699: Merge "Update text for apps installed for other users" into lmp-mr1-dev

* commit 'ee70c69919d3e49ba76d2710850fd70be5c09998':
  Update text for apps installed for other users

9 years agoMerge "Disable app notifications checkbox for uninstalled apps" 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

9 years agoMerge "Update text for apps installed for other users" 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

9 years agoDisable app notifications checkbox for uninstalled apps
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

9 years agoUpdate text for apps installed for other users
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

9 years agoam fff7e020: Merge "Update synonyms and fix some issues related to them" into lmp...
Fabrice Di Meglio [Fri, 7 Nov 2014 01:46:20 +0000 (01:46 +0000)]
am fff7e020: Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev

* commit 'fff7e020e83b1f23de11a842c56728f8a739a8d1':
  Update synonyms and fix some issues related to them

9 years agoMerge "Update synonyms and fix some issues related to them" into lmp-mr1-dev
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

9 years agoUpdate synonyms and fix some issues related to them
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

9 years agoam 41c19779: Merge "Add a new flow for decryption checking." into lmp-mr1-dev
Paul Crowley [Fri, 7 Nov 2014 00:33:42 +0000 (00:33 +0000)]
am 41c19779: Merge "Add a new flow for decryption checking." into lmp-mr1-dev

* commit '41c197797832efd2acee013c0079fe7850559795':
  Add a new flow for decryption checking.

9 years agoMerge "Add a new flow for decryption checking." into lmp-mr1-dev
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

9 years agoam 99f191f5: Remove the Wi-Fi Assistant card.
Jeff Davidson [Fri, 7 Nov 2014 00:09:36 +0000 (00:09 +0000)]
am 99f191f5: Remove the Wi-Fi Assistant card.

* commit '99f191f5856bb266854d7b08a50523626eb70f72':
  Remove the Wi-Fi Assistant card.

9 years agoRemove the Wi-Fi Assistant card.
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

9 years agoMerge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev
Stuart Scott [Thu, 6 Nov 2014 18:54:42 +0000 (18:54 +0000)]
Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev
automerge: ac61828

* commit 'ac61828bed8219b94afe4fe2f32cae6ef70130c0':
  Fix NPE when parceling SubInfoRecord

9 years agoMerge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev
Stuart Scott [Thu, 6 Nov 2014 18:25:49 +0000 (18:25 +0000)]
Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 6 Nov 2014 17:42:35 +0000 (09:42 -0800)]
Import translations. DO NOT MERGE

Change-Id: I3b866f948797d2f710f53ce51aaa54b373a346e0
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
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

9 years agoAdd a new flow for decryption checking.
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

9 years agoShow accurate connection status for ephemeral networks.
Jeff Davidson [Thu, 6 Nov 2014 02:18:57 +0000 (02:18 +0000)]
Show accurate connection status for ephemeral networks.
automerge: b46a919

* commit 'b46a9194fe88a26e80d415919d191703c340925e':
  Show accurate connection status for ephemeral networks.

9 years agoFix NPE when parceling SubInfoRecord
Stuart Scott [Wed, 5 Nov 2014 23:08:16 +0000 (15:08 -0800)]
Fix NPE when parceling SubInfoRecord

bug:18256375
Change-Id: I04ab5086e3f06abc6ce44ef69501022564a95b88

9 years agoShow accurate connection status for ephemeral networks.
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

9 years agoam 815c61d7: Merge "Change for setting transparency of sim colors." into lmp-mr1-dev
Sanket Padawe [Wed, 5 Nov 2014 20:35:27 +0000 (20:35 +0000)]
am 815c61d7: Merge "Change for setting transparency of sim colors." into lmp-mr1-dev

* commit '815c61d729715e6d7a19fbf4f039d59d0dddc265':
  Change for setting transparency of sim colors.

9 years agoMerge "Change for setting transparency of sim colors." into lmp-mr1-dev
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

9 years agoMerge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-dev
John Spurlock [Wed, 5 Nov 2014 19:34:02 +0000 (19:34 +0000)]
Merge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-dev
automerge: 92f0246

* commit '92f02463fcea8e428b3be028082e8895ac8c5708':
  Settings: Allow user to configure "None" for downtime.

9 years agoMerge "Settings: Allow user to configure "None" for downtime." 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

9 years agoam 63530b56: Merge "Sim name doesn\'t persist on reboot" into lmp-mr1-dev
Sanket Padawe [Wed, 5 Nov 2014 18:50:14 +0000 (18:50 +0000)]
am 63530b56: Merge "Sim name doesn\'t persist on reboot" into lmp-mr1-dev

* commit '63530b56bba0de22309633d4f05fd2e74901474d':
  Sim name doesn't persist on reboot

9 years agoMerge "Sim name doesn't persist on reboot" 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

9 years agoMerge changes I326a4cf2,I1cfce513 into lmp-mr1-dev
Andres Morales [Wed, 5 Nov 2014 17:38:35 +0000 (17:38 +0000)]
Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev
automerge: ea4d9a9

* commit 'ea4d9a9eca7e18d35e521d80d57628f5a7347e55':
  Confirm enabling OEM unlock with warning dialog
  Request PIN confirmation to enable OEM unlock

9 years agoSettings: Allow user to configure "None" for downtime.
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

9 years agoMerge "Don\'t show a pattern-specific prompt at encryption time." into lmp-mr1-dev
Paul Crowley [Wed, 5 Nov 2014 16:35:53 +0000 (16:35 +0000)]
Merge "Don\'t show a pattern-specific prompt at encryption time." into lmp-mr1-dev
automerge: e6ad7bf

* commit 'e6ad7bf05263941ea89b8dda7cded6f9d434a6da':
  Don't show a pattern-specific prompt at encryption time.

9 years agoMerge changes I326a4cf2,I1cfce513 into lmp-mr1-dev
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

9 years agoMerge "Don't show a pattern-specific prompt at encryption time." into lmp-mr1-dev
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

9 years agoam 7db037a9: Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp...
Alexandra Gherghina [Wed, 5 Nov 2014 10:09:58 +0000 (10:09 +0000)]
am 7db037a9: Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev

* commit '7db037a989ea9c106ea404681cfe22a1fd2a2973':
  Save missing state in ConfirmAutoSyncChangeFragment

9 years agoMerge "Save missing state in ConfirmAutoSyncChangeFragment" 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

9 years agoChange for setting transparency of sim colors.
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

9 years agoam b153181c: Use CharSequence for DisplayName
Stuart Scott [Wed, 5 Nov 2014 02:13:21 +0000 (02:13 +0000)]
am b153181c: Use CharSequence for DisplayName

* commit 'b153181c9c597085769d69796ecf07ec6d4433d2':
  Use CharSequence for DisplayName

9 years agoSim name doesn't persist on reboot
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

9 years agoDon't show a pattern-specific prompt at encryption time.
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

9 years agoSave missing state in ConfirmAutoSyncChangeFragment
Alexandra Gherghina [Tue, 4 Nov 2014 14:06:47 +0000 (14:06 +0000)]
Save missing state in ConfirmAutoSyncChangeFragment

Bug: 18117345
Change-Id: I5f176f330e51b23fe0935d435aa8bc3904e42d36

9 years agoUse CharSequence for DisplayName
Stuart Scott [Tue, 4 Nov 2014 22:52:23 +0000 (14:52 -0800)]
Use CharSequence for DisplayName

Change-Id: I2601eb9dc1edf585ad3b48da9fb97c65cb1face5

9 years agoam 508a693c: Merge "sanitize strings and error messages in wiFi picker" into lmp...
vandwalle [Tue, 4 Nov 2014 20:12:02 +0000 (20:12 +0000)]
am 508a693c: Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev

* commit '508a693c9a240a5f297704c8cc837a3cb5702d6c':
  sanitize strings and error messages in wiFi picker

9 years agoMerge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev
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

9 years agosanitize strings and error messages in wiFi picker
vandwalle [Tue, 4 Nov 2014 01:07:05 +0000 (17:07 -0800)]
sanitize strings and error messages in wiFi picker

Change-Id: I642e79b40902bb45a503be949dea6a09d94b3bc8

9 years agoConfirm enabling OEM unlock with warning dialog
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

9 years agoam 2a03d8e2: Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev
Alexandra Gherghina [Tue, 4 Nov 2014 13:54:53 +0000 (13:54 +0000)]
am 2a03d8e2: Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev

* commit '2a03d8e2991b64740c803c65e2e09ba69180a02e':
  Hide managed profile entry in secondary users

9 years agoam d47f15a4: Merge "Apply predefined icon and label to managed profiles" into lmp...
Alexandra Gherghina [Tue, 4 Nov 2014 13:54:52 +0000 (13:54 +0000)]
am d47f15a4: Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev

* commit 'd47f15a4746cda8522fc986a1b2478c76c46d71f':
  Apply predefined icon and label to managed profiles

9 years agoMerge "Hide managed profile entry in secondary users" into lmp-mr1-dev
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

9 years agoMerge "Apply predefined icon and label to managed profiles" 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

9 years agoClean up public API of SubInfoRecord.
Stuart Scott [Tue, 4 Nov 2014 03:01:22 +0000 (03:01 +0000)]
Clean up public API of SubInfoRecord.
automerge: 3ada2ec

* commit '3ada2ecbe02c98da529aa106e538a4439219cb62':
  Clean up public API of SubInfoRecord.

9 years agoRequest PIN confirmation to enable OEM unlock
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

9 years agoClean up public API of SubInfoRecord.
Stuart Scott [Fri, 31 Oct 2014 21:11:24 +0000 (14:11 -0700)]
Clean up public API of SubInfoRecord.

bug: 17575308
Change-Id: I38afd507b1c004fd566214c0b3812cab226936df

9 years agoMerge "Added cellular data popup in DataUsage" into lmp-mr1-dev
PauloftheWest [Mon, 3 Nov 2014 23:28:42 +0000 (23:28 +0000)]
Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev
automerge: ba53a84

* commit 'ba53a846b153b7318d7fc9e21763369b43358e30':
  Added cellular data popup in DataUsage

9 years agoMerge "Added cellular data popup in DataUsage" into lmp-mr1-dev
PauloftheWest [Mon, 3 Nov 2014 23:00:19 +0000 (23:00 +0000)]
Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev

9 years agoam 8d4f7f94: Merge "Update class name for FdnList." into lmp-mr1-dev
Andrew Lee [Mon, 3 Nov 2014 21:03:40 +0000 (21:03 +0000)]
am 8d4f7f94: Merge "Update class name for FdnList." into lmp-mr1-dev

* commit '8d4f7f94eb8804df9c91e9b9172fee80cdf7a8e1':
  Update class name for FdnList.

9 years agoMerge "Update class name for FdnList." 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

9 years agoam c6db3cc1: (-s ours) am f6b60987: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 18:39:41 +0000 (18:39 +0000)]
am c6db3cc1: (-s ours) am f6b60987: (-s ours) Import translations. DO NOT MERGE

* commit 'c6db3cc1b71fcab1824fc327dfec66df69bf139c':
  Import translations. DO NOT MERGE

9 years agoam f6b60987: (-s ours) Import translations. DO NOT MERGE
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

9 years agoImport 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

9 years agoam 99a3f807: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 3 Nov 2014 18:06:50 +0000 (18:06 +0000)]
am 99a3f807: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '99a3f80773b02305858b47acaea05451bd98a8c3':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 3 Nov 2014 18:03:03 +0000 (18:03 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 3 Nov 2014 18:01:40 +0000 (18:01 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 18:01:02 +0000 (10:01 -0800)]
Import translations. DO NOT MERGE

Change-Id: Id22a6dbb43d8911376c6cb3be95d6fce0011638f
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
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

9 years agoam 8f5c0e46: Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev
Jason Monk [Mon, 3 Nov 2014 14:45:21 +0000 (14:45 +0000)]
am 8f5c0e46: Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev

* commit '8f5c0e4660629546fb651e8bc739677a60ad3302':
  Bring screen lock setting back to screen pinning

9 years agoMerge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev
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

9 years agoUpdate class name for FdnList.
Andrew Lee [Fri, 31 Oct 2014 20:12:20 +0000 (13:12 -0700)]
Update class name for FdnList.

Bug: 18114923
Change-Id: If32383b08e9a217d4f6b16208a74ca546572acc0

9 years agoBring screen lock setting back to screen pinning
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

9 years agoam a7b5d2b3: Changed SIM calls to use PhoneAccount instead of SubInfoRecord.
PauloftheWest [Fri, 31 Oct 2014 17:48:35 +0000 (17:48 +0000)]
am a7b5d2b3: Changed SIM calls to use PhoneAccount instead of SubInfoRecord.

* commit 'a7b5d2b3843eeb2fa478a727c01ee2a312fa7bbd':
  Changed SIM calls to use PhoneAccount instead of SubInfoRecord.

9 years agoHide managed profile entry in secondary users
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

9 years agoApply predefined icon and label to managed profiles
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

9 years agoChanged SIM calls to use PhoneAccount instead of SubInfoRecord.
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

9 years agoAdded cellular data popup in DataUsage
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

9 years agoam 6f5b23f3: (-s ours) am 4c79a9ec: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Oct 2014 22:55:00 +0000 (22:55 +0000)]
am 6f5b23f3: (-s ours) am 4c79a9ec: (-s ours) Import translations. DO NOT MERGE

* commit '6f5b23f3fc4855c1906fd64fd3bcb9d5f14a02a2':
  Import translations. DO NOT MERGE

9 years agoam 062afd59: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Wed, 29 Oct 2014 22:54:52 +0000 (22:54 +0000)]
am 062afd59: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '062afd5964003e482ce6dfd2b2443413f594ee4e':
  Import translations. DO NOT MERGE

9 years agoam 98523c8b: Added Cellular Data for Multi-Sim Data Usage
PauloftheWest [Wed, 29 Oct 2014 22:54:20 +0000 (22:54 +0000)]
am 98523c8b: Added Cellular Data for Multi-Sim Data Usage

* commit '98523c8b8b90d011604d3a7e83a6b708f7b5e5ce':
  Added Cellular Data for Multi-Sim Data Usage

9 years agoam 4c79a9ec: (-s ours) Import translations. DO NOT MERGE
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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Wed, 29 Oct 2014 20:45:54 +0000 (20:45 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoImport translations. DO NOT MERGE
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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Oct 2014 20:31:24 +0000 (13:31 -0700)]
Import translations. DO NOT MERGE

Change-Id: I79579c3aa684edf09b0bc85941dea8a70a4c12fc
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
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

9 years agoAdded Cellular Data for Multi-Sim Data Usage
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

9 years agoam 917aaf9e: Merge "Add sim color selection in settings" into lmp-mr1-dev
Sanket Padawe [Tue, 28 Oct 2014 22:53:07 +0000 (22:53 +0000)]
am 917aaf9e: Merge "Add sim color selection in settings" into lmp-mr1-dev

* commit '917aaf9ebd2893b9d0cebc2b08c4f7d814fa53c7':
  Add sim color selection in settings

9 years agoMerge "Add sim color selection in settings" into lmp-mr1-dev
Sanket Padawe [Tue, 28 Oct 2014 22:48:33 +0000 (22:48 +0000)]
Merge "Add sim color selection in settings" into lmp-mr1-dev

9 years agoam 93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev
PauloftheWest [Tue, 28 Oct 2014 22:48:29 +0000 (22:48 +0000)]
am 93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev

* commit '93c10334c8380b997554a02f6071b3bc620e7705':
  Added IMEI status activity.

9 years agoMerge "Added IMEI status activity." 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

9 years agoAdd sim color selection in settings
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

9 years agoam 00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev
Paul Lawrence [Tue, 28 Oct 2014 20:14:31 +0000 (20:14 +0000)]
am 00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev

* commit '00abeba2c08b656db924d967a0733aa76aea40a7':
  Make emergency button right size

9 years agoMerge "Make emergency button right size" into lmp-mr1-dev
Paul Lawrence [Tue, 28 Oct 2014 20:08:33 +0000 (20:08 +0000)]
Merge "Make emergency button right size" into lmp-mr1-dev

9 years agoAdded IMEI status activity.
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

9 years agoMerge "Allow QS to launch adding network dialog" into lmp-mr1-dev
Jason Monk [Tue, 28 Oct 2014 19:16:38 +0000 (19:16 +0000)]
Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev
automerge: 496b3f6

* commit '496b3f647186866703af1081d26a987069a468a8':
  Allow QS to launch adding network dialog

9 years agoMerge "prettify debug informations" into lmp-mr1-dev
vandwalle [Tue, 28 Oct 2014 19:16:31 +0000 (19:16 +0000)]
Merge "prettify debug informations" into lmp-mr1-dev
automerge: 10a4cac

* commit '10a4cacc0f51a8d0e0f62be9375a3ca638b0ac4a':
  prettify debug informations

9 years agoMake emergency button right size
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

9 years agoMerge "Allow QS to launch adding network dialog" into lmp-mr1-dev
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

9 years agoMerge "prettify debug informations" into lmp-mr1-dev
vandwalle [Tue, 28 Oct 2014 18:34:32 +0000 (18:34 +0000)]
Merge "prettify debug informations" into lmp-mr1-dev

9 years agoAllow QS to launch adding network dialog
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

9 years agoam 90674e53: Merge "Settings: Follow update to common conditions call." into lmp...
John Spurlock [Tue, 28 Oct 2014 17:12:57 +0000 (17:12 +0000)]
am 90674e53: Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev

* commit '90674e53fc1fbac31f112fd6f11a5365cf66ec42':
  Settings: Follow update to common conditions call.

9 years agoMerge "Settings: Follow update to common conditions call." into lmp-mr1-dev
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