OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev
PauloftheWest [Thu, 4 Dec 2014 15:17:48 +0000 (15:17 +0000)]
am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev

* commit 'e8a868f26616f59206eba19c0b08ad4c99882b8c':
  Add SIM notification pop-ups.

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Thu, 4 Dec 2014 05:48:32 +0000 (05:48 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoMerge "Add SIM notification pop-ups." into lmp-mr1-dev
PauloftheWest [Wed, 3 Dec 2014 23:30:52 +0000 (23:30 +0000)]
Merge "Add SIM notification pop-ups." into lmp-mr1-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Dec 2014 20:51:33 +0000 (12:51 -0800)]
Import translations. DO NOT MERGE

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

9 years agoam 45893e65: Settings: Don\'t lose the switch bar returning to saver settings.
John Spurlock [Wed, 3 Dec 2014 20:37:50 +0000 (20:37 +0000)]
am 45893e65: Settings: Don\'t lose the switch bar returning to saver settings.

* commit '45893e65b65a11abda22ea299f217d22c91228ca':
  Settings: Don't lose the switch bar returning to saver settings.

9 years agoSettings: Don't lose the switch bar returning to saver settings.
John Spurlock [Wed, 3 Dec 2014 20:03:54 +0000 (15:03 -0500)]
Settings: Don't lose the switch bar returning to saver settings.

Bug: 18595359
Change-Id: I01c24fd8ed304837338c2b353805b3d3324e1639

9 years agoam 3c00e18b: Merge "Modify account settings for better locale resolution" into lmp...
Alexandra Gherghina [Wed, 3 Dec 2014 17:27:10 +0000 (17:27 +0000)]
am 3c00e18b: Merge "Modify account settings for better locale resolution" into lmp-mr1-dev

* commit '3c00e18ba7425a1837a1e458f16e5192254a196b':
  Modify account settings for better locale resolution

9 years agoam 84bc5618: Merge "Show account icons for managed profiles on Settings > Factory...
Zoltan Szatmary-Ban [Wed, 3 Dec 2014 17:27:09 +0000 (17:27 +0000)]
am 84bc5618: Merge "Show account icons for managed profiles on Settings > Factory Reset" into lmp-mr1-dev

* commit '84bc561848d55e320cbefd3acab8692e4f891a12':
  Show account icons for managed profiles on Settings > Factory Reset

9 years agoMerge "Modify account settings for better locale resolution" into lmp-mr1-dev
Alexandra Gherghina [Wed, 3 Dec 2014 12:15:37 +0000 (12:15 +0000)]
Merge "Modify account settings for better locale resolution" into lmp-mr1-dev

9 years agoModify account settings for better locale resolution
Alexandra Gherghina [Mon, 11 Aug 2014 11:40:13 +0000 (12:40 +0100)]
Modify account settings for better locale resolution

Bug: 16282173
Change-Id: I2ab861464cdbbb1c1b0a5a7231f960d8ed9e90c6

9 years agoMerge "Show account icons for managed profiles on Settings > Factory Reset" into...
Zoltan Szatmary-Ban [Wed, 3 Dec 2014 10:23:27 +0000 (10:23 +0000)]
Merge "Show account icons for managed profiles on Settings > Factory Reset" into lmp-mr1-dev

9 years agoam ef4d1791: Merge "Fixed improper capitalization related to trademark term in BT...
Sanket Padawe [Wed, 3 Dec 2014 02:29:06 +0000 (02:29 +0000)]
am ef4d1791: Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev

* commit 'ef4d17910673709977624ff6d9e8ec499e3ac2fa':
  Fixed improper capitalization related to trademark term in BT

9 years agoam 97c65a5e: Merge "New activity for enabling tethering using Quick Settings" into...
Sanket Padawe [Wed, 3 Dec 2014 02:29:04 +0000 (02:29 +0000)]
am 97c65a5e: Merge "New activity for enabling tethering using Quick Settings" into lmp-mr1-dev

* commit '97c65a5ee6adbc7fa5b02e3a8bf31fbedb075326':
  New activity for enabling tethering using Quick Settings

