PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,787 Commits 1 Branch 0 Tags
0de0fe0afcd57c5c831202bb04bbd15365f0e071
Commit Graph

15787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
0de0fe0afc Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-03 18:03:03 +00:00
Geoff Mendal
a9f8d29262 Import translations. DO NOT MERGE 
Change-Id: Id22a6dbb43d8911376c6cb3be95d6fce0011638f
Auto-generated-cl: translation import
 2014-11-03 10:01:02 -08:00
Jason Monk
d5032cb5e6 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
 2014-11-03 14:45:21 +00:00
Jason Monk
8f5c0e4660 Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev 2014-11-03 14:37:52 +00:00
Jason Monk
78121d9d10 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
 2014-10-31 15:45:12 -04:00
PauloftheWest
fb3781062c am a7b5d2b3: Changed SIM calls to use PhoneAccount instead of SubInfoRecord. 
* commit 'a7b5d2b3843eeb2fa478a727c01ee2a312fa7bbd':
  Changed SIM calls to use PhoneAccount instead of SubInfoRecord.
 2014-10-31 17:48:35 +00:00
PauloftheWest
a7b5d2b384 Changed SIM calls to use PhoneAccount instead of SubInfoRecord. 
+ Some import cleanup on SimSettings.

Change-Id: Ib18673f4eb0ce404bf13a58e0979401cca91385d
 2014-10-30 14:16:18 -07:00
Geoff Mendal
7eb595bd75 am 6f5b23f3: (-s ours) am 4c79a9ec: (-s ours) Import translations. DO NOT MERGE 
* commit '6f5b23f3fc4855c1906fd64fd3bcb9d5f14a02a2':
  Import translations. DO NOT MERGE
 2014-10-29 22:55:00 +00:00
Geoff Mendal
1e637964be am 062afd59: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '062afd5964003e482ce6dfd2b2443413f594ee4e':
  Import translations. DO NOT MERGE
 2014-10-29 22:54:52 +00:00
PauloftheWest
ffc766e0db am 98523c8b: Added Cellular Data for Multi-Sim Data Usage 
* commit '98523c8b8b90d011604d3a7e83a6b708f7b5e5ce':
  Added Cellular Data for Multi-Sim Data Usage
 2014-10-29 22:54:20 +00:00
Geoff Mendal
6f5b23f3fc am 4c79a9ec: (-s ours) Import translations. DO NOT MERGE 
* commit '4c79a9ecc0124d85e66aa3041c6b65b8582f4c87':
  Import translations. DO NOT MERGE
 2014-10-29 20:56:00 +00:00
Geoff Mendal
062afd5964 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-29 20:45:55 +00:00
Geoff Mendal
4c79a9ecc0 Import translations. DO NOT MERGE 
Change-Id: I61c6746c6591894d13cf5ee2f3fd70ab4fc2762e
Auto-generated-cl: translation import
 2014-10-29 13:38:11 -07:00
Geoff Mendal
d4aa6dd89d Import translations. DO NOT MERGE 
Change-Id: I79579c3aa684edf09b0bc85941dea8a70a4c12fc
Auto-generated-cl: translation import
 2014-10-29 13:31:24 -07:00
Geoff Mendal
15d1b346cf Import translations. DO NOT MERGE 
Change-Id: I2b2810ffec88c69ab46b6672df00d381ce2429b2
Auto-generated-cl: translation import
 2014-10-29 13:28:44 -07:00
PauloftheWest
98523c8b8b 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
 2014-10-29 12:48:39 -07:00
Sanket Padawe
4a1c5486b8 am 917aaf9e: Merge "Add sim color selection in settings" into lmp-mr1-dev 
* commit '917aaf9ebd2893b9d0cebc2b08c4f7d814fa53c7':
  Add sim color selection in settings
 2014-10-28 22:53:07 +00:00
Sanket Padawe
917aaf9ebd Merge "Add sim color selection in settings" into lmp-mr1-dev 2014-10-28 22:48:33 +00:00
PauloftheWest
22f257b091 am 93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev 
* commit '93c10334c8380b997554a02f6071b3bc620e7705':
  Added IMEI status activity.
 2014-10-28 22:48:29 +00:00
PauloftheWest
93c10334c8 Merge "Added IMEI status activity." into lmp-mr1-dev 2014-10-28 22:45:34 +00:00
Sanket Padawe
abc505aac3 Add sim color selection in settings 
Adding a dropdown list to select sim color from sim settings UI.

Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
 2014-10-28 14:01:50 -07:00
Paul Lawrence
be49264410 am 00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev 
* commit '00abeba2c08b656db924d967a0733aa76aea40a7':
  Make emergency button right size
 2014-10-28 20:14:31 +00:00
Paul Lawrence
00abeba2c0 Merge "Make emergency button right size" into lmp-mr1-dev 2014-10-28 20:08:33 +00:00
PauloftheWest
f41aaa249b 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
 2014-10-28 13:00:11 -07:00
Jason Monk
3caba72aa1 Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev 
automerge: 496b3f6

* commit '496b3f647186866703af1081d26a987069a468a8':
  Allow QS to launch adding network dialog
 2014-10-28 19:16:38 +00:00
vandwalle
12604519aa Merge "prettify debug informations" into lmp-mr1-dev 
automerge: 10a4cac

