PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,133 Commits 1 Branch 0 Tags
6bd45c0eba9058362a44135ca365b3d4b685be9d
Commit Graph

7266 Commits

Author SHA1 Message Date
Alexandra Gherghina
6911af1cbe Save missing state in ConfirmAutoSyncChangeFragment 
Bug: 18117345
Change-Id: I5f176f330e51b23fe0935d435aa8bc3904e42d36
 2014-11-04 23:00:34 +00:00
Stuart Scott
b153181c9c Use CharSequence for DisplayName 
Change-Id: I2601eb9dc1edf585ad3b48da9fb97c65cb1face5
 2014-11-04 14:52:23 -08:00
vandwalle
e2ebb88560 am 68421fd5: am e1cb279f: am 508a693c: Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev 
* commit '68421fd5c66d2c14ffddc989ccb2815c4da74352':
  sanitize strings and error messages in wiFi picker
 2014-11-04 20:23:28 +00:00
vandwalle
508a693c9a Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev 2014-11-04 20:07:44 +00:00
vandwalle
b245731e88 sanitize strings and error messages in wiFi picker 
Change-Id: I642e79b40902bb45a503be949dea6a09d94b3bc8
 2014-11-04 12:05:30 -08:00
Andres Morales
48b0b241aa Confirm enabling OEM unlock with warning dialog 
Bug: 18227644
Change-Id: I326a4cf215ef0e30fd8a054964e0efeb3f627d89
 2014-11-04 10:58:19 -08:00
Alexandra Gherghina
060989bc28 am 204624ca: am 3016f721: am 2a03d8e2: Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev 
* commit '204624ca12b8a11256dc4a8a41ef252bd68f20e7':
  Hide managed profile entry in secondary users
 2014-11-04 14:03:03 +00:00
Alexandra Gherghina
7e7e54764e am ab054dc1: am 06ad8ce5: am d47f15a4: Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev 
* commit 'ab054dc138041e5cb77b24aab0f85a40e78eb942':
  Apply predefined icon and label to managed profiles
 2014-11-04 14:03:02 +00:00
Alexandra Gherghina
2a03d8e299 Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev 2014-11-04 13:51:05 +00:00
Alexandra Gherghina
d47f15a474 Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev 2014-11-04 13:50:52 +00:00
Stuart Scott
5ff258d6ea am 6b12f54a: am 173ef409: Clean up public API of SubInfoRecord. automerge: 3ada2ec 
* commit '6b12f54abb6b3ed8327b941062c9293b26534511':
  Clean up public API of SubInfoRecord.
 2014-11-04 03:19:05 +00:00
PauloftheWest
ae9b59faa3 am f75a8182: Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev automerge: ba53a84 automerge: e8cf3ee 
* commit 'f75a8182bd64983d3f9ec7208d0224a282af51e0':
  Added cellular data popup in DataUsage
 2014-11-04 01:13:53 +00:00
Andrew Lee
f36b2692af am 1d671eb2: am c53c5835: am 8d4f7f94: Merge "Update class name for FdnList." into lmp-mr1-dev 
* commit '1d671eb24be9f585b9ca83e820cb8869313729f6':
  Update class name for FdnList.
 2014-11-04 01:13:52 +00:00
Andres Morales
73bbd4cbff Request PIN confirmation to enable OEM unlock 
Bug: 18191568
Change-Id: I1cfce5131c96711876953a28d8d642342d15201e
 2014-11-03 17:02:11 -08:00
Stuart Scott
3ada2ecbe0 Clean up public API of SubInfoRecord. 
bug: 17575308
Change-Id: I38afd507b1c004fd566214c0b3812cab226936df
 2014-11-03 16:00:10 -08:00
PauloftheWest
ba53a846b1 Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev 2014-11-03 23:00:19 +00:00
Andrew Lee
8d4f7f94eb Merge "Update class name for FdnList." into lmp-mr1-dev 2014-11-03 21:00:04 +00:00
Jason Monk
52f3f76855 am 7833aae7: am d5032cb5: am 8f5c0e46: Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev 
* commit '7833aae7822c2e636c50c3756b894ee86c1072b8':
  Bring screen lock setting back to screen pinning
 2014-11-03 14:55:12 +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
PauloftheWest
3630f3f541 am 63fc10d7: am fb378106: am a7b5d2b3: Changed SIM calls to use PhoneAccount instead of SubInfoRecord. 
* commit '63fc10d7ca56962c5cb01df45ff8c0de98bb16a8':
  Changed SIM calls to use PhoneAccount instead of SubInfoRecord.
 2014-10-31 23:07:04 +00:00