9 years agoam 37a0c07b: Merge "Fixed crash in sim settings due to wrong toString() call." into...
Sanket Padawe [Wed, 3 Dec 2014 02:29:03 +0000 (02:29 +0000)]
am 37a0c07b: Merge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev

* commit '37a0c07b9b73b8d99c43cfdce2bd0b78fdec2a2a':
  Fixed crash in sim settings due to wrong toString() call.

9 years agoam 430e01d0: Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement...
Sanket Padawe [Wed, 3 Dec 2014 02:29:02 +0000 (02:29 +0000)]
am 430e01d0: Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev

* commit '430e01d01fb8ab51a4975d8f8d46760c7873f425':
  Fixing "SMS Messages" to "SMS messages" as per UX requirement.

9 years agoam 7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev
Maurice Lam [Wed, 3 Dec 2014 02:28:58 +0000 (02:28 +0000)]
am 7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev

* commit '7b484b9af07aa92c530312507ee9a8ea85b00198':
  [FRP] Theme interstitials for lock screen setup

9 years agoam 18701587: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 02:28:57 +0000 (02:28 +0000)]
am 18701587: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '187015873210af2923167d30f387e6d33fe01889':
  Import translations. DO NOT MERGE

9 years agoMerge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev
Sanket Padawe [Wed, 3 Dec 2014 01:36:09 +0000 (01:36 +0000)]
Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev

9 years agoMerge "New activity for enabling tethering using Quick Settings" into lmp-mr1-dev
Sanket Padawe [Wed, 3 Dec 2014 01:33:58 +0000 (01:33 +0000)]
Merge "New activity for enabling tethering using Quick Settings" into lmp-mr1-dev

9 years agoMerge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev
Sanket Padawe [Wed, 3 Dec 2014 01:32:26 +0000 (01:32 +0000)]
Merge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev

9 years agoMerge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev
Sanket Padawe [Wed, 3 Dec 2014 01:31:43 +0000 (01:31 +0000)]
Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev

9 years agoMerge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev
Maurice Lam [Wed, 3 Dec 2014 01:27:55 +0000 (01:27 +0000)]
Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:26:31 +0000 (01:26 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 01:01:39 +0000 (17:01 -0800)]
Import translations. DO NOT MERGE

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

9 years agoAdd SIM notification pop-ups.
PauloftheWest [Tue, 18 Nov 2014 15:12:48 +0000 (07:12 -0800)]
Add SIM notification pop-ups.

+ Added a SimDialogActivity so any application can iniate a request to
se tthe default Data, Calls, and SMS.

Bug: 18293625
Change-Id: I60535125b40ece5ebc14542d732e4493bddefbae

9 years agoam 91177d1c: Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp...
Lucky Zhang [Tue, 2 Dec 2014 23:53:07 +0000 (23:53 +0000)]
am 91177d1c: Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev

* commit '91177d1c1668d4efcffb69cc4cf9bf8bb7c96f19':
  [FRP] Show FRP warning when disabling secure unlock

9 years agoMerge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev
Lucky Zhang [Tue, 2 Dec 2014 23:45:55 +0000 (23:45 +0000)]
Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev

9 years agoFixing "SMS Messages" to "SMS messages" as per UX requirement.
Sanket Padawe [Tue, 2 Dec 2014 23:40:23 +0000 (15:40 -0800)]
Fixing "SMS Messages" to "SMS messages" as per UX requirement.

Bug: 17322866
Change-Id: Id4dcfc70ef4675adabeb42c3f6bdf5bdbe5f71f1

9 years agoam 794cbd70: Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 21:27:43 +0000 (21:27 +0000)]
am 794cbd70: Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev

* commit '794cbd70fa3d101b1a8a587faf327c7700c946eb':
  Changed SIM lock toggle to a switch

9 years agoMerge "Changed SIM lock toggle to a switch" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 21:19:51 +0000 (21:19 +0000)]
Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev

9 years agoam 003aee5f: Merge "Bug Fix: SIM Status will display the proper network type" into...
PauloftheWest [Tue, 2 Dec 2014 20:08:06 +0000 (20:08 +0000)]
am 003aee5f: Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev

* commit '003aee5f0adfde950407380a5c738ed4bc59bf2b':
  Bug Fix: SIM Status will display the proper network type

9 years agoMerge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 20:01:39 +0000 (20:01 +0000)]
Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev

9 years agoBug Fix: SIM Status will display the proper network type
PauloftheWest [Tue, 25 Nov 2014 20:15:35 +0000 (12:15 -0800)]
Bug Fix: SIM Status will display the proper network type

Bug: 18414792
Change-Id: I41f838ab95eaf9d546e59c9e2a793bbab393cb27

9 years agoam 61066c13: Merge "[New RemoveAccount API in Settings App]: Modify Settings app...
Simranjit Singh Kohli [Tue, 2 Dec 2014 19:18:50 +0000 (19:18 +0000)]
am 61066c13: Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev

* commit '61066c13ed5ba493c58c76d84f489a35dc5af8d1':
  [New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API

9 years agoMerge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new...
Simranjit Singh Kohli [Tue, 2 Dec 2014 19:09:00 +0000 (19:09 +0000)]
Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev

9 years agoFixed crash in sim settings due to wrong toString() call.
Sanket Padawe [Tue, 2 Dec 2014 18:52:22 +0000 (10:52 -0800)]
Fixed crash in sim settings due to wrong toString() call.

Bug: 18589605
Change-Id: I2ae756f113904e1325ad3cc686cee0300cbd71e4

9 years agoam da02111f: Merge "Added color to Data Usage graph" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 18:04:43 +0000 (18:04 +0000)]
am da02111f: Merge "Added color to Data Usage graph" into lmp-mr1-dev

* commit 'da02111f16b7d2b09fb447342a9aa4640c75a117':
  Added color to Data Usage graph

9 years agoam fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 18:04:42 +0000 (18:04 +0000)]
am fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev

* commit 'fc6a8bf2d729ad21fa8d7622f580401db351c269':
  Fixed a Wi-Fi dialog crash

9 years agoMerge "Added color to Data Usage graph" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 17:58:46 +0000 (17:58 +0000)]
Merge "Added color to Data Usage graph" into lmp-mr1-dev

9 years agoMerge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 17:58:23 +0000 (17:58 +0000)]
Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev

9 years agoam 41c29625: Merge "Remove extraneous SIM status information" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 17:56:08 +0000 (17:56 +0000)]
am 41c29625: Merge "Remove extraneous SIM status information" into lmp-mr1-dev

* commit '41c2962552b750a8e5fa07f283ba2b72b36d2298':
  Remove extraneous SIM status information

9 years agoMerge "Remove extraneous SIM status information" into lmp-mr1-dev
PauloftheWest [Tue, 2 Dec 2014 17:50:30 +0000 (17:50 +0000)]
Merge "Remove extraneous SIM status information" into lmp-mr1-dev

9 years agoNew activity for enabling tethering using Quick Settings
Sanket Padawe [Tue, 2 Dec 2014 17:45:35 +0000 (09:45 -0800)]
New activity for enabling tethering using Quick Settings

Added a new activity which would handle tethering on clicking Tethering
tile of Quick Settings.

Bug: 18368949
Change-Id: I77057f3ccd26263831ba88e426b5f8d3ad1fa788

9 years agoShow account icons for managed profiles on Settings > Factory Reset
Zoltan Szatmary-Ban [Tue, 2 Dec 2014 17:22:10 +0000 (17:22 +0000)]
Show account icons for managed profiles on Settings > Factory Reset

Fixing a bug where managed profile's accounts where shown without
the account icon.

Bug: 18555032
Change-Id: I5a1094e795b31a00599bc4df413573030693b436

9 years ago[FRP] Theme interstitials for lock screen setup
Maurice Lam [Mon, 1 Dec 2014 18:41:49 +0000 (10:41 -0800)]
[FRP] Theme interstitials for lock screen setup

Use the setup wizard theme for EncryptionInterstital and
RedactionInterstitial as they will show during the lock screen setup
as part of setup wizard.