* commit '10a4cacc0f51a8d0e0f62be9375a3ca638b0ac4a':
  prettify debug informations
 2014-10-28 19:16:31 +00:00
Paul Lawrence
59717ad3a7 Make emergency button right size 
Bug: 18123894
Bug: 17394128
Change-Id: I248890b82f62146e1814172fd8b67e9a39661997
 2014-10-28 19:01:18 +00:00
Jason Monk
496b3f6471 Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev 2014-10-28 18:45:24 +00:00
vandwalle
10a4cacc0f Merge "prettify debug informations" into lmp-mr1-dev 2014-10-28 18:34:33 +00:00
Jason Monk
36760c108b 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
 2014-10-28 13:21:12 -04:00
John Spurlock
22a466a82e am 90674e53: Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev 
* commit '90674e53fc1fbac31f112fd6f11a5365cf66ec42':
  Settings: Follow update to common conditions call.
 2014-10-28 17:12:57 +00:00
John Spurlock
90674e53fc Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev 2014-10-28 17:08:51 +00:00
John Spurlock
24791abae1 Settings: Follow update to common conditions call. 
Bug: 16824863
Change-Id: I4a4e455b99e1c68a65c63bfd3a9972e57555825f
 2014-10-28 12:33:30 -04:00
Alexandra Gherghina
ffae7de1ea am 9f0bab9b: Merge "Close account settings if there\'s no account to show" into lmp-mr1-dev 
* commit '9f0bab9bcb756607da99758971207ad833c4608b':
  Close account settings if there's no account to show
 2014-10-28 15:35:36 +00:00
Alexandra Gherghina
9f0bab9bcb Merge "Close account settings if there's no account to show" into lmp-mr1-dev 2014-10-28 15:29:38 +00:00
Wink Saville
cb02b97f8d am 4aab7ecb: Merge "Change subId to int from long" into lmp-mr1-dev 
* commit '4aab7ecb56e9af4600b126c67d7efe0b7e1f6ee1':
  Change subId to int from long
 2014-10-27 20:37:06 +00:00
Geoff Mendal
967c000603 am 855f0d26: (-s ours) Import translations. DO NOT MERGE automerge: c7df50c -s ours 
* commit '855f0d264343325fb308bd27c509d7f95893d645':
  Import translations. DO NOT MERGE
 2014-10-27 20:37:05 +00:00
Geoff Mendal
9ab85cf0e0 am 40f84ca0: (-s ours) Import translations. DO NOT MERGE 
* commit '40f84ca02033ce62e301dd6d16fdc1f4b9a5326a':
  Import translations. DO NOT MERGE
 2014-10-27 20:37:04 +00:00
Wink Saville
4aab7ecb56 Merge "Change subId to int from long" into lmp-mr1-dev 2014-10-27 17:35:44 +00:00
Geoff Mendal
855f0d2643 Import translations. DO NOT MERGE 
automerge: c7df50c  -s ours

* commit 'c7df50c5fdb8e4e3b26ff1647047e9e31c444994':
  Import translations. DO NOT MERGE
 2014-10-27 17:11:43 +00:00
Geoff Mendal
c7df50c5fd Import translations. DO NOT MERGE 
Change-Id: Id43df7ce7c8056dcdd1813ddc804acbc3ba46dd6
Auto-generated-cl: translation import
 2014-10-27 09:49:35 -07:00
Geoff Mendal
f571e511ba Import translations. DO NOT MERGE 
Change-Id: Ia682e947ee01ba5ecc42b3a4578fcc010a7efead
Auto-generated-cl: translation import
 2014-10-27 09:43:16 -07:00
Geoff Mendal
40f84ca020 Import translations. DO NOT MERGE 
Change-Id: Ifc5fc4573b40b501282cb71a17ba8c6873dc64c6
Auto-generated-cl: translation import
 2014-10-27 09:40:31 -07:00
vandwalle
30ac117228 prettify debug informations 
Change-Id: I8e5c982f882a333e3f5ffdde6418447572547ea5
 2014-10-26 14:15:33 -07:00
Jim Miller
500ecf26d1 am dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev 
* commit 'dd932476b92f9d0e7ef8617d32a1d49d830b6787':
  Minor cleanup in EncryptionInterstitial
 2014-10-25 01:09:05 +00:00
Jim Miller
dd932476b9 Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev 2014-10-25 01:01:17 +00:00
Michael Wright
7f40245777 am ca6bc2ae: Skip Misc/Overcounted battery stats in release builds. automerge: f7a5017 automerge: 95f29a1 
* commit 'ca6bc2aefad547d3ca3897b5ef8b8d5feafc7e2b':
  Skip Misc/Overcounted battery stats in release builds.
 2014-10-24 23:03:44 +00:00
Jim Miller
59864d2ce7 Minor cleanup in EncryptionInterstitial 
Fixes bug 18037481

Change-Id: I4e9dcc86a2d3db5c9311d5f743f03db19ca164e6
 2014-10-24 15:41:44 -07:00
Michael Wright
ca6bc2aefa Skip Misc/Overcounted battery stats in release builds. automerge: f7a5017 
automerge: 95f29a1

* commit '95f29a1930244b9978a55073326c9fb071c2615f':
  Skip Misc/Overcounted battery stats in release builds.
 2014-10-24 22:33:50 +00:00
Wink Saville
b003a85941 Change subId to int from long 
Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
 2014-10-24 15:08:44 -07:00