PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,779 Commits 1 Branch 0 Tags
2ad430e74288be0af1db2c7623beebd76e5af20c
Commit Graph

18779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sanket Padawe
63530b56bb Merge "Sim name doesn't persist on reboot" into lmp-mr1-dev 2014-11-05 17:59:41 +00:00
Andres Morales
eb55ac90dd 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
 2014-11-05 17:38:35 +00:00
John Spurlock
645cc5cf82 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
 2014-11-05 12:04:16 -05:00
Paul Crowley
966a1cadbf 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.
 2014-11-05 16:35:53 +00:00
Andres Morales
ea4d9a9eca Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev 
* changes:
  Confirm enabling OEM unlock with warning dialog
  Request PIN confirmation to enable OEM unlock
 2014-11-05 16:31:54 +00:00
Paul Crowley
e6ad7bf052 Merge "Don't show a pattern-specific prompt at encryption time." into lmp-mr1-dev 2014-11-05 15:57:09 +00:00
Alexandra Gherghina
11fa427f6a am 7ce01fe3: am ed321aec: am 7db037a9: Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev 
* commit '7ce01fe3529c4095301dc49836953a00f604eeed':
  Save missing state in ConfirmAutoSyncChangeFragment
 2014-11-05 10:19:12 +00:00
Alexandra Gherghina
7ce01fe352 am ed321aec: am 7db037a9: Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev 
* commit 'ed321aec3359eca1d3b417e93bd1de1f64c713cb':
  Save missing state in ConfirmAutoSyncChangeFragment
 2014-11-05 10:15:02 +00:00
Alexandra Gherghina
ed321aec33 am 7db037a9: Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev 
* commit '7db037a989ea9c106ea404681cfe22a1fd2a2973':
  Save missing state in ConfirmAutoSyncChangeFragment
 2014-11-05 10:09:58 +00:00
Alexandra Gherghina
7db037a989 Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev 2014-11-05 10:06:36 +00:00
Stuart Scott
ba1a39ff06 am e1c89279: am 05c19a45: am b153181c: Use CharSequence for DisplayName 
* commit 'e1c8927961c337e633db994d456e627e296d1210':
  Use CharSequence for DisplayName
 2014-11-05 04:17:51 +00:00
Stuart Scott
e1c8927961 am 05c19a45: am b153181c: Use CharSequence for DisplayName 
* commit '05c19a45e2b46f70323b33818eba657ef40ad455':
  Use CharSequence for DisplayName
 2014-11-05 04:05:35 +00:00
Sanket Padawe
8942c62165 Change for setting transparency of sim colors. 
Changes for setting transparency of sim colors in sim settings UI.

Change-Id: I5717da94bfb6bb260864a46c3898d347be96d6af
 2014-11-04 18:14:39 -08:00
Stuart Scott
05c19a45e2 am b153181c: Use CharSequence for DisplayName 
* commit 'b153181c9c597085769d69796ecf07ec6d4433d2':
  Use CharSequence for DisplayName
 2014-11-05 02:13:21 +00:00
Sanket Padawe
c9f823e22a 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
 2014-11-04 17:34:47 -08:00
Paul Crowley
01fbd9fd3c Don't show a pattern-specific prompt at encryption time. 
Bug: 18054895
Change-Id: I8a029142085b9e7f59efc8e313b6438734d5a1bb
 2014-11-05 00:43:33 +00:00
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
68421fd5c6 am e1cb279f: am 508a693c: Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev 
* commit 'e1cb279f3ebb8813c07c988c3a432825563ccfda':
  sanitize strings and error messages in wiFi picker
 2014-11-04 20:18:58 +00:00
vandwalle
e1cb279f3e 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
 2014-11-04 20:12:02 +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
204624ca12 am 3016f721: am 2a03d8e2: Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev 
* commit '3016f721f1215bd6bb54f6e16a46a63d3557ee55':
  Hide managed profile entry in secondary users
 2014-11-04 13:59:23 +00:00
Alexandra Gherghina
ab054dc138 am 06ad8ce5: am d47f15a4: Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev 
* commit '06ad8ce5974de67017abb8773646743295cf44f4':
  Apply predefined icon and label to managed profiles
 2014-11-04 13:59:22 +00:00