Bug: 18482708
Change-Id: I65c8924952345a4e17fcf4ffb7d68df53244c5d7

9 years agoam 1dce16a6: Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev
Maurice Lam [Tue, 2 Dec 2014 03:06:02 +0000 (03:06 +0000)]
am 1dce16a6: Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev

* commit '1dce16a61c65ec9c1dd870edbd6dd3ef5d7ca703':
  [WifiSetup] Swap buttons position in Skip dialog

9 years agoMerge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev
Maurice Lam [Tue, 2 Dec 2014 02:59:09 +0000 (02:59 +0000)]
Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev

9 years ago[FRP] Show FRP warning when disabling secure unlock
Lucky Zhang [Wed, 26 Nov 2014 02:22:14 +0000 (18:22 -0800)]
[FRP] Show FRP warning when disabling secure unlock

Added a dialog fragment to display warning message about disabling
device protection features when changing from a secure unlock
method to an insecure one.

Bug: 18509782
Change-Id: I0eaa9ff55c14092d8b3361d10da8b4530dd79bee

9 years agoam 6b19fa90: [FRP] Theming for Pattern and Password screens
Maurice Lam [Tue, 2 Dec 2014 01:04:39 +0000 (01:04 +0000)]
am 6b19fa90: [FRP] Theming for Pattern and Password screens

* commit '6b19fa9017800b94c75238339a337fd8f6c3e808':
  [FRP] Theming for Pattern and Password screens

9 years ago[FRP] Theming for Pattern and Password screens
Maurice Lam [Wed, 26 Nov 2014 03:25:56 +0000 (19:25 -0800)]
[FRP] Theming for Pattern and Password screens

Basic theming for pattern and password screens. Create subclasses for
ChooseLockPassword and ChooseLockPattern, and copied their XML
layouts.

This CL mainly uses the buttons in the original screens as-is, with a
follow-up CL coming to change to use the nav bar buttons.

Bug: 18482708
Change-Id: I81751f781de633aff23fc68657589360007c235a

9 years ago[WifiSetup] Swap buttons position in Skip dialog
Maurice Lam [Mon, 1 Dec 2014 20:09:10 +0000 (12:09 -0800)]
[WifiSetup] Swap buttons position in Skip dialog

According to material-spec, buttons that keep users in the same
screen should be on the left (negative button) while button that
intorduce changes should be on the right, even if the action is
destructive.

Bug: 18542108
Change-Id: I335f83c6bb810cd43aeda28566baacea39435c57

9 years agoFixed improper capitalization related to trademark term in BT
Sanket Padawe [Wed, 26 Nov 2014 20:00:58 +0000 (12:00 -0800)]
Fixed improper capitalization related to trademark term in BT

Bug: 18362051
Change-Id: I3074e120a5b261fbcb5d429bae47d233ad6fd695

9 years agoam c868f703: Settings: Improve inline volume sliders.
John Spurlock [Mon, 1 Dec 2014 17:11:23 +0000 (17:11 +0000)]
am c868f703: Settings: Improve inline volume sliders.

* commit 'c868f7035a6d05332b3d8afcde2ae27ad0413e79':
  Settings: Improve inline volume sliders.

9 years agoSettings: Improve inline volume sliders.
John Spurlock [Fri, 28 Nov 2014 20:39:11 +0000 (15:39 -0500)]
Settings: Improve inline volume sliders.

 - Track framework changes to show mute states for non-ringer streams
 - Update vibrate icon in sync with other system components.

Depends on:
  Ie2df52edb070055ef59c74039162a0e785d2fdbb

Bug: 17899613
Change-Id: Ib38c86600693e0f36fe72deb231ea751e0486af7

9 years agoam 7da7c222: Merge "Settings: Restart volumizers explicitly on resume." into lmp...
John Spurlock [Mon, 1 Dec 2014 15:04:03 +0000 (15:04 +0000)]
am 7da7c222: Merge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev

* commit '7da7c2220d3a30fb3a1b57ee95caa9aec860a132':
  Settings: Restart volumizers explicitly on resume.

