OSDN Git Service
Paul Crowley [Wed, 5 Nov 2014 18:05:05 +0000 (18:05 +0000)]
Merge "Don\'t show a pattern-specific prompt at encryption time." into lmp-mr1-dev automerge:
e6ad7bf
automerge:
966a1ca
* commit '
966a1cadbf83412384261d1eea1192150e5fd1a8':
Don't show a pattern-specific prompt at encryption time.
Paul Crowley [Wed, 5 Nov 2014 16:35:53 +0000 (16:35 +0000)]
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.
Paul Crowley [Wed, 5 Nov 2014 15:57:08 +0000 (15:57 +0000)]
Merge "Don't show a pattern-specific prompt at encryption time." into lmp-mr1-dev
Alexandra Gherghina [Wed, 5 Nov 2014 10:15:02 +0000 (10:15 +0000)]
am
ed321aec: am
7db037a9: Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev
* commit '
ed321aec3359eca1d3b417e93bd1de1f64c713cb':
Save missing state in ConfirmAutoSyncChangeFragment
Alexandra Gherghina [Wed, 5 Nov 2014 10:09:58 +0000 (10:09 +0000)]
am
7db037a9: Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev
* commit '
7db037a989ea9c106ea404681cfe22a1fd2a2973':
Save missing state in ConfirmAutoSyncChangeFragment
Alexandra Gherghina [Wed, 5 Nov 2014 10:06:35 +0000 (10:06 +0000)]
Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev
Stuart Scott [Wed, 5 Nov 2014 04:05:35 +0000 (04:05 +0000)]
am
05c19a45: am
b153181c: Use CharSequence for DisplayName
* commit '
05c19a45e2b46f70323b33818eba657ef40ad455':
Use CharSequence for DisplayName
Stuart Scott [Wed, 5 Nov 2014 02:13:21 +0000 (02:13 +0000)]
am
b153181c: Use CharSequence for DisplayName
* commit '
b153181c9c597085769d69796ecf07ec6d4433d2':
Use CharSequence for DisplayName
Paul Crowley [Tue, 4 Nov 2014 22:51:36 +0000 (22:51 +0000)]
Don't show a pattern-specific prompt at encryption time.
Bug:
18054895
Change-Id: I8a029142085b9e7f59efc8e313b6438734d5a1bb
Alexandra Gherghina [Tue, 4 Nov 2014 14:06:47 +0000 (14:06 +0000)]
Save missing state in ConfirmAutoSyncChangeFragment
Bug:
18117345
Change-Id: I5f176f330e51b23fe0935d435aa8bc3904e42d36
Stuart Scott [Tue, 4 Nov 2014 22:52:23 +0000 (14:52 -0800)]
Use CharSequence for DisplayName
Change-Id: I2601eb9dc1edf585ad3b48da9fb97c65cb1face5
vandwalle [Tue, 4 Nov 2014 20:18:58 +0000 (20:18 +0000)]
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
vandwalle [Tue, 4 Nov 2014 20:12:02 +0000 (20:12 +0000)]
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
vandwalle [Tue, 4 Nov 2014 20:07:44 +0000 (20:07 +0000)]
Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev
vandwalle [Tue, 4 Nov 2014 01:07:05 +0000 (17:07 -0800)]
sanitize strings and error messages in wiFi picker
Change-Id: I642e79b40902bb45a503be949dea6a09d94b3bc8
Alexandra Gherghina [Tue, 4 Nov 2014 13:59:23 +0000 (13:59 +0000)]
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
Alexandra Gherghina [Tue, 4 Nov 2014 13:59:22 +0000 (13:59 +0000)]
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
Alexandra Gherghina [Tue, 4 Nov 2014 13:54:53 +0000 (13:54 +0000)]
am
2a03d8e2: Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev
* commit '
2a03d8e2991b64740c803c65e2e09ba69180a02e':
Hide managed profile entry in secondary users
Alexandra Gherghina [Tue, 4 Nov 2014 13:54:52 +0000 (13:54 +0000)]
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
Alexandra Gherghina [Tue, 4 Nov 2014 13:51:04 +0000 (13:51 +0000)]
Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev
Alexandra Gherghina [Tue, 4 Nov 2014 13:50:51 +0000 (13:50 +0000)]
Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev
Stuart Scott [Tue, 4 Nov 2014 03:07:28 +0000 (03:07 +0000)]
am
173ef409: Clean up public API of SubInfoRecord. automerge:
3ada2ec
* commit '
173ef409fddc4affd56e1014f4eced0a0b11f747':
Clean up public API of SubInfoRecord.
Stuart Scott [Tue, 4 Nov 2014 03:01:22 +0000 (03:01 +0000)]
Clean up public API of SubInfoRecord.
automerge:
3ada2ec
* commit '
3ada2ecbe02c98da529aa106e538a4439219cb62':
Clean up public API of SubInfoRecord.
PauloftheWest [Tue, 4 Nov 2014 00:06:12 +0000 (00:06 +0000)]
Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev automerge:
ba53a84
automerge:
e8cf3ee
* commit '
e8cf3eed1719621d3fe5c18641e98192730e49a0':
Added cellular data popup in DataUsage
Stuart Scott [Fri, 31 Oct 2014 21:11:24 +0000 (14:11 -0700)]
Clean up public API of SubInfoRecord.
bug:
17575308
Change-Id: I38afd507b1c004fd566214c0b3812cab226936df
PauloftheWest [Mon, 3 Nov 2014 23:28:42 +0000 (23:28 +0000)]
Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev
automerge:
ba53a84
* commit '
ba53a846b153b7318d7fc9e21763369b43358e30':
Added cellular data popup in DataUsage
PauloftheWest [Mon, 3 Nov 2014 23:00:19 +0000 (23:00 +0000)]
Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev
Andrew Lee [Mon, 3 Nov 2014 22:34:38 +0000 (22:34 +0000)]
am
c53c5835: am
8d4f7f94: Merge "Update class name for FdnList." into lmp-mr1-dev
* commit '
c53c58350df01d4f5593f9cd4a5deb956c2ab333':
Update class name for FdnList.
Andrew Lee [Mon, 3 Nov 2014 21:03:40 +0000 (21:03 +0000)]
am
8d4f7f94: Merge "Update class name for FdnList." into lmp-mr1-dev
* commit '
8d4f7f94eb8804df9c91e9b9172fee80cdf7a8e1':
Update class name for FdnList.
Andrew Lee [Mon, 3 Nov 2014 21:00:04 +0000 (21:00 +0000)]
Merge "Update class name for FdnList." into lmp-mr1-dev
Geoff Mendal [Mon, 3 Nov 2014 18:49:05 +0000 (18:49 +0000)]
am
2e5e181d: (-s ours) am
c6db3cc1: (-s ours) am
f6b60987: (-s ours) Import translations. DO NOT MERGE
* commit '
2e5e181d0fce89b228ce26700c1588f9c0e5e17c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 18:39:41 +0000 (18:39 +0000)]
am
c6db3cc1: (-s ours) am
f6b60987: (-s ours) Import translations. DO NOT MERGE
* commit '
c6db3cc1b71fcab1824fc327dfec66df69bf139c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 18:32:51 +0000 (18:32 +0000)]
am
f6b60987: (-s ours) Import translations. DO NOT MERGE
* commit '
f6b609872c3a1dc3cb34e8eb78641df3a9dbc29b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 18:11:49 +0000 (18:11 +0000)]
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
Geoff Mendal [Mon, 3 Nov 2014 18:07:47 +0000 (18:07 +0000)]
am
0de0fe0a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
0de0fe0afcd57c5c831202bb04bbd15365f0e071':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 18:07:02 +0000 (10:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia602c0a9ac55f054d0c01cc742d085da1fcef19e
Auto-generated-cl: translation import
Geoff Mendal [Mon, 3 Nov 2014 18:06:50 +0000 (18:06 +0000)]
am
99a3f807: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
99a3f80773b02305858b47acaea05451bd98a8c3':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 18:03:03 +0000 (18:03 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 3 Nov 2014 18:01:40 +0000 (18:01 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 3 Nov 2014 18:01:02 +0000 (10:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id22a6dbb43d8911376c6cb3be95d6fce0011638f
Auto-generated-cl: translation import
Geoff Mendal [Mon, 3 Nov 2014 17:58:33 +0000 (09:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6ec1f3604264e67b37956a3e6f0960ddfc0f8ee7
Auto-generated-cl: translation import
Jason Monk [Mon, 3 Nov 2014 14:50:44 +0000 (14:50 +0000)]
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
Jason Monk [Mon, 3 Nov 2014 14:45:21 +0000 (14:45 +0000)]
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
Jason Monk [Mon, 3 Nov 2014 14:37:51 +0000 (14:37 +0000)]
Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev
PauloftheWest [Fri, 31 Oct 2014 22:58:03 +0000 (22:58 +0000)]
am
fb378106: am
a7b5d2b3: Changed SIM calls to use PhoneAccount instead of SubInfoRecord.
* commit '
fb3781062c0828efb97209700c9c67f231d57bac':
Changed SIM calls to use PhoneAccount instead of SubInfoRecord.
Andrew Lee [Fri, 31 Oct 2014 20:12:20 +0000 (13:12 -0700)]
Update class name for FdnList.
Bug:
18114923
Change-Id: If32383b08e9a217d4f6b16208a74ca546572acc0
Jason Monk [Mon, 4 Aug 2014 20:08:51 +0000 (16:08 -0400)]
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
PauloftheWest [Fri, 31 Oct 2014 17:48:35 +0000 (17:48 +0000)]
am
a7b5d2b3: Changed SIM calls to use PhoneAccount instead of SubInfoRecord.
* commit '
a7b5d2b3843eeb2fa478a727c01ee2a312fa7bbd':
Changed SIM calls to use PhoneAccount instead of SubInfoRecord.
Baligh Uddin [Fri, 31 Oct 2014 17:13:12 +0000 (17:13 +0000)]
am
43b675e0: (-s ours) Import translations. DO NOT MERGE
* commit '
43b675e01e14b36ed0739698d890611eaba0b445':
Import translations. DO NOT MERGE
Alexandra Gherghina [Thu, 30 Oct 2014 18:06:55 +0000 (18:06 +0000)]
Hide managed profile entry in secondary users
Bug:
18132630
Change-Id: I0395373ac6f088f8fc880110c740cb5f05827901
Alexandra Gherghina [Thu, 30 Oct 2014 11:56:18 +0000 (11:56 +0000)]
Apply predefined icon and label to managed profiles
Bug:
18132630
Change-Id: Ie6cfee420847d6992accb0bc0ca3f5535260bc55
Geoff Mendal [Thu, 30 Oct 2014 23:45:02 +0000 (23:45 +0000)]
am
7eb595bd: (-s ours) am
6f5b23f3: (-s ours) am
4c79a9ec: (-s ours) Import translations. DO NOT MERGE
* commit '
7eb595bd752fcdc0ca77f8a5f9d4282c71866946':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Oct 2014 23:45:01 +0000 (23:45 +0000)]
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
PauloftheWest [Thu, 30 Oct 2014 23:45:00 +0000 (23:45 +0000)]
am
ffc766e0: am
98523c8b: Added Cellular Data for Multi-Sim Data Usage
* commit '
ffc766e0db2858182b6226ac5a51a19327765a82':
Added Cellular Data for Multi-Sim Data Usage
PauloftheWest [Wed, 29 Oct 2014 19:28:24 +0000 (12:28 -0700)]
Changed SIM calls to use PhoneAccount instead of SubInfoRecord.
+ Some import cleanup on SimSettings.
Change-Id: Ib18673f4eb0ce404bf13a58e0979401cca91385d
PauloftheWest [Wed, 29 Oct 2014 21:46:44 +0000 (14:46 -0700)]
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
Geoff Mendal [Thu, 30 Oct 2014 19:02:11 +0000 (19:02 +0000)]
Import translations. DO NOT MERGE
automerge:
d4aa6dd -s ours
* commit '
d4aa6dd89d4b6de2f30a566be2fe9992a7f26710':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 30 Oct 2014 18:46:41 +0000 (11:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I802b868cb89763e3a0ee655415b08303a467c9bb
Auto-generated-cl: translation import
Sanket Padawe [Thu, 30 Oct 2014 11:03:43 +0000 (11:03 +0000)]
am
4a1c5486: am
917aaf9e: Merge "Add sim color selection in settings" into lmp-mr1-dev
* commit '
4a1c5486b8d187ceb012954dc528bc8417c7cb3e':
Add sim color selection in settings
PauloftheWest [Thu, 30 Oct 2014 11:03:29 +0000 (11:03 +0000)]
am
22f257b0: am
93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev
* commit '
22f257b091a444b0749e66faa4dc79fd24adacbf':
Added IMEI status activity.
Paul Lawrence [Thu, 30 Oct 2014 10:18:26 +0000 (10:18 +0000)]
am
be492644: am
00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev
* commit '
be492644102083557fa47cde3ee9110826677079':
Make emergency button right size
Geoff Mendal [Wed, 29 Oct 2014 22:55:00 +0000 (22:55 +0000)]
am
6f5b23f3: (-s ours) am
4c79a9ec: (-s ours) Import translations. DO NOT MERGE
* commit '
6f5b23f3fc4855c1906fd64fd3bcb9d5f14a02a2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Oct 2014 22:54:52 +0000 (22:54 +0000)]
am
062afd59: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
062afd5964003e482ce6dfd2b2443413f594ee4e':
Import translations. DO NOT MERGE
PauloftheWest [Wed, 29 Oct 2014 22:54:20 +0000 (22:54 +0000)]
am
98523c8b: Added Cellular Data for Multi-Sim Data Usage
* commit '
98523c8b8b90d011604d3a7e83a6b708f7b5e5ce':
Added Cellular Data for Multi-Sim Data Usage
Geoff Mendal [Wed, 29 Oct 2014 20:56:00 +0000 (20:56 +0000)]
am
4c79a9ec: (-s ours) Import translations. DO NOT MERGE
* commit '
4c79a9ecc0124d85e66aa3041c6b65b8582f4c87':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Oct 2014 20:45:54 +0000 (20:45 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Wed, 29 Oct 2014 20:38:11 +0000 (13:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I61c6746c6591894d13cf5ee2f3fd70ab4fc2762e
Auto-generated-cl: translation import
Geoff Mendal [Wed, 29 Oct 2014 20:31:24 +0000 (13:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I79579c3aa684edf09b0bc85941dea8a70a4c12fc
Auto-generated-cl: translation import
Geoff Mendal [Wed, 29 Oct 2014 20:28:44 +0000 (13:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2b2810ffec88c69ab46b6672df00d381ce2429b2
Auto-generated-cl: translation import
PauloftheWest [Tue, 28 Oct 2014 15:30:05 +0000 (08:30 -0700)]
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
Sanket Padawe [Tue, 28 Oct 2014 22:53:07 +0000 (22:53 +0000)]
am
917aaf9e: Merge "Add sim color selection in settings" into lmp-mr1-dev
* commit '
917aaf9ebd2893b9d0cebc2b08c4f7d814fa53c7':
Add sim color selection in settings
Sanket Padawe [Tue, 28 Oct 2014 22:48:33 +0000 (22:48 +0000)]
Merge "Add sim color selection in settings" into lmp-mr1-dev
PauloftheWest [Tue, 28 Oct 2014 22:48:29 +0000 (22:48 +0000)]
am
93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev
* commit '
93c10334c8380b997554a02f6071b3bc620e7705':
Added IMEI status activity.
PauloftheWest [Tue, 28 Oct 2014 22:45:33 +0000 (22:45 +0000)]
Merge "Added IMEI status activity." into lmp-mr1-dev
Sanket Padawe [Tue, 28 Oct 2014 21:01:50 +0000 (14:01 -0700)]
Add sim color selection in settings
Adding a dropdown list to select sim color from sim settings UI.
Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
Paul Lawrence [Tue, 28 Oct 2014 20:14:31 +0000 (20:14 +0000)]
am
00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev
* commit '
00abeba2c08b656db924d967a0733aa76aea40a7':
Make emergency button right size
Paul Lawrence [Tue, 28 Oct 2014 20:08:33 +0000 (20:08 +0000)]
Merge "Make emergency button right size" into lmp-mr1-dev
PauloftheWest [Mon, 20 Oct 2014 18:26:13 +0000 (11:26 -0700)]
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
Jason Monk [Tue, 28 Oct 2014 19:41:15 +0000 (19:41 +0000)]
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
vandwalle [Tue, 28 Oct 2014 19:41:09 +0000 (19:41 +0000)]
Merge "prettify debug informations" into lmp-mr1-dev automerge:
10a4cac
automerge:
1260451
* commit '
12604519aac0b99733dc40c712d129f6c3f680d4':
prettify debug informations
Jason Monk [Tue, 28 Oct 2014 19:16:38 +0000 (19:16 +0000)]
Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev
automerge:
496b3f6
* commit '
496b3f647186866703af1081d26a987069a468a8':
Allow QS to launch adding network dialog
vandwalle [Tue, 28 Oct 2014 19:16:31 +0000 (19:16 +0000)]
Merge "prettify debug informations" into lmp-mr1-dev
automerge:
10a4cac
* commit '
10a4cacc0f51a8d0e0f62be9375a3ca638b0ac4a':
prettify debug informations
Paul Lawrence [Tue, 28 Oct 2014 18:32:42 +0000 (11:32 -0700)]
Make emergency button right size
Bug:
18123894
Bug:
17394128
Change-Id: I248890b82f62146e1814172fd8b67e9a39661997
Jason Monk [Tue, 28 Oct 2014 18:45:24 +0000 (18:45 +0000)]
Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev
vandwalle [Tue, 28 Oct 2014 18:34:32 +0000 (18:34 +0000)]
Merge "prettify debug informations" into lmp-mr1-dev
John Spurlock [Tue, 28 Oct 2014 18:07:57 +0000 (18:07 +0000)]
am
90674e53: Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev
automerge:
22a466a
* commit '
22a466a82ebce42ae0b75c80226b10ab97f89321':
Settings: Follow update to common conditions call.
Alexandra Gherghina [Tue, 28 Oct 2014 18:02:14 +0000 (18:02 +0000)]
am
9f0bab9b: Merge "Close account settings if there\'s no account to show" into lmp-mr1-dev
automerge:
ffae7de
* commit '
ffae7de1ea79d147fcb30b54d23f4973d330a19b':
Close account settings if there's no account to show
Jason Monk [Mon, 27 Oct 2014 15:35:16 +0000 (11:35 -0400)]
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
John Spurlock [Tue, 28 Oct 2014 17:12:57 +0000 (17:12 +0000)]
am
90674e53: Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev
* commit '
90674e53fc1fbac31f112fd6f11a5365cf66ec42':
Settings: Follow update to common conditions call.
John Spurlock [Tue, 28 Oct 2014 17:08:50 +0000 (17:08 +0000)]
Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev
John Spurlock [Tue, 28 Oct 2014 15:25:37 +0000 (11:25 -0400)]
Settings: Follow update to common conditions call.
Bug:
16824863
Change-Id: I4a4e455b99e1c68a65c63bfd3a9972e57555825f
Alexandra Gherghina [Tue, 28 Oct 2014 15:35:36 +0000 (15:35 +0000)]
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
Alexandra Gherghina [Tue, 28 Oct 2014 15:29:37 +0000 (15:29 +0000)]
Merge "Close account settings if there's no account to show" into lmp-mr1-dev
Wink Saville [Mon, 27 Oct 2014 21:36:17 +0000 (21:36 +0000)]
am
4aab7ecb: Merge "Change subId to int from long" into lmp-mr1-dev
automerge:
cb02b97
* commit '
cb02b97f8dc972e0438492b1cadaa21b34a301b6':
Change subId to int from long
Geoff Mendal [Mon, 27 Oct 2014 21:36:10 +0000 (21:36 +0000)]
am
855f0d26: (-s ours) Import translations. DO NOT MERGE automerge:
c7df50c -s ours
automerge:
967c000 -s ours
* commit '
967c000603e40704008a094cce3f3348acab7cf8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Oct 2014 21:35:59 +0000 (21:35 +0000)]
am
40f84ca0: (-s ours) Import translations. DO NOT MERGE
automerge:
9ab85cf -s ours
* commit '
9ab85cf0e01e2a96637c8a786a8df5fc5e0ccc65':
Import translations. DO NOT MERGE
Wink Saville [Mon, 27 Oct 2014 20:37:06 +0000 (20:37 +0000)]
am
4aab7ecb: Merge "Change subId to int from long" into lmp-mr1-dev
* commit '
4aab7ecb56e9af4600b126c67d7efe0b7e1f6ee1':
Change subId to int from long
Geoff Mendal [Mon, 27 Oct 2014 20:37:05 +0000 (20:37 +0000)]
am
855f0d26: (-s ours) Import translations. DO NOT MERGE automerge:
c7df50c -s ours
* commit '
855f0d264343325fb308bd27c509d7f95893d645':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Oct 2014 20:37:04 +0000 (20:37 +0000)]
am
40f84ca0: (-s ours) Import translations. DO NOT MERGE
* commit '
40f84ca02033ce62e301dd6d16fdc1f4b9a5326a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Oct 2014 18:53:20 +0000 (18:53 +0000)]
am
bf9175c0: (-s ours) am
795c8378: (-s ours) Import translations. DO NOT MERGE
* commit '
bf9175c03bb47cf85af809a21cd45cbc989ade63':
OSDN Git Service