Alexandra Gherghina
3016f721f1 am 2a03d8e2: Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev 
* commit '2a03d8e2991b64740c803c65e2e09ba69180a02e':
  Hide managed profile entry in secondary users
 2014-11-04 13:54:53 +00:00
Alexandra Gherghina
06ad8ce597 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
 2014-11-04 13:54:52 +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
Stuart Scott
6b12f54abb am 173ef409: Clean up public API of SubInfoRecord. automerge: 3ada2ec 
* commit '173ef409fddc4affd56e1014f4eced0a0b11f747':
  Clean up public API of SubInfoRecord.
 2014-11-04 03:07:28 +00:00
Stuart Scott
173ef409fd Clean up public API of SubInfoRecord. 
automerge: 3ada2ec

* commit '3ada2ecbe02c98da529aa106e538a4439219cb62':
  Clean up public API of SubInfoRecord.
 2014-11-04 03:01:22 +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
PauloftheWest
f75a8182bd Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev automerge: ba53a84 
automerge: e8cf3ee

* commit 'e8cf3eed1719621d3fe5c18641e98192730e49a0':
  Added cellular data popup in DataUsage
 2014-11-04 00:06:12 +00:00
Stuart Scott
3ada2ecbe0 Clean up public API of SubInfoRecord. 
bug: 17575308
Change-Id: I38afd507b1c004fd566214c0b3812cab226936df
 2014-11-03 16:00:10 -08:00
PauloftheWest
e8cf3eed17 Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev 
automerge: ba53a84

* commit 'ba53a846b153b7318d7fc9e21763369b43358e30':
  Added cellular data popup in DataUsage
 2014-11-03 23:28:42 +00:00
PauloftheWest
ba53a846b1 Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev 2014-11-03 23:00:19 +00:00
Andrew Lee
1d671eb24b am c53c5835: am 8d4f7f94: Merge "Update class name for FdnList." into lmp-mr1-dev 
* commit 'c53c58350df01d4f5593f9cd4a5deb956c2ab333':
  Update class name for FdnList.
 2014-11-03 22:34:38 +00:00
Andrew Lee
c53c58350d am 8d4f7f94: Merge "Update class name for FdnList." into lmp-mr1-dev 
* commit '8d4f7f94eb8804df9c91e9b9172fee80cdf7a8e1':
  Update class name for FdnList.
 2014-11-03 21:03:40 +00:00
Andrew Lee
8d4f7f94eb Merge "Update class name for FdnList." into lmp-mr1-dev 2014-11-03 21:00:04 +00:00
Geoff Mendal
51d0e513bb am 34aaabf1: (-s ours) am 2e5e181d: (-s ours) am c6db3cc1: (-s ours) am f6b60987: (-s ours) Import translations. DO NOT MERGE 
* commit '34aaabf115755c1b7137e431fb8c44e7978df75a':
  Import translations. DO NOT MERGE
 2014-11-03 18:54:26 +00:00
Geoff Mendal
34aaabf115 am 2e5e181d: (-s ours) am c6db3cc1: (-s ours) am f6b60987: (-s ours) Import translations. DO NOT MERGE 
* commit '2e5e181d0fce89b228ce26700c1588f9c0e5e17c':
  Import translations. DO NOT MERGE
 2014-11-03 18:49:05 +00:00
Geoff Mendal
2e5e181d0f am c6db3cc1: (-s ours) am f6b60987: (-s ours) Import translations. DO NOT MERGE 
* commit 'c6db3cc1b71fcab1824fc327dfec66df69bf139c':
  Import translations. DO NOT MERGE
 2014-11-03 18:39:41 +00:00
Geoff Mendal
c6db3cc1b7 am f6b60987: (-s ours) Import translations. DO NOT MERGE 
* commit 'f6b609872c3a1dc3cb34e8eb78641df3a9dbc29b':
  Import translations. DO NOT MERGE
 2014-11-03 18:32:51 +00:00
Geoff Mendal
1e365f0a71 Merge "Import translations. DO NOT MERGE" 2014-11-03 18:32:06 +00:00