9 years agoMerge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev
John Spurlock [Mon, 1 Dec 2014 14:57:53 +0000 (14:57 +0000)]
Merge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev

9 years agoam 80986508: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 14:52:54 +0000 (14:52 +0000)]
am 80986508: (-s ours) Import translations. DO NOT MERGE

* commit '80986508fcf1ac52cb6665283d093c90115cc3fe':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 14:49:25 +0000 (06:49 -0800)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 14:36:03 +0000 (06:36 -0800)]
Import translations. DO NOT MERGE

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

9 years agoam 2d93f36f: Add string for "Connected via Wi-Fi assistant".
Jeff Davidson [Wed, 26 Nov 2014 23:46:46 +0000 (23:46 +0000)]
am 2d93f36f: Add string for "Connected via Wi-Fi assistant".

* commit '2d93f36f00226a45adf9ad2f001e599f95e61692':
  Add string for "Connected via Wi-Fi assistant".

9 years agoAdd string for "Connected via Wi-Fi assistant".
Jeff Davidson [Wed, 26 Nov 2014 23:37:07 +0000 (15:37 -0800)]
Add string for "Connected via Wi-Fi assistant".

Bug: 18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d

9 years agoSettings: Restart volumizers explicitly on resume.
John Spurlock [Wed, 26 Nov 2014 15:03:17 +0000 (10:03 -0500)]
Settings: Restart volumizers explicitly on resume.

onBindView is no longer called in all cases, so use
onResume as an additional signal that the user returned
to the settings page.  onActivityStop is called in both
cases to cleanup.

Bug: 17461564
Change-Id: I73a6775260951d4fd82ca8c3d8eb852f8dcc7452

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 26 Nov 2014 14:57:45 +0000 (14:57 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoam 645cf17f: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Nov 2014 14:50:01 +0000 (14:50 +0000)]
am 645cf17f: (-s ours) Import translations. DO NOT MERGE

* commit '645cf17f68bbf8580d9cc01a0527445c1c78e74d':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Nov 2014 14:38:44 +0000 (06:38 -0800)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Nov 2014 14:25:44 +0000 (06:25 -0800)]
Import translations. DO NOT MERGE

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

9 years agoam 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev
Maurice Lam [Wed, 26 Nov 2014 01:46:27 +0000 (01:46 +0000)]
am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev

* commit '3f9d8b60ca9d3815736a4e11d17565fe18524a28':
  [Setup] Theme ChooseLockGeneric for setup wizard

9 years agoMerge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev
Maurice Lam [Wed, 26 Nov 2014 01:15:35 +0000 (01:15 +0000)]
Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev

9 years ago[Setup] Theme ChooseLockGeneric for setup wizard
Maurice Lam [Tue, 25 Nov 2014 22:06:38 +0000 (14:06 -0800)]
[Setup] Theme ChooseLockGeneric for setup wizard

This is step one of theming the set-up lock screen flow to match the
setup wizard theme. This shows the general approach of creating a
subclass of both the activity and fragment and overriding methods to
achieve the desired behavior for setup.

ag/594000 is a much more comprehensive change for what the final
change will look like.

Bug: 18482708
Change-Id: Idff34937f39f46a0c488df2cae4c46155b80cab7

9 years agoam 09d27637: Merge "IllegalStateException fixed in print service settings" into lmp...
Fabrice Di Meglio [Wed, 26 Nov 2014 00:37:43 +0000 (00:37 +0000)]
am 09d27637: Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev

* commit '09d276371560a8e20e80a7f05a6807b5b8f0ace3':
  IllegalStateException fixed in print service settings

9 years agoMerge "IllegalStateException fixed in print service settings" into lmp-mr1-dev
Fabrice Di Meglio [Wed, 26 Nov 2014 00:31:49 +0000 (00:31 +0000)]
Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev

9 years agoIllegalStateException fixed in print service settings
Raju Yadav [Tue, 25 Nov 2014 12:26:17 +0000 (13:26 +0100)]
IllegalStateException fixed in print service settings

Settings crashed due to IllegalStateException
as OnQueryTextListener refers to an already
detached view. The listener is set to null
on press of home key (onPause).

