OSDN Git Service
Wink Saville [Mon, 15 Dec 2014 22:41:53 +0000 (22:41 +0000)]
am
870a2a8e: am
e04fd76f: Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev
* commit '
870a2a8ea85670dafdcd9d8617e0c99862f0604d':
Use getLIn1NumberForSubscriber to get phone number.
Stuart Scott [Mon, 15 Dec 2014 22:41:52 +0000 (22:41 +0000)]
am
56db3f35: am
b62bfe71: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev
* commit '
56db3f35eba2dae6463ac981822d8fe80fc6d189':
Show toast when cellular data option is changing.
Wink Saville [Mon, 15 Dec 2014 22:35:58 +0000 (22:35 +0000)]
am
e04fd76f: Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev
* commit '
e04fd76f1c1a345a47673d460a04372670bad6c0':
Use getLIn1NumberForSubscriber to get phone number.
Stuart Scott [Mon, 15 Dec 2014 22:35:57 +0000 (22:35 +0000)]
am
b62bfe71: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev
* commit '
b62bfe715552fb86330958755f0e12ab0ffe7cad':
Show toast when cellular data option is changing.
PauloftheWest [Mon, 15 Dec 2014 21:45:37 +0000 (21:45 +0000)]
am
29db97d1: am
682b7ed3: Merge "IMEI information will show without a SIM." into lmp-mr1-dev
* commit '
29db97d1189a885324d950ecb3a2e80d1eabaece':
IMEI information will show without a SIM.
Wink Saville [Mon, 15 Dec 2014 20:45:00 +0000 (20:45 +0000)]
Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev
Wink Saville [Mon, 15 Dec 2014 20:04:29 +0000 (12:04 -0800)]
Use getLIn1NumberForSubscriber to get phone number.
Bug:
18721557
Change-Id: I255627638efe21362315286a659ac59b46e1fa30
Signed-off-by: Wink Saville <wink@google.com>
Stuart Scott [Mon, 15 Dec 2014 19:43:19 +0000 (19:43 +0000)]
Merge "Show toast when cellular data option is changing." into lmp-mr1-dev
PauloftheWest [Mon, 15 Dec 2014 19:34:31 +0000 (19:34 +0000)]
am
682b7ed3: Merge "IMEI information will show without a SIM." into lmp-mr1-dev
* commit '
682b7ed34c01ea65edfe034afe52180052b9e2fc':
IMEI information will show without a SIM.
PauloftheWest [Mon, 15 Dec 2014 19:28:43 +0000 (19:28 +0000)]
Merge "IMEI information will show without a SIM." into lmp-mr1-dev
PauloftheWest [Mon, 15 Dec 2014 18:29:54 +0000 (10:29 -0800)]
IMEI information will show without a SIM.
Bug:
18701340
Change-Id: I1e92bd1af4d68849f194d30b5b894cfb144900e5
Maurice Lam [Mon, 15 Dec 2014 17:56:32 +0000 (17:56 +0000)]
am
4e8a7219: am
8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev
* commit '
4e8a7219c866030b5870c9d8e0fa930423761048':
[FRP] Open the lock setup screens in same task
Maurice Lam [Mon, 15 Dec 2014 17:49:49 +0000 (17:49 +0000)]
am
8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev
* commit '
8e0929a32ed60b95a34416a5362df93f5a329b5f':
[FRP] Open the lock setup screens in same task
Maurice Lam [Mon, 15 Dec 2014 17:44:52 +0000 (17:44 +0000)]
Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev
Narayan Kamath [Mon, 15 Dec 2014 16:27:39 +0000 (16:27 +0000)]
resolved conflicts for merge of
fa893886 to lmp-mr1-dev-plus-aosp
Change-Id: Iaf57dd96ab10c3f03a964fed593571895ea7be3a
Geoff Mendal [Mon, 15 Dec 2014 15:08:45 +0000 (15:08 +0000)]
am
d9df577d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
d9df577d94828775e20f20ab1efa02d8a7a5bbac':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Dec 2014 15:04:31 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 15 Dec 2014 14:43:37 +0000 (14:43 +0000)]
am
d33d2127: (-s ours) am
d3affe47: (-s ours) Import translations. DO NOT MERGE
* commit '
d33d2127f739083c2f23a99eecd6bc3f21b53b83':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Dec 2014 14:42:32 +0000 (06:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1cd9781471c0c3c1c74fc429e9013e9e8dfeef41
Auto-generated-cl: translation import
Geoff Mendal [Mon, 15 Dec 2014 14:36:51 +0000 (14:36 +0000)]
am
d3affe47: (-s ours) Import translations. DO NOT MERGE
* commit '
d3affe47eedcdc6aa2bfd829f55fce8ed2be7e72':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Dec 2014 14:26:44 +0000 (06:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: I07a9426156ec5f40cded12af58aca05723a55005
Auto-generated-cl: translation import
Narayan Kamath [Mon, 15 Dec 2014 14:23:46 +0000 (14:23 +0000)]
Merge "Stop using apache-http in settings."
Lucky Zhang [Sat, 13 Dec 2014 00:29:43 +0000 (00:29 +0000)]
am
03f336d0: am
5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev
* commit '
03f336d07c055b6870dd18ab0096f9e5b085ff51':
[FRP] Notification screen slides in wrong direction
Lucky Zhang [Sat, 13 Dec 2014 00:24:20 +0000 (00:24 +0000)]
am
5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev
* commit '
5f17119f4683617ed5444c088b0439bb005a3514':
[FRP] Notification screen slides in wrong direction
Lucky Zhang [Sat, 13 Dec 2014 00:15:31 +0000 (00:15 +0000)]
Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev
John Spurlock [Fri, 12 Dec 2014 19:08:46 +0000 (19:08 +0000)]
am
e964060b: am
b4805e3a: Settings: Allow more lines of saver feature description text.
* commit '
e964060b5de4b534431b58c2ac4fae9fdd6baedc':
Settings: Allow more lines of saver feature description text.
John Spurlock [Fri, 12 Dec 2014 19:04:24 +0000 (19:04 +0000)]
am
b4805e3a: Settings: Allow more lines of saver feature description text.
* commit '
b4805e3a3481196a0e945d397bef0950a843f5a3':
Settings: Allow more lines of saver feature description text.
John Spurlock [Fri, 12 Dec 2014 17:54:48 +0000 (12:54 -0500)]
Settings: Allow more lines of saver feature description text.
Bug:
18706906
Change-Id: I27bfd5e70c3e20c17fcad691cfb3c9f74d7d0390
Narayan Kamath [Fri, 12 Dec 2014 13:53:28 +0000 (13:53 +0000)]
Stop using apache-http in settings.
Most of this usage is from crufty "test" code, and is trivially
replacable.
bug:
18027885
Change-Id: If4441a5e76405eba068479a4dcaa6012b5a74cbf
Wink Saville [Fri, 12 Dec 2014 04:42:28 +0000 (04:42 +0000)]
am
8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
automerge:
fc748fe
* commit '
fc748fe9da449e427887c6d2381f9bd4462de56f':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Wink Saville [Fri, 12 Dec 2014 04:37:35 +0000 (04:37 +0000)]
am
8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
* commit '
8a21ab00e5ec5141e4bd745ab9e7f161db98cb1a':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Prem Kumar [Fri, 12 Dec 2014 04:31:59 +0000 (04:31 +0000)]
am
96ca2cfd: Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev
automerge:
f41c6c4
* commit '
f41c6c4577169880a2c339ec84d93078513b3402':
Clearing junk layout for add wifi dialog in settings.
Wink Saville [Fri, 12 Dec 2014 04:23:16 +0000 (04:23 +0000)]
Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
Maurice Lam [Fri, 12 Dec 2014 02:22:08 +0000 (18:22 -0800)]
[FRP] Open the lock setup screens in same task
Set the taskAffinity of of the lock setup screens so that the
transitions behave correctly.
Bug:
18724458
Change-Id: Ibca7adfad1e5bd07c7e7d2e1beb279c5e57ac735
Lucky Zhang [Fri, 12 Dec 2014 02:10:01 +0000 (18:10 -0800)]
[FRP] Notification screen slides in wrong direction
The method that launches notification screen from choose lock activity
finished the original activity before starting the new activity. This
made the system think it is a backward transition instead of a forward
one. Swapping the order to start new activity first and then finish
old activity fixed the problem.
This also changes the behavior in settings. However, it seems like this
is also the desired behavior for settings.
Bug:
18723199
Change-Id: I90538fa52e0d62a2274c8e0333682035849802c6
Prem Kumar [Fri, 12 Dec 2014 00:59:34 +0000 (00:59 +0000)]
am
96ca2cfd: Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev
* commit '
96ca2cfd087078e4042f9ab9678c77dea136eefe':
Clearing junk layout for add wifi dialog in settings.
Prem Kumar [Fri, 12 Dec 2014 00:52:31 +0000 (00:52 +0000)]
Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev
Sanket Padawe [Thu, 11 Dec 2014 23:48:45 +0000 (15:48 -0800)]
Clearing junk layout for add wifi dialog in settings.
Bug:
18359901
Change-Id: I9957efd0a6740ee470ee36b09a7b6884a0d2c63a
Wink Saville [Thu, 11 Dec 2014 18:10:05 +0000 (10:10 -0800)]
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Bug:
18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
Zoltan Szatmary-Ban [Thu, 11 Dec 2014 18:02:29 +0000 (18:02 +0000)]
Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev automerge:
25a1181
automerge:
d0831ae
* commit '
d0831ae2144ce9c2eae2f11be2f4ed3689df2597':
Bring up correct app for Recent location list items
PauloftheWest [Thu, 11 Dec 2014 18:02:17 +0000 (18:02 +0000)]
Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev automerge:
209c946
automerge:
13028d1
* commit '
13028d1d90a995b71999ee7c00f04adabd9cb7ff':
Disabled SIM notifications while provisioning.
Zoltan Szatmary-Ban [Thu, 11 Dec 2014 15:09:56 +0000 (15:09 +0000)]
Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev
automerge:
25a1181
* commit '
25a1181f2a61d32481e7c66f96c2abf7aebd761e':
Bring up correct app for Recent location list items
PauloftheWest [Thu, 11 Dec 2014 15:09:31 +0000 (15:09 +0000)]
Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev
automerge:
209c946
* commit '
209c9465b3251c0a5e652214e402b1a54df234f9':
Disabled SIM notifications while provisioning.
Zoltan Szatmary-Ban [Thu, 11 Dec 2014 13:23:28 +0000 (13:23 +0000)]
Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev
PauloftheWest [Thu, 11 Dec 2014 13:14:06 +0000 (13:14 +0000)]
Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev
PauloftheWest [Thu, 11 Dec 2014 00:07:03 +0000 (00:07 +0000)]
am
87015c01: am
ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev
* commit '
87015c0166d84b86fd1067f7e4effbe898b60c7c':
Fixed a Data Usage crash
PauloftheWest [Wed, 10 Dec 2014 21:54:50 +0000 (13:54 -0800)]
Disabled SIM notifications while provisioning.
Bug:
18672853
Change-Id: I01ba2927ad013649f13b959354a6493ba057e09f
Alexandra Gherghina [Wed, 10 Dec 2014 22:23:57 +0000 (22:23 +0000)]
am
0d04d8cb: am
32ca6f1f: Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev
* commit '
0d04d8cbe8754e75a429f851d0d5a1b14829688b':
Fix NPE in Running Processes view in Apps Settings
Emily Bernier [Wed, 10 Dec 2014 22:23:54 +0000 (22:23 +0000)]
am
b366a286: am
5a528b27: Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev
* commit '
b366a286b869890ebbf59f2400c37c97661fe8fa':
Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
Geoff Mendal [Wed, 10 Dec 2014 22:22:35 +0000 (22:22 +0000)]
am
e73fa6af: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
e73fa6afcd3f2890abf5a98107ff5387a0165ebc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Dec 2014 22:22:34 +0000 (22:22 +0000)]
am
e111474b: (-s ours) am
26b04765: (-s ours) Import translations. DO NOT MERGE
* commit '
e111474b0fa936821b7fad36506dc8e91a85eb23':
Import translations. DO NOT MERGE
Stuart Scott [Tue, 2 Dec 2014 22:44:59 +0000 (14:44 -0800)]
Show toast when cellular data option is changing.
bug:
18594162
Change-Id: I19dc265af47c0a40a6ace6d4bf42e21e035daf0a
PauloftheWest [Wed, 10 Dec 2014 21:24:59 +0000 (21:24 +0000)]
am
ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev
* commit '
ab88ad9381dda4afe59d00966cb783426f5f44a3':
Fixed a Data Usage crash
PauloftheWest [Wed, 10 Dec 2014 21:16:10 +0000 (21:16 +0000)]
Merge "Fixed a Data Usage crash" into lmp-mr1-dev
Alexandra Gherghina [Wed, 10 Dec 2014 17:47:14 +0000 (17:47 +0000)]
am
32ca6f1f: Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev
* commit '
32ca6f1fbf2b9698afe99ad387580b38d07b50ca':
Fix NPE in Running Processes view in Apps Settings
Alexandra Gherghina [Wed, 10 Dec 2014 17:42:41 +0000 (17:42 +0000)]
Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev
PauloftheWest [Wed, 10 Dec 2014 16:50:54 +0000 (08:50 -0800)]
Fixed a Data Usage crash
Bug:
18364933
Change-Id: I80657c6541aec0b4706ef4aa229c9f858776aab2
Emily Bernier [Wed, 10 Dec 2014 17:34:53 +0000 (17:34 +0000)]
am
5a528b27: Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev
* commit '
5a528b274f010c2aec5f188c620fabf674aa2637':
Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
Emily Bernier [Wed, 10 Dec 2014 17:25:14 +0000 (17:25 +0000)]
Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev
Geoff Mendal [Wed, 10 Dec 2014 14:47:31 +0000 (14:47 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 10 Dec 2014 14:39:51 +0000 (06:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3101f0a9a789a2cb20115e66f88ca96374594888
Auto-generated-cl: translation import
Geoff Mendal [Wed, 10 Dec 2014 14:37:23 +0000 (14:37 +0000)]
am
26b04765: (-s ours) Import translations. DO NOT MERGE
* commit '
26b0476586b736c25ddbe0c5f39793c5e5633a67':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Dec 2014 14:24:00 +0000 (06:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7bab4568e3a20facc24f3a09d337076e07d5d7ad
Auto-generated-cl: translation import
Alexandra Gherghina [Tue, 9 Dec 2014 17:06:39 +0000 (17:06 +0000)]
Fix NPE in Running Processes view in Apps Settings
Bug:
18676587
Change-Id: Ib4b400241f0ebd6dd4aacad4bfdda6dfb75cdfb5
Maurice Lam [Wed, 10 Dec 2014 03:34:02 +0000 (03:34 +0000)]
am
0fde6bb9: Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-dev automerge:
e0f637a
* commit '
0fde6bb98a6e22088a53560f60b17cc824b8098f':
[FRP] Shrink lock screen when keyboard pops up
Maurice Lam [Wed, 10 Dec 2014 01:22:29 +0000 (01:22 +0000)]
Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-dev
automerge:
e0f637a
* commit '
e0f637a66b9dbaaec80ef36c52a96fbb65735790':
[FRP] Shrink lock screen when keyboard pops up
Maurice Lam [Wed, 10 Dec 2014 01:17:14 +0000 (01:17 +0000)]
Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-dev
Emily Bernier [Wed, 10 Dec 2014 01:02:41 +0000 (20:02 -0500)]
Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
In some cases, NETWORK_STATE_CHANGED_ACTION broadcasts are sent before
the current network state has been updated in ConnectivityService. Listening
for CONNECTIVITY_ACTION broadcasts as well ensures that we properly catch
new connections and auto-advance appropriately.
Bug:
18503725
Change-Id: Ia414d57d196d09171342fb3ae93c7e826cb1a1aa
PauloftheWest [Tue, 9 Dec 2014 23:22:10 +0000 (23:22 +0000)]
am
aa800609: Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev
automerge:
58a73bb
* commit '
58a73bbc0a6df6157531dc94cc305cd3a9922041':
Added Multi-SIM capability to Access Point Names
PauloftheWest [Tue, 9 Dec 2014 23:20:25 +0000 (23:20 +0000)]
am
e6d7b31f: Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev
automerge:
bfb8449
* commit '
bfb8449aea4d6ac7e4b6c21e28faa49344f93806':
Fixed a SIM Lock UI issue
PauloftheWest [Tue, 9 Dec 2014 23:17:50 +0000 (23:17 +0000)]
am
aa800609: Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev
* commit '
aa800609304b4787091b1805b2439423b3192bb1':
Added Multi-SIM capability to Access Point Names
PauloftheWest [Tue, 9 Dec 2014 23:12:52 +0000 (23:12 +0000)]
am
e6d7b31f: Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev
* commit '
e6d7b31fc44ef6f0865ef22401217b70a6676eaa':
Fixed a SIM Lock UI issue
PauloftheWest [Tue, 9 Dec 2014 23:10:35 +0000 (23:10 +0000)]
Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev
PauloftheWest [Tue, 9 Dec 2014 23:04:18 +0000 (23:04 +0000)]
Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev
Zoltan Szatmary-Ban [Tue, 9 Dec 2014 19:20:21 +0000 (19:20 +0000)]
Bring up correct app for Recent location list items
When clicking on a list item in Settings > Location > Recent locations,
the correct app should be shown for items corresponding to managed
profile apps.
Bug:
17655978
Change-Id: Ie4b388f0ea103ee16629b0d8d92e5de08adffc5e
Wink Saville [Tue, 9 Dec 2014 18:05:56 +0000 (18:05 +0000)]
am
f8c4fe2d: am
85d3b0fa: Merge "Add debug dataEnable." into lmp-mr1-dev
* commit '
f8c4fe2d3c0281243fd246c00c1d460e891b386e':
Add debug dataEnable.
Wink Saville [Tue, 9 Dec 2014 17:58:30 +0000 (17:58 +0000)]
am
85d3b0fa: Merge "Add debug dataEnable." into lmp-mr1-dev
* commit '
85d3b0fa6e2e8988f48a5a830dc3d279d05619fd':
Add debug dataEnable.
Wink Saville [Tue, 9 Dec 2014 17:52:19 +0000 (17:52 +0000)]
Merge "Add debug dataEnable." into lmp-mr1-dev
Prem Kumar [Tue, 9 Dec 2014 11:29:22 +0000 (11:29 +0000)]
am
35b3257e: am
1e1251cc: Merge "Fixed a SIM Cards crash." into lmp-mr1-dev
* commit '
35b3257e078ea2609a2e5ef28019b92349f6b41b':
Fixed a SIM Cards crash.
Maurice Lam [Fri, 5 Dec 2014 23:47:30 +0000 (15:47 -0800)]
[FRP] Shrink lock screen when keyboard pops up
Because setup wizard uses immersive mode, the default adjustResize
flag doesn't work; so we need to respond to window insets manually.
Bug:
18651680
Change-Id: I9e53d3455c41404cca8a347b49b559200353b7ac
Prem Kumar [Tue, 9 Dec 2014 02:30:23 +0000 (02:30 +0000)]
am
1e1251cc: Merge "Fixed a SIM Cards crash." into lmp-mr1-dev
* commit '
1e1251cc04ee9636721719aa0a13d94e15500258':
Fixed a SIM Cards crash.
Prem Kumar [Tue, 9 Dec 2014 02:25:14 +0000 (02:25 +0000)]
Merge "Fixed a SIM Cards crash." into lmp-mr1-dev
John Spurlock [Tue, 9 Dec 2014 00:23:28 +0000 (00:23 +0000)]
am
8aa3e663: am
1e3be7d9: Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev
* commit '
8aa3e66389e7b66424ca7b4a3c0ef9cc11a00b17':
Settings: Rebind to volume sliders after returning from stopped.
John Spurlock [Tue, 9 Dec 2014 00:08:42 +0000 (00:08 +0000)]
am
1e3be7d9: Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev
* commit '
1e3be7d9ce27cf5ee7df78c675603a628eb0023d':
Settings: Rebind to volume sliders after returning from stopped.
PauloftheWest [Mon, 8 Dec 2014 21:49:35 +0000 (13:49 -0800)]
Fixed a SIM Lock UI issue
+ The SIM lock option will now appear if there is any SIM with locking
capabilities.
+ Also, if the first slot does not have a SIM in it, then the SIM lock
screen will disable the ability to lock the first slot.
Bug:
18473536
Change-Id: Ib4e0ed6e94b00bc07c9febdad433fdb3c55294b8
John Spurlock [Mon, 8 Dec 2014 20:27:01 +0000 (20:27 +0000)]
Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev
PauloftheWest [Mon, 8 Dec 2014 20:23:34 +0000 (12:23 -0800)]
Fixed a SIM Cards crash.
+ Added a check if getActiveSubscriptionInfoList returns null.
Bug:
18634751
Change-Id: Ib6012816c26525a61fb199912d06d6c1572e0fd6
John Spurlock [Mon, 8 Dec 2014 20:20:33 +0000 (15:20 -0500)]
Settings: Rebind to volume sliders after returning from stopped.
Bug:
18118623
Change-Id: I29fb22a1a4476639a4f5cce06affd8ce58b6105d
Jeff Sharkey [Mon, 8 Dec 2014 19:44:34 +0000 (19:44 +0000)]
am
e0d9f74d: am
14ff2f7c: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
* commit '
e0d9f74d270cc17eb92bea26b3b98eb4c9201ddd':
Offer to "merge" subscribers for data usage.
PauloftheWest [Mon, 8 Dec 2014 19:43:59 +0000 (19:43 +0000)]
am
5acd934b: am
2a56b194: Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev
* commit '
5acd934b71f9fd96a46a189c3352191c2998883b':
SIM cards in Setting will only show on Multi-SIM devices
PauloftheWest [Mon, 8 Dec 2014 19:43:57 +0000 (19:43 +0000)]
am
743e8259: am
a2f69987: Merge "Fixed a SimSettings issue" into lmp-mr1-dev
* commit '
743e825934829be58027afac88c5ab8810c5b29b':
Fixed a SimSettings issue
John Spurlock [Mon, 8 Dec 2014 19:43:45 +0000 (19:43 +0000)]
am
65802e5a: am
f68bc645: Settings: Hide downtime settings if not supported.
* commit '
65802e5acbbb22f68b7a5c75a34decaa366fe157':
Settings: Hide downtime settings if not supported.
Geoff Mendal [Mon, 8 Dec 2014 19:42:57 +0000 (19:42 +0000)]
am
2193e589: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
2193e589caebd5ea80aa4dda526402ea25230c2f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Dec 2014 19:42:43 +0000 (19:42 +0000)]
am
be183dac: (-s ours) am
838d6dc9: (-s ours) Import translations. DO NOT MERGE
* commit '
be183dacbd87671243f328d589b519990c24939f':
Import translations. DO NOT MERGE
Zoltan Szatmary-Ban [Mon, 8 Dec 2014 19:42:19 +0000 (19:42 +0000)]
am
5d653fe8: am
f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev
* commit '
5d653fe85a030b41d7d4d946feca12ea897c4457':
Make Location Settings multiprofile aware
Lucky Zhang [Mon, 8 Dec 2014 19:41:45 +0000 (19:41 +0000)]
am
90ec22bc: am
07117147: Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev
* commit '
90ec22bc2c47e01bbf3179ec947fa30f3ab45724':
[FRP] Screen Lock for Setup Wizard shows wrong title
Lucky Zhang [Mon, 8 Dec 2014 19:41:44 +0000 (19:41 +0000)]
am
3e239fe0: am
73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev
* commit '
3e239fe0d8b09b950e87339a1814040bb4208fe2':
[FRP] Remove None and Swipe from screen lock options
Maurice Lam [Mon, 8 Dec 2014 19:37:12 +0000 (19:37 +0000)]
am
8fcbe816: am
400e9378: Merge "[FRP] Don\'t extract IME for PIN / Password during setup" into lmp-mr1-dev
* commit '
8fcbe816656a61bcb6b5c34e7bd535a5bba9964d':
[FRP] Don't extract IME for PIN / Password during setup
Jeff Davidson [Mon, 8 Dec 2014 19:36:47 +0000 (19:36 +0000)]
am
e2381760: am
9dc247bb: Merge "Final platform settings UX for ephemeral networks." into lmp-mr1-dev
* commit '
e2381760207f3826ed54ecf4f27a7d10eb340166':
Final platform settings UX for ephemeral networks.
Maurice Lam [Mon, 8 Dec 2014 19:18:16 +0000 (19:18 +0000)]
am
53bfcb52: am
7dca460a: Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev
* commit '
53bfcb526b218758d51ca47e57f71e2e19de4d3c':
[FRP] Use Lock type as header instead of "Encryption"