Andrew Lee
da90d68b58 Update class name for FdnList. 
Bug: 18114923
Change-Id: If32383b08e9a217d4f6b16208a74ca546572acc0
 2014-10-31 13:21:57 -07: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
Alexandra Gherghina
c41d613751 Hide managed profile entry in secondary users 
Bug: 18132630
Change-Id: I0395373ac6f088f8fc880110c740cb5f05827901
 2014-10-31 12:04:02 +00:00
Alexandra Gherghina
0f5440f6e2 Apply predefined icon and label to managed profiles 
Bug: 18132630
Change-Id: Ie6cfee420847d6992accb0bc0ca3f5535260bc55
 2014-10-31 12:03:53 +00:00
PauloftheWest
4419548a2f am a0fe2765: am ffc766e0: am 98523c8b: Added Cellular Data for Multi-Sim Data Usage 
* commit 'a0fe276518cde3290d256d91906b28f43ef5a101':
  Added Cellular Data for Multi-Sim Data Usage
 2014-10-30 23:55:16 +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
PauloftheWest
de33844d81 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
 2014-10-30 13:56:23 -07:00
Sanket Padawe
197976e6d1 resolve merge conflicts of 4e4a3f8 to master. 
Change-Id: Idab7b34c8c3f4a833686fb104e1869438b2df51d
 2014-10-30 11:05:55 -07:00
PauloftheWest
9d5a324279 am 109ca52c: am 22f257b0: am 93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev 
* commit '109ca52c67c90d15c98cd3634035d0526f906e5b':
  Added IMEI status activity.
 2014-10-30 11:06:53 +00: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
917aaf9ebd Merge "Add sim color selection in settings" into lmp-mr1-dev 2014-10-28 22:48:33 +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
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
d920bd0819 am ca063736: Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev automerge: 496b3f6 automerge: 3caba72 
* commit 'ca063736e98decbf14d876dd90689d02cb18eaa2':
  Allow QS to launch adding network dialog
 2014-10-28 19:44:28 +00:00
vandwalle
5e62773362 am 64186866: Merge "prettify debug informations" into lmp-mr1-dev automerge: 10a4cac automerge: 1260451 
* commit '64186866c4fffa670543118c2e0fd95df4954362':
  prettify debug informations
 2014-10-28 19:44:27 +00:00
John Spurlock
bcfc830491 am 89ad2939: am 90674e53: Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev automerge: 22a466a 
* commit '89ad293983574615dcc2af9a46000feed363ca15':
  Settings: Follow update to common conditions call.
 2014-10-28 19:18:19 +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
Alexandra Gherghina
9102c3485c am 4da8a5c4: am 9f0bab9b: Merge "Close account settings if there\'s no account to show" into lmp-mr1-dev automerge: ffae7de 
* commit '4da8a5c4ad6bbbe6236832a2f76b05c231e1c446':
  Close account settings if there's no account to show
 2014-10-28 18:10:55 +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
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
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
d7f427b597 am bca457c6: am 4aab7ecb: Merge "Change subId to int from long" into lmp-mr1-dev automerge: cb02b97 
* commit 'bca457c60fd2dcd8d59ba4c16d23dfebe6e53a3d':
  Change subId to int from long
 2014-10-28 07:17:41 +00:00
Wink Saville
4aab7ecb56 Merge "Change subId to int from long" into lmp-mr1-dev 2014-10-27 17:35:44 +00:00
vandwalle
30ac117228 prettify debug informations 
Change-Id: I8e5c982f882a333e3f5ffdde6418447572547ea5
 2014-10-26 14:15:33 -07:00
Jim Miller
a3ff1a3fbe am a30955a6: am 500ecf26: am dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev 
* commit 'a30955a6634323dfc1ed2704ce0ca2f4f19d3ef3':
  Minor cleanup in EncryptionInterstitial
 2014-10-25 03:42:06 +00:00
Michael Wright
3f9b6331d6 am 56f8032a: am 7f402457: am ca6bc2ae: Skip Misc/Overcounted battery stats in release builds. automerge: f7a5017 automerge: 95f29a1 
* commit '56f8032a0c826019ac5588dc2f059a4bf00a0455':
  Skip Misc/Overcounted battery stats in release builds.
 2014-10-25 02:36:55 +00:00
Sanket Padawe
a34e092c07 am 6215d8dd: Default sim name set to carrier name in sim settings automerge: 745046c automerge: 8d60883 
* commit '6215d8dda9a94bb7dcacb483b3a26cdd39e299eb':
  Default sim name set to carrier name in sim settings
 2014-10-25 02:35:52 +00:00