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
0de0fe0afc
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-11-03 18:03:03 +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
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
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
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
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
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
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
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
ca063736e9
Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev automerge: 496b3f6
...
automerge: 3caba72
2014-10-28 19:41:15 +00:00
vandwalle
64186866c4
Merge "prettify debug informations" into lmp-mr1-dev automerge: 10a4cac
...
automerge: 1260451
2014-10-28 19:41:09 +00:00
Jason Monk
3caba72aa1
Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev
...
automerge: 496b3f6
2014-10-28 19:16:38 +00:00
vandwalle
12604519aa
Merge "prettify debug informations" into lmp-mr1-dev
...
automerge: 10a4cac
2014-10-28 19:16:31 +00:00
Paul Lawrence
59717ad3a7
Make emergency button right size
...
Bug: 18123894
Bug: 17394128
Change-Id: I248890b82f62146e1814172fd8b67e9a39661997
2014-10-28 19:01:18 +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
John Spurlock
89ad293983
am 90674e53: Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev
...
automerge: 22a466a
2014-10-28 18:07:57 +00:00
Alexandra Gherghina
4da8a5c4ad
am 9f0bab9b: Merge "Close account settings if there\'s no account to show" into lmp-mr1-dev
...
automerge: ffae7de
2014-10-28 18:02:14 +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
22a466a82e
am 90674e53: Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev
...
* commit '90674e53fc1fbac31f112fd6f11a5365cf66ec42':
Settings: Follow update to common conditions call.
2014-10-28 17:12:57 +00: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
ffae7de1ea
am 9f0bab9b: Merge "Close account settings if there\'s no account to show" into lmp-mr1-dev
...
* commit '9f0bab9bcb756607da99758971207ad833c4608b':
Close account settings if there's no account to show
2014-10-28 15:35:36 +00:00
