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
Geoff Mendal
c077365e94 Import translations. DO NOT MERGE 
Change-Id: I51545d7f6fb134587651a2cc90a8f5d1b65f759c
Auto-generated-cl: translation import
 2014-11-03 10:19:35 -08:00
Geoff Mendal
60612869a7 am e4751d4b: (-s ours) am 18d02625: (-s ours) am 99a3f807: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'e4751d4bdcd8eedcf3183232f331db089bc1ea27':
  Import translations. DO NOT MERGE
 2014-11-03 18:15:52 +00:00
Geoff Mendal
4d8050b86a am e93c6c0e: (-s ours) am 0de0fe0a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'e93c6c0ed764d6576c1de3d40d5d7eb311bfacc4':
  Import translations. DO NOT MERGE
 2014-11-03 18:11:56 +00:00
Geoff Mendal
e4751d4bdc am 18d02625: (-s ours) am 99a3f807: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '18d026251f43715ad4afc9eec8f5cc710295256b':
  Import translations. DO NOT MERGE
 2014-11-03 18:11:49 +00:00
Geoff Mendal
e93c6c0ed7 am 0de0fe0a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '0de0fe0afcd57c5c831202bb04bbd15365f0e071':
  Import translations. DO NOT MERGE
 2014-11-03 18:07:47 +00:00
Geoff Mendal
f6b609872c Import translations. DO NOT MERGE 
Change-Id: Ia602c0a9ac55f054d0c01cc742d085da1fcef19e
Auto-generated-cl: translation import
 2014-11-03 10:07:02 -08:00
Geoff Mendal
18d026251f am 99a3f807: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '99a3f80773b02305858b47acaea05451bd98a8c3':
  Import translations. DO NOT MERGE
 2014-11-03 18:06:50 +00:00
Geoff Mendal
0de0fe0afc Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-03 18:03:03 +00:00
Geoff Mendal
99a3f80773 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-03 18:01:41 +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
Geoff Mendal
e15da20061 Import translations. DO NOT MERGE 
Change-Id: I6ec1f3604264e67b37956a3e6f0960ddfc0f8ee7
Auto-generated-cl: translation import
 2014-11-03 09:58:33 -08: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
7833aae782 am d5032cb5: am 8f5c0e46: Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev 
* commit 'd5032cb5e6d591454902339b7af486d1a1e2edb8':
  Bring screen lock setting back to screen pinning
 2014-11-03 14:50:44 +00: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
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
PauloftheWest
63fc10d7ca am fb378106: am a7b5d2b3: Changed SIM calls to use PhoneAccount instead of SubInfoRecord. 
* commit 'fb3781062c0828efb97209700c9c67f231d57bac':
  Changed SIM calls to use PhoneAccount instead of SubInfoRecord.
 2014-10-31 22:58:03 +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
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
Baligh Uddin
dc33df3ab2 am 81162031: (-s ours) am 43b675e0: (-s ours) Import translations. DO NOT MERGE 
* commit '8116203136602c37f8ebd38e344bf91bc751edff':
  Import translations. DO NOT MERGE
 2014-10-31 17:21:12 +00:00
Baligh Uddin
8116203136 am 43b675e0: (-s ours) Import translations. DO NOT MERGE 
* commit '43b675e01e14b36ed0739698d890611eaba0b445':
  Import translations. DO NOT MERGE
 2014-10-31 17:13:12 +00: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
Geoff Mendal
c39909674d am 54960748: (-s ours) am 7eb595bd: (-s ours) am 6f5b23f3: (-s ours) am 4c79a9ec: (-s ours) Import translations. DO NOT MERGE 
* commit '549607480fd6202b142e28b29fcbb6820358b34b':
  Import translations. DO NOT MERGE
 2014-10-30 23:55:19 +00:00
Geoff Mendal
9c31e3d61f am fde687c3: (-s ours) am 1e637964: (-s ours) am 062afd59: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'fde687c3beb95cb0c8dd98bc3eaf5619504e3700':
  Import translations. DO NOT MERGE
 2014-10-30 23:55:18 +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
Geoff Mendal
549607480f am 7eb595bd: (-s ours) am 6f5b23f3: (-s ours) am 4c79a9ec: (-s ours) Import translations. DO NOT MERGE 
* commit '7eb595bd752fcdc0ca77f8a5f9d4282c71866946':
  Import translations. DO NOT MERGE
 2014-10-30 23:45:02 +00:00
Geoff Mendal
fde687c3be am 1e637964: (-s ours) am 062afd59: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '1e637964be1a10b4ff39d49419dda3e8a9e6e552':
  Import translations. DO NOT MERGE
 2014-10-30 23:45:01 +00:00
PauloftheWest
a0fe276518 am ffc766e0: am 98523c8b: Added Cellular Data for Multi-Sim Data Usage 
* commit 'ffc766e0db2858182b6226ac5a51a19327765a82':
  Added Cellular Data for Multi-Sim Data Usage
 2014-10-30 23:45:00 +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
Geoff Mendal
d1d4f31e58 am ef06675e: (-s ours) Import translations. DO NOT MERGE automerge: d4aa6dd -s ours 
* commit 'ef06675e244a6be1b34319ea07e830250d1a1940':
  Import translations. DO NOT MERGE
 2014-10-30 19:10:25 +00:00
Geoff Mendal
ef06675e24 Import translations. DO NOT MERGE 
automerge: d4aa6dd  -s ours

* commit 'd4aa6dd89d4b6de2f30a566be2fe9992a7f26710':
  Import translations. DO NOT MERGE
 2014-10-30 19:02:11 +00:00
Baligh Uddin
43b675e01e Import translations. DO NOT MERGE 
Change-Id: I802b868cb89763e3a0ee655415b08303a467c9bb
Auto-generated-cl: translation import
 2014-10-30 11:46:41 -07:00
Sanket Padawe
197976e6d1 resolve merge conflicts of 4e4a3f8 to master. 
Change-Id: Idab7b34c8c3f4a833686fb104e1869438b2df51d
 2014-10-30 11:05:55 -07:00
Przemyslaw Szczepaniak
abe1ad74a1 Merge "Fix typo in TTS Language option description." 2014-10-30 12:45:54 +00:00
Przemyslaw Szczepaniak
9f153fedd9 Fix typo in TTS Language option description. 
Bug: 18098410
Change-Id: Icf3736cc2f28c240d40d06b33d4f81012314cbb1
 2014-10-30 11:53:26 +00: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
Sanket Padawe
4e4a3f8963 am 4a1c5486: am 917aaf9e: Merge "Add sim color selection in settings" into lmp-mr1-dev 
* commit '4a1c5486b8d187ceb012954dc528bc8417c7cb3e':
  Add sim color selection in settings
 2014-10-30 11:03:43 +00:00
PauloftheWest
109ca52c67 am 22f257b0: am 93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev 
* commit '22f257b091a444b0749e66faa4dc79fd24adacbf':
  Added IMEI status activity.
 2014-10-30 11:03:29 +00:00
Paul Lawrence
7d0b95f4c9 am 870de3ee: am be492644: am 00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev 
* commit '870de3eeb9ebcf097ca48c63fd67a864829b6acf':
  Make emergency button right size
 2014-10-30 10:26:05 +00:00
Paul Lawrence
870de3eeb9 am be492644: am 00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev 
* commit 'be492644102083557fa47cde3ee9110826677079':
  Make emergency button right size
 2014-10-30 10:18:26 +00: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
71edf2ff0f Import translations. DO NOT MERGE 
Change-Id: I866b829582f1e866969f95c904e9135748fbb9a3
Auto-generated-cl: translation import
 2014-10-29 13:51:28 -07: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