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
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
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
2014-11-04 03:01:22 +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
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
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
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
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
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
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
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
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
ef06675e24
Import translations. DO NOT MERGE
...
automerge: d4aa6dd
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
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
