OSDN Git Service
Maurice Lam [Mon, 15 Dec 2014 22:03:39 +0000 (22:03 +0000)]
am
befc1267: am
4e8a7219: am
8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev
* commit '
befc1267a59b4b412b86babedaa4f6727fa239a0':
[FRP] Open the lock setup screens in same task
Narayan Kamath [Mon, 15 Dec 2014 19:02:26 +0000 (19:02 +0000)]
am
62d35b65: resolved conflicts for merge of
fa893886 to lmp-mr1-dev-plus-aosp
* commit '
62d35b65f236e494520d7ca480e502c79f5f4fe3':
Stop using apache-http in settings.
Geoff Mendal [Mon, 15 Dec 2014 19:02:09 +0000 (19:02 +0000)]
am
755005bd: (-s ours) am
d9df577d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
755005bddf4e476dda9404d0ab3ee007b7ebd554':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Dec 2014 19:02:00 +0000 (19:02 +0000)]
am
43826e66: (-s ours) am
d33d2127: (-s ours) am
d3affe47: (-s ours) Import translations. DO NOT MERGE
* commit '
43826e669679b7463cf715a7003e5641f7d24e78':
Import translations. DO NOT MERGE
Lucky Zhang [Mon, 15 Dec 2014 18:46:24 +0000 (18:46 +0000)]
am
a6f6e5a3: am
03f336d0: am
5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev
* commit '
a6f6e5a35be333921f47d768d053054280552fa5':
[FRP] Notification screen slides in wrong direction
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:10:49 +0000 (15:10 +0000)]
Merge "Import translations. DO NOT MERGE"
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:53:16 +0000 (06:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id43a27b90423827306f25836b7ef619c7a35c590
Auto-generated-cl: translation import
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
Narayan Kamath [Mon, 15 Dec 2014 14:35:20 +0000 (14:35 +0000)]
Merge "Stop using apache-http in settings."
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
(cherry picked from commit
f25627c0c960cd31e069a0aed62798dd3a6416aa)
Change-Id: I62b0c4e79812ae69767d778eb9e866cbba1d50e0
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."
Zoltan Szatmary-Ban [Mon, 15 Dec 2014 11:22:23 +0000 (11:22 +0000)]
Merge "Show removed user's data usage under its correct item"
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 20:56:40 +0000 (20:56 +0000)]
am
3eaa3506: am
e964060b: am
b4805e3a: Settings: Allow more lines of saver feature description text.
* commit '
3eaa35064a4e5a2eb1c57b465903e36774e27820':
Settings: Allow more lines of saver feature description text.
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.
Zoltan Szatmary-Ban [Fri, 12 Dec 2014 18:48:03 +0000 (18:48 +0000)]
Show removed user's data usage under its correct item
Users for which UserManager.getUserInfo returned null were shown as
unnamed users on Settings > Data Usage. This behavior has now changed
to show their data usage under the same item as UID_REMOVED.
Bug:
18174376
Change-Id: I8d172647edb51f7a277b4b714e9b7f3a0b5f3154
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:48:31 +0000 (04:48 +0000)]
am
f5d6dd6a: am
8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev automerge:
fc748fe
* commit '
f5d6dd6a11ef0fd7518ba5905571c714e4b2df33':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
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.
Prem Kumar [Fri, 12 Dec 2014 04:40:32 +0000 (04:40 +0000)]
am
78670560: am
96ca2cfd: Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev automerge:
f41c6c4
* commit '
78670560cddf0f1e2cff7dab57b2ac768f917367':
Clearing junk layout for add wifi dialog in settings.
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:07:36 +0000 (18:07 +0000)]
am
1162cf30: Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev automerge:
25a1181 automerge:
d0831ae
* commit '
1162cf3084c6e077e2a0cafb831fe16a18e0be62':
Bring up correct app for Recent location list items
PauloftheWest [Thu, 11 Dec 2014 18:07:34 +0000 (18:07 +0000)]
am
e391e713: Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev automerge:
209c946 automerge:
13028d1
* commit '
e391e713cb34648ad6fc9d3f7336c574acc4787c':
Disabled SIM notifications while provisioning.
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:11:24 +0000 (00:11 +0000)]
am
87015c01: am
ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev
automerge:
6a8b163
* commit '
6a8b1634c053192d2abfdd8f1e0f5df9aecbf216':
Fixed a Data Usage crash
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:28:34 +0000 (22:28 +0000)]
am
0d04d8cb: am
32ca6f1f: Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev
automerge:
a8f7074
* commit '
a8f70740c495f7d3f47db65bb08ccdb58c52b178':
Fix NPE in Running Processes view in Apps Settings
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
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
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
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
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:50:35 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: If8d0a895b2fc4715a94e2d0427946d167819aa02
Auto-generated-cl: translation import
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: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
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
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
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
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
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
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
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
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.
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.
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.
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.
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
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.
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
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
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
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.
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
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
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
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