git.osdn.net Git - android-x86/packages-apps-Settings.git/log

Emily Bernier [Wed, 10 Dec 2014 22:28:17 +0000 (22:28 +0000)]

am b366a286: am 5a528b27: Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev
automerge: 7a3b253

* commit '7a3b253f086150ab030db967862002795a29bb83':
Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity

commit | commitdiff | tree

Geoff Mendal [Wed, 10 Dec 2014 22:27:38 +0000 (22:27 +0000)]

am e73fa6af: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge: bf09ae7 -s ours

* commit 'bf09ae787b811733c5b719404d89e296ca92a574':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 10 Dec 2014 22:27:29 +0000 (22:27 +0000)]

am e111474b: (-s ours) am 26b04765: (-s ours) Import translations. DO NOT MERGE
automerge: d580efb -s ours

* commit 'd580efb9336d13feff1b1ab236ae2f026434c386':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Wed, 10 Dec 2014 14:50:35 +0000 (06:50 -0800)]

Import translations. DO NOT MERGE

Change-Id: If8d0a895b2fc4715a94e2d0427946d167819aa02
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Wed, 10 Dec 2014 14:47:31 +0000 (14:47 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Maurice Lam [Wed, 10 Dec 2014 03:39:03 +0000 (03:39 +0000)]

am 0fde6bb9: Merge "[FRP] Shrink lock screen when keyboard pops up" into lmp-mr1-dev automerge: e0f637a
automerge: 4eaf999

* commit '4eaf999a540d31e1caacd5edf29b7e6ab75f6c11':
[FRP] Shrink lock screen when keyboard pops up

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Andreas Gampe [Tue, 9 Dec 2014 23:24:12 +0000 (23:24 +0000)]

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings

commit | commitdiff | tree

PauloftheWest [Tue, 9 Dec 2014 23:22:46 +0000 (23:22 +0000)]

am aa800609: Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev automerge: 58a73bb
automerge: 01c6a56

* commit '01c6a56c1623a4858d1a28ada0fdc0d7f87b935e':
Added Multi-SIM capability to Access Point Names

commit | commitdiff | tree

PauloftheWest [Tue, 9 Dec 2014 23:22:36 +0000 (23:22 +0000)]

am e6d7b31f: Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev automerge: bfb8449
automerge: 05275af

* commit '05275aff0ad8fd1b90786fa62ed0372ed4d86035':
Fixed a SIM Lock UI issue

commit | commitdiff | tree

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

commit | commitdiff | tree

Santos Cordon [Tue, 9 Dec 2014 23:21:11 +0000 (23:21 +0000)]

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Wink Saville [Tue, 9 Dec 2014 23:17:15 +0000 (23:17 +0000)]

am f8c4fe2d: am 85d3b0fa: Merge "Add debug dataEnable." into lmp-mr1-dev
automerge: da77fcf

* commit 'da77fcf428dc70826fe4a8789193660563a831f3':
Add debug dataEnable.

commit | commitdiff | tree

Prem Kumar [Tue, 9 Dec 2014 23:17:07 +0000 (23:17 +0000)]

am 35b3257e: am 1e1251cc: Merge "Fixed a SIM Cards crash." into lmp-mr1-dev
automerge: 5c8dff3

* commit '5c8dff3e92105dfa861cb2fb1bde8b57fea6e381':
Fixed a SIM Cards crash.

commit | commitdiff | tree

John Spurlock [Tue, 9 Dec 2014 23:16:56 +0000 (23:16 +0000)]

am 8aa3e663: am 1e3be7d9: Merge "Settings: Rebind to volume sliders after returning from stopped." into lmp-mr1-dev
automerge: 195b9c8

* commit '195b9c855ad107b8205fef37dd187a1df7695230':
Settings: Rebind to volume sliders after returning from stopped.

commit | commitdiff | tree

Jeff Sharkey [Tue, 9 Dec 2014 23:16:47 +0000 (23:16 +0000)]

am e0d9f74d: am 14ff2f7c: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
automerge: e5c7bae

* commit 'e5c7baec2b6b26811531fa6622711ca970e5ca77':
Offer to "merge" subscribers for data usage.

commit | commitdiff | tree

PauloftheWest [Tue, 9 Dec 2014 23:16:39 +0000 (23:16 +0000)]

am 5acd934b: am 2a56b194: Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev
automerge: d54211c

* commit 'd54211c76de5cd0c7e45effbdb2bfdf0081fc94c':
SIM cards in Setting will only show on Multi-SIM devices

commit | commitdiff | tree

Jeff Sharkey [Tue, 9 Dec 2014 23:16:36 +0000 (23:16 +0000)]

am e5c7baec: am e0d9f74d: am 14ff2f7c: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev

* commit 'e5c7baec2b6b26811531fa6622711ca970e5ca77':
Offer to "merge" subscribers for data usage.

commit | commitdiff | tree

PauloftheWest [Tue, 9 Dec 2014 23:16:34 +0000 (23:16 +0000)]

am d54211c7: am 5acd934b: am 2a56b194: Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev

* commit 'd54211c76de5cd0c7e45effbdb2bfdf0081fc94c':
SIM cards in Setting will only show on Multi-SIM devices

commit | commitdiff | tree

PauloftheWest [Tue, 9 Dec 2014 23:16:33 +0000 (23:16 +0000)]

am 6f55eb72: am 743e8259: am a2f69987: Merge "Fixed a SimSettings issue" into lmp-mr1-dev

* commit '6f55eb72f4a0ec55c0c635f36d678a105706c1fd':
Fixed a SimSettings issue

commit | commitdiff | tree

PauloftheWest [Tue, 9 Dec 2014 23:16:30 +0000 (23:16 +0000)]

am 743e8259: am a2f69987: Merge "Fixed a SimSettings issue" into lmp-mr1-dev
automerge: 6f55eb7

* commit '6f55eb72f4a0ec55c0c635f36d678a105706c1fd':
Fixed a SimSettings issue

commit | commitdiff | tree

John Spurlock [Tue, 9 Dec 2014 23:16:22 +0000 (23:16 +0000)]

am 65802e5a: am f68bc645: Settings: Hide downtime settings if not supported.
automerge: d888715

* commit 'd88871564f3df3325f6a683d8f2baad5b043b1d6':
Settings: Hide downtime settings if not supported.

commit | commitdiff | tree

Geoff Mendal [Tue, 9 Dec 2014 23:16:02 +0000 (23:16 +0000)]

am 2193e589: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge: 5e83309 -s ours

* commit '5e833090d82d9c32a62616710c1482129b4f6fd1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 9 Dec 2014 23:15:54 +0000 (23:15 +0000)]

am be183dac: (-s ours) am 838d6dc9: (-s ours) Import translations. DO NOT MERGE
automerge: 63f6520 -s ours

* commit '63f6520ce9dacd9c99fb5d5e53c42ca5df869167':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Zoltan Szatmary-Ban [Tue, 9 Dec 2014 23:15:46 +0000 (23:15 +0000)]

am 5d653fe8: am f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev
automerge: 45f0423

* commit '45f04233c22231d3216ceb9a1a7cc5b09cf45401':
Make Location Settings multiprofile aware

commit | commitdiff | tree

Lucky Zhang [Tue, 9 Dec 2014 23:15:37 +0000 (23:15 +0000)]

am 90ec22bc: am 07117147: Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev
automerge: 44f44a0

* commit '44f44a0c54a8467307b55f244866e67bf48d3d62':
[FRP] Screen Lock for Setup Wizard shows wrong title

commit | commitdiff | tree

Lucky Zhang [Tue, 9 Dec 2014 23:15:29 +0000 (23:15 +0000)]

am 3e239fe0: am 73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev
automerge: a4df967

* commit 'a4df9673896bf7fb317b8ae92246b555d712a79d':
[FRP] Remove None and Swipe from screen lock options

commit | commitdiff | tree

Maurice Lam [Tue, 9 Dec 2014 23:15:21 +0000 (23:15 +0000)]

am 8fcbe816: am 400e9378: Merge "[FRP] Don\'t extract IME for PIN / Password during setup" into lmp-mr1-dev
automerge: 86ed2cf

* commit '86ed2cf33fa82aac1606e2a6e217fdff4ef6ef8f':
[FRP] Don't extract IME for PIN / Password during setup

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Davidson [Tue, 9 Dec 2014 23:11:44 +0000 (15:11 -0800)]

resolve merge conflicts of 0c7e4ed to master.

Change-Id: I6c5625564f69769eb6f61d3df7531f032080d0d9

commit | commitdiff | tree

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

commit | commitdiff | tree

PauloftheWest [Tue, 9 Dec 2014 23:04:18 +0000 (23:04 +0000)]

Merge "Fixed a SIM Lock UI issue" into lmp-mr1-dev

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Wink Saville [Tue, 9 Dec 2014 17:52:19 +0000 (17:52 +0000)]

Merge "Add debug dataEnable." into lmp-mr1-dev

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Prem Kumar [Tue, 9 Dec 2014 02:25:14 +0000 (02:25 +0000)]

Merge "Fixed a SIM Cards crash." into lmp-mr1-dev

commit | commitdiff | tree

Maurice Lam [Tue, 9 Dec 2014 00:55:49 +0000 (00:55 +0000)]

am 2dded568: am 53bfcb52: am 7dca460a: Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev

* commit '2dded568fe0afbc18dda0a5abd0afa6911558dee':
[FRP] Use Lock type as header instead of "Encryption"

commit | commitdiff | tree

Sanket Padawe [Tue, 9 Dec 2014 00:55:48 +0000 (00:55 +0000)]

am 088a4420: am 32fc9755: am fc988c03: Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev

* commit '088a44205d2b4a7c2add44f9109f209b50c0f3b9':
Removing checks from EnableWifiTether which are done in SystemUI

commit | commitdiff | tree

Sanket Padawe [Tue, 9 Dec 2014 00:55:47 +0000 (00:55 +0000)]

am 361681e2: am 889d3875: am 6d0059c3: Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev

* commit '361681e2579f36765c1a75d7898f73b0fd2c1322':
Change default sim selection text in sim settings ui.

commit | commitdiff | tree

Justin Harrison [Tue, 9 Dec 2014 00:55:45 +0000 (00:55 +0000)]

am 765bf45f: am 07d60e5e: am 0612a485: Merge "Check remote device uuids for phone book access permission" into lmp-mr1-dev

* commit '765bf45f9714f0857bc0de081ed9c938ebf810f5':
Check remote device uuids for phone book access permission

commit | commitdiff | tree

Fyodor Kupolov [Tue, 9 Dec 2014 00:55:44 +0000 (00:55 +0000)]

am 2b6c7313: am d7e3f354: am d4057cc3: Merge "Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED" into lmp-mr1-dev

* commit '2b6c7313ede33b40515f41ea97d3bed0532d1518':
Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED

commit | commitdiff | tree

Shishir Agrawal [Tue, 9 Dec 2014 00:55:43 +0000 (00:55 +0000)]

am 4d3eb665: am 5cfc97a9: am 0b1f606c: Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev

* commit '4d3eb6659eb6626dd3ed5d46b681ddf27845a4fe':
Settings app - read phone number from TelephonyManager.

commit | commitdiff | tree

Adrian Roos [Tue, 9 Dec 2014 00:55:41 +0000 (00:55 +0000)]

am 669dd0a3: am f39a0988: am 5df6e030: Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev

* commit '669dd0a3aa916994fb821e7036e7c4bd12a033a1':
Fix race leading to spuriously disabled trust agents

commit | commitdiff | tree

Maurice Lam [Tue, 9 Dec 2014 00:55:40 +0000 (00:55 +0000)]

am 5c325c4d: am ecf2f401: am 2c0c9837: Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev

* commit '5c325c4d8cd9a0c1195b3d02b31f6073fbff09a2':
[FRP] Use setup wizard nav bar buttons

commit | commitdiff | tree

Justin Harrison [Tue, 9 Dec 2014 00:55:39 +0000 (00:55 +0000)]

am de54a3ae: am 9704e3d6: am 03cceb32: Merge "Removed the application SIM Cards from application list" into lmp-mr1-dev

* commit 'de54a3aef60f2d3d1f143ba5bb1ecdd4b9cf3a9e':
Removed the application SIM Cards from application list

commit | commitdiff | tree

Maurice Lam [Tue, 9 Dec 2014 00:55:37 +0000 (00:55 +0000)]

am 3d9267f3: am 40a252ce: am dfaf4c92: Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev

* commit '3d9267f307ea484a46b95c80ac501fc4ee1fc4c2':
[FRP] Add illustration to lock screen setup

commit | commitdiff | tree

Maurice Lam [Tue, 9 Dec 2014 00:55:36 +0000 (00:55 +0000)]

am 5d7cef31: am b6f5e003: am 13989d6d: Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev

* commit '5d7cef31bc9aede1ebe2ce64906b2a7766d94c99':
[FRP] Give pattern lock colors

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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"

commit | commitdiff | tree

Sanket Padawe [Mon, 8 Dec 2014 19:17:50 +0000 (19:17 +0000)]

am 32fc9755: am fc988c03: Merge "Removing checks from EnableWifiTether which are done in SystemUI" into lmp-mr1-dev

* commit '32fc975534e3a14128f9c9303665c1a4a3fc4937':
Removing checks from EnableWifiTether which are done in SystemUI

commit | commitdiff | tree

Sanket Padawe [Mon, 8 Dec 2014 19:17:49 +0000 (19:17 +0000)]

am 889d3875: am 6d0059c3: Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev

* commit '889d3875af9235f8f5330e2fec3e2fd7d7ef22e0':
Change default sim selection text in sim settings ui.

commit | commitdiff | tree

Justin Harrison [Mon, 8 Dec 2014 19:16:45 +0000 (19:16 +0000)]

am 07d60e5e: am 0612a485: Merge "Check remote device uuids for phone book access permission" into lmp-mr1-dev

* commit '07d60e5ec237d5d4e96893bae866215a374f6452':
Check remote device uuids for phone book access permission

commit | commitdiff | tree

Fyodor Kupolov [Mon, 8 Dec 2014 19:16:06 +0000 (19:16 +0000)]

am d7e3f354: am d4057cc3: Merge "Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED" into lmp-mr1-dev

* commit 'd7e3f354cc975b4ade2bd5bddfa72dce3099581f':
Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED

commit | commitdiff | tree

Shishir Agrawal [Mon, 8 Dec 2014 19:16:05 +0000 (19:16 +0000)]

am 5cfc97a9: am 0b1f606c: Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev

* commit '5cfc97a9776c7a53da35e563e80ba0ec7f1f0c70':
Settings app - read phone number from TelephonyManager.

commit | commitdiff | tree

Adrian Roos [Mon, 8 Dec 2014 19:15:30 +0000 (19:15 +0000)]

am f39a0988: am 5df6e030: Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev

* commit 'f39a0988ef56adb86aae7c2036b53819c3fe8b52':
Fix race leading to spuriously disabled trust agents

commit | commitdiff | tree

Maurice Lam [Mon, 8 Dec 2014 19:14:06 +0000 (19:14 +0000)]

am ecf2f401: am 2c0c9837: Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev

* commit 'ecf2f401e9f0de62f318d7e9e4749d3a33ed57fc':
[FRP] Use setup wizard nav bar buttons

commit | commitdiff | tree

Justin Harrison [Mon, 8 Dec 2014 19:13:27 +0000 (19:13 +0000)]

am 9704e3d6: am 03cceb32: Merge "Removed the application SIM Cards from application list" into lmp-mr1-dev

* commit '9704e3d6bad217f9981577e748b16ed7820b768e':
Removed the application SIM Cards from application list

commit | commitdiff | tree

Maurice Lam [Mon, 8 Dec 2014 19:12:12 +0000 (19:12 +0000)]

am 40a252ce: am dfaf4c92: Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev

* commit '40a252ce499fd1377da6b64cbd785d4ca1c55727':
[FRP] Add illustration to lock screen setup

commit | commitdiff | tree

Maurice Lam [Mon, 8 Dec 2014 19:10:20 +0000 (19:10 +0000)]

am b6f5e003: am 13989d6d: Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev

* commit 'b6f5e003a9167c44155906235762f2fac890c66a':
[FRP] Give pattern lock colors

commit | commitdiff | tree

PauloftheWest [Tue, 2 Dec 2014 16:45:00 +0000 (08:45 -0800)]

Added Multi-SIM capability to Access Point Names

+ In Settings->More->Cellular networks->AccessPoint Names will display
the APNs for the selected SubscriptionInfo.

Bug: 18246837
Change-Id: If8f46c2fa82cf4b2051ddb5f15afc8c59cb9b850

commit | commitdiff | tree

Jeff Sharkey [Mon, 8 Dec 2014 18:04:09 +0000 (18:04 +0000)]

am 14ff2f7c: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev

* commit '14ff2f7c30b8258807f44afb815ccc71dc574c1c':
Offer to "merge" subscribers for data usage.

commit | commitdiff | tree

Jeff Sharkey [Mon, 8 Dec 2014 17:57:29 +0000 (17:57 +0000)]

Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev

commit | commitdiff | tree

PauloftheWest [Mon, 8 Dec 2014 17:08:09 +0000 (17:08 +0000)]

am 2a56b194: Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev

* commit '2a56b1943f10beea189fa8ec5478981e6b704b42':
SIM cards in Setting will only show on Multi-SIM devices

commit | commitdiff | tree

PauloftheWest [Mon, 8 Dec 2014 17:08:08 +0000 (17:08 +0000)]

am a2f69987: Merge "Fixed a SimSettings issue" into lmp-mr1-dev

* commit 'a2f699871eb01c6d8464699eb8808c33de15f438':
Fixed a SimSettings issue

commit | commitdiff | tree

PauloftheWest [Mon, 8 Dec 2014 17:01:35 +0000 (17:01 +0000)]

Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev

commit | commitdiff | tree

PauloftheWest [Mon, 8 Dec 2014 17:01:22 +0000 (17:01 +0000)]

Merge "Fixed a SimSettings issue" into lmp-mr1-dev

commit | commitdiff | tree

John Spurlock [Mon, 8 Dec 2014 16:57:26 +0000 (16:57 +0000)]

am f68bc645: Settings: Hide downtime settings if not supported.

* commit 'f68bc6459352cf585b2cbb1c9e0c9b54e1936daa':
Settings: Hide downtime settings if not supported.

commit | commitdiff | tree

Jeff Sharkey [Wed, 3 Dec 2014 21:44:26 +0000 (13:44 -0800)]

Offer to "merge" subscribers for data usage.

When picking a template to use for querying statistics and setting
policies, normalize it so we widen the template to cover any merged
subscribers.

Also remove some code related to long-dormant split policies.

Bug: 18012787
Change-Id: I1e07dc09016df21ecfd7b3fad49759fa57570391