Change-Id: I96052f95689ae17dd1b4e9d1c313100b7b47a599

9 years agoRemove extraneous SIM status information
PauloftheWest [Tue, 25 Nov 2014 20:36:40 +0000 (12:36 -0800)]
Remove extraneous SIM status information

Bug: 18467248
Change-Id: I59aff3f979f76ca622a6a9e944398042f236f0b7

9 years agoFixed a Wi-Fi dialog crash
PauloftheWest [Tue, 25 Nov 2014 13:16:22 +0000 (05:16 -0800)]
Fixed a Wi-Fi dialog crash

Bug: 18498974
Change-Id: I00ba9828c4f15cefd143fc1c92e1c81f43e91c95

9 years agoam 647f9752: Merge "Don\'t show RedactionInterstitial when changing password" into...
Adrian Roos [Tue, 25 Nov 2014 15:04:25 +0000 (15:04 +0000)]
am 647f9752: Merge "Don\'t show RedactionInterstitial when changing password" into lmp-mr1-dev

* commit '647f9752ce1bdd4c02cd44028dac769369140764':
  Don't show RedactionInterstitial when changing password

9 years agoMerge "Don't show RedactionInterstitial when changing password" into lmp-mr1-dev
Adrian Roos [Tue, 25 Nov 2014 14:59:59 +0000 (14:59 +0000)]
Merge "Don't show RedactionInterstitial when changing password" into lmp-mr1-dev

9 years agoAdded color to Data Usage graph
PauloftheWest [Tue, 25 Nov 2014 12:40:45 +0000 (04:40 -0800)]
Added color to Data Usage graph

+ Fixed some issues with displaying multiple SIMs in Data Usage.

Bug: 18466592
Bug: 18291246
Change-Id: I77417be995761ce62e464c7d21a34af1334aac17

9 years agoam 74896d6f: Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev
Lucky Zhang [Mon, 24 Nov 2014 20:01:20 +0000 (20:01 +0000)]
am 74896d6f: Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev

* commit '74896d6f1d6e2b5507f3e1b2c6d40d6ae1bfde37':
  [WifiSetup] Wifi setup text wrapping problem

9 years agoMerge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev
Lucky Zhang [Mon, 24 Nov 2014 19:33:12 +0000 (19:33 +0000)]
Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev

9 years agoam faf1dd20: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Nov 2014 18:27:37 +0000 (18:27 +0000)]
am faf1dd20: (-s ours) Import translations. DO NOT MERGE

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

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

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

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

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

9 years agoDon't show RedactionInterstitial when changing password
Adrian Roos [Mon, 24 Nov 2014 16:17:13 +0000 (17:17 +0100)]
Don't show RedactionInterstitial when changing password

Only show when going from an insecure to secure lock.

Bug: 18467783
Change-Id: Ia73682d45b1dcd9ad61a00abeac099a94256e3b7

9 years agoam 95a28c3f: Merge "Reduce number of attempts before factory reset to 30." into lmp...
Paul Crowley [Mon, 24 Nov 2014 15:26:56 +0000 (15:26 +0000)]
am 95a28c3f: Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev

* commit '95a28c3f10b3f9a2fdcebcd1019f97989e2393c5':
  Reduce number of attempts before factory reset to 30.

9 years agoMerge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev
Paul Crowley [Mon, 24 Nov 2014 15:21:55 +0000 (15:21 +0000)]
Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev

9 years agoam 44b50ad3: Merge "Fixed build breakage due to api change." into lmp-mr1-dev
Selim Cinek [Mon, 24 Nov 2014 13:39:38 +0000 (13:39 +0000)]
am 44b50ad3: Merge "Fixed build breakage due to api change." into lmp-mr1-dev

* commit '44b50ad313e827f03391ebac47f3db6308b52d42':
  Fixed build breakage due to api change.

9 years agoMerge "Fixed build breakage due to api change." into lmp-mr1-dev
Selim Cinek [Mon, 24 Nov 2014 13:35:53 +0000 (13:35 +0000)]
Merge "Fixed build breakage due to api change." into lmp-mr1-dev

9 years agoFixed build breakage due to api change.
Selim Cinek [Mon, 24 Nov 2014 13:09:51 +0000 (14:09 +0100)]
Fixed build breakage due to api change.

Bug: 16239208
Change-Id: I9c2b13d3687f9f61307e0c13b6940425faebfa9f

9 years agoam 6ad85792: Merge "Stop background processes if TrustedCredentialSettings fragment...
Zoltan Szatmary-Ban [Mon, 24 Nov 2014 12:13:10 +0000 (12:13 +0000)]
am 6ad85792: Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev

* commit '6ad8579262dbc059472a2cbe1ff4b675f01e4268':
  Stop background processes if TrustedCredentialSettings fragment gets detached

9 years agoMerge "Stop background processes if TrustedCredentialSettings fragment gets detached...
Zoltan Szatmary-Ban [Mon, 24 Nov 2014 12:08:00 +0000 (12:08 +0000)]
Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev

9 years agoChanged SIM lock toggle to a switch
PauloftheWest [Mon, 17 Nov 2014 20:47:38 +0000 (12:47 -0800)]
Changed SIM lock toggle to a switch

Bug: 18408617
Change-Id: Iea14f40082aa9b7fd6c1925ee5ca5e6bc6841140

9 years agoam 239d185a: Merge "Additional changes to SubscriptionManager API as per API council...
Wink Saville [Sat, 22 Nov 2014 20:22:57 +0000 (20:22 +0000)]
am 239d185a: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev

* commit '239d185aa727a0930f1983cd77ddaeb268adc315':
  Additional changes to SubscriptionManager API as per API council.

9 years agoMerge "Additional changes to SubscriptionManager API as per API council." into lmp...
Wink Saville [Sat, 22 Nov 2014 20:19:54 +0000 (20:19 +0000)]
Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev

9 years agoAdditional changes to SubscriptionManager API as per API council.
Wink Saville [Sat, 22 Nov 2014 18:11:39 +0000 (10:11 -0800)]
Additional changes to SubscriptionManager API as per API council.

bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62

9 years agoam c3245a05: Reword NuPlayer developer settings to say AwesomePlayer
Lajos Molnar [Sat, 22 Nov 2014 06:51:13 +0000 (06:51 +0000)]
am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer

* commit 'c3245a0555fbd9b02407edebfdac386a62a4af0a':
  Reword NuPlayer developer settings to say AwesomePlayer

9 years agoReword NuPlayer developer settings to say AwesomePlayer
Lajos Molnar [Sat, 22 Nov 2014 05:01:40 +0000 (21:01 -0800)]
Reword NuPlayer developer settings to say AwesomePlayer

Bug: 18489541
Change-Id: Iab3ad293fb6689949e57375371fa6ac649b4ff0c

9 years agoam 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev
Andres Morales [Sat, 22 Nov 2014 03:32:52 +0000 (03:32 +0000)]
am 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev

* commit '7090c92f3933238a06a6d799e49ae6b13d09cbb4':
  Update enable oem unlock warning

9 years agoMerge "Update enable oem unlock warning" into lmp-mr1-dev
Andres Morales [Sat, 22 Nov 2014 03:28:44 +0000 (03:28 +0000)]
Merge "Update enable oem unlock warning" into lmp-mr1-dev

9 years ago[WifiSetup] Wifi setup text wrapping problem
Lucky Zhang [Sat, 22 Nov 2014 02:33:50 +0000 (18:33 -0800)]
[WifiSetup] Wifi setup text wrapping problem

Fixed the text orientation for items in wifi settings on 600dp screens
in portrait mode. This bug only happens in such a setup, because
there is a mistake in the corresponding style file.

Bug: 18323509
Change-Id: I7ca6a3b27c8ab32481e02590f7ea78d452ab8090

9 years agoUpdate enable oem unlock warning
Andres Morales [Wed, 19 Nov 2014 21:55:44 +0000 (13:55 -0800)]
Update enable oem unlock warning

updating the strings from bug previously fixed

Bug:18227644
Change-Id: I2b651c807df7585f4d08a26a2a09895100ae2cd6