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

18813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jason Monk
ca063736e9 Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev automerge: 496b3f6 
automerge: 3caba72

* commit '3caba72aa11c32daf3ad8ef0b8ba6a7e503c4b80':
  Allow QS to launch adding network dialog
 2014-10-28 19:41:15 +00:00
vandwalle
64186866c4 Merge "prettify debug informations" into lmp-mr1-dev automerge: 10a4cac 
automerge: 1260451

* commit '12604519aac0b99733dc40c712d129f6c3f680d4':
  prettify debug informations
 2014-10-28 19:41:09 +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