OSDN Git Service
Sanket Padawe [Wed, 21 Jan 2015 17:23:18 +0000 (17:23 +0000)]
Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev automerge:
5f1eb2d automerge:
49c85c4
automerge:
e3acb02
* commit '
e3acb02bb55d69fc7f1a6351927cf9b2ade058f8':
Fixed data connection toggle crash in Settings.
Sanket Padawe [Wed, 21 Jan 2015 17:20:50 +0000 (17:20 +0000)]
Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev automerge:
5f1eb2d
automerge:
49c85c4
* commit '
49c85c4356ccfcb622e501b57d2893fc7e40bce0':
Fixed data connection toggle crash in Settings.
Sanket Padawe [Wed, 21 Jan 2015 17:13:05 +0000 (17:13 +0000)]
Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev
automerge:
5f1eb2d
* commit '
5f1eb2d72a1a7dfb42398176c24445a906cd380c':
Fixed data connection toggle crash in Settings.
Sanket Padawe [Wed, 21 Jan 2015 17:08:45 +0000 (17:08 +0000)]
Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev
Geoff Mendal [Wed, 21 Jan 2015 15:13:36 +0000 (15:13 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 21 Jan 2015 15:12:37 +0000 (07:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie87f2b8f1370dfc3bbde2ff76c3ca0816c86949b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Jan 2015 15:08:37 +0000 (15:08 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge:
2898f37 -s ours
automerge:
ea7411b -s ours
* commit '
ea7411bde612a87a5fddf5084110c84211dee34d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 15:08:30 +0000 (15:08 +0000)]
Import translations. DO NOT MERGE automerge:
75c5298 -s ours automerge:
9f62273 -s ours
automerge:
e272db9 -s ours
* commit '
e272db9505dbfc02dd1d4af208dc18536961443b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 15:03:37 +0000 (15:03 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge:
2898f37 -s ours
* commit '
2898f37b65b956fb92a0dc67ea5c8afb2c959c6b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 15:03:29 +0000 (15:03 +0000)]
Import translations. DO NOT MERGE automerge:
75c5298 -s ours
automerge:
9f62273 -s ours
* commit '
9f622737ecdc7a6a1ffba1ff76b8f9688d6b4198':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 14:59:26 +0000 (14:59 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 21 Jan 2015 14:58:59 +0000 (14:58 +0000)]
Import translations. DO NOT MERGE
automerge:
75c5298 -s ours
* commit '
75c5298e06eb54dbc96ccc17696ba8e1c8316ee7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 14:55:59 +0000 (06:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7b3a724e783b9e279200e43f876d3a30ee813fc0
Auto-generated-cl: translation import
Geoff Mendal [Wed, 21 Jan 2015 14:44:20 +0000 (06:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iec85d27eb1b30f9d04c74b75e35d86e3a9d3a4e8
Auto-generated-cl: translation import
Maurice Lam [Tue, 20 Jan 2015 21:49:49 +0000 (21:49 +0000)]
am
1cca45bc: Merge "[WifiSetup] Don\'t pan the window for IME" into lmp-mr1-dev automerge:
ff649c6 automerge:
a1f6660
* commit '
1cca45bc6e12a04ce6bde0e5b1c56933869cf9d8':
[WifiSetup] Don't pan the window for IME
Maurice Lam [Tue, 20 Jan 2015 21:44:58 +0000 (21:44 +0000)]
Merge "[WifiSetup] Don\'t pan the window for IME" into lmp-mr1-dev automerge:
ff649c6
automerge:
a1f6660
* commit '
a1f66604233cefd1d4a2b0eab45b76f94770b332':
[WifiSetup] Don't pan the window for IME
Maurice Lam [Tue, 20 Jan 2015 21:26:38 +0000 (21:26 +0000)]
Merge "[WifiSetup] Don\'t pan the window for IME" into lmp-mr1-dev
automerge:
ff649c6
* commit '
ff649c601d0e2caa5d939f09c7183a8a4d8db60b':
[WifiSetup] Don't pan the window for IME
Maurice Lam [Tue, 20 Jan 2015 21:21:40 +0000 (21:21 +0000)]
Merge "[WifiSetup] Don't pan the window for IME" into lmp-mr1-dev
Sanket Padawe [Tue, 20 Jan 2015 18:36:15 +0000 (10:36 -0800)]
Fixed data connection toggle crash in Settings.
Bug:
19066882
Change-Id: Ib2c7b55d059ddda0543f11ded039ac82bc036850
Geoff Mendal [Mon, 19 Jan 2015 15:29:17 +0000 (15:29 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 19 Jan 2015 15:28:11 +0000 (15:28 +0000)]
am
f7282d21: (-s ours) am
e7b79f16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
f7282d213ab2666471c2ffafe5e0e9c3dc144bbe':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Jan 2015 15:28:09 +0000 (15:28 +0000)]
am
8c302e34: (-s ours) am
21df8221: (-s ours) am
69b87f79: (-s ours) Import translations. DO NOT MERGE
* commit '
8c302e34220ae13eacbd997eb955f55c545601e6':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Jan 2015 15:24:33 +0000 (07:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9b5b4d49b4e7cfb40b84c2381db5921eec95bece
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Jan 2015 15:20:49 +0000 (15:20 +0000)]
am
e7b79f16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
e7b79f16c1548ba2c40af4452167c64ba442566e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Jan 2015 15:20:48 +0000 (15:20 +0000)]
am
21df8221: (-s ours) am
69b87f79: (-s ours) Import translations. DO NOT MERGE
* commit '
21df822137b4750d1be2ccf7895876758255c8d0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Jan 2015 15:18:14 +0000 (15:18 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 19 Jan 2015 15:14:52 +0000 (15:14 +0000)]
am
69b87f79: (-s ours) Import translations. DO NOT MERGE
* commit '
69b87f79256a5edacb90ab7ccce069737ca59b3d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Jan 2015 15:14:45 +0000 (07:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I33eb0003d296f51618451be42ed108d03e833fe7
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Jan 2015 15:07:29 +0000 (07:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5e8d466062fa0483aecaefdac20c34e219b43b3a
Auto-generated-cl: translation import
Paul Lawrence [Fri, 16 Jan 2015 21:31:05 +0000 (21:31 +0000)]
Merge "Make cryptkeeper background dark black"
Paul Lawrence [Fri, 16 Jan 2015 19:43:07 +0000 (11:43 -0800)]
Make cryptkeeper background dark black
Bug:
18331607
Change-Id: Ia6ab86efa49753cd180b60c5cbcdbe8f274ab5e7
Fyodor Kupolov [Fri, 16 Jan 2015 21:00:03 +0000 (21:00 +0000)]
Merge "Show Location restriction without the Settings item"
Paul Lawrence [Fri, 16 Jan 2015 14:59:47 +0000 (14:59 +0000)]
Merge "Set font sizes of typed passwords and pins to match keyguard"
Maurice Lam [Fri, 16 Jan 2015 02:52:49 +0000 (02:52 +0000)]
Merge "[WifiSetup] Remove grey Wi-Fi icon asset"
Andre Eisenbach [Fri, 16 Jan 2015 02:52:25 +0000 (02:52 +0000)]
am
b1789780: am
edf618c1: am
906fc417: Merge "Do not perform SDP during pairing" into lmp-mr1-dev
* commit '
b1789780f7453822d195567f011ea926d9c67492':
Do not perform SDP during pairing
Andre Eisenbach [Fri, 16 Jan 2015 02:47:55 +0000 (02:47 +0000)]
am
edf618c1: am
906fc417: Merge "Do not perform SDP during pairing" into lmp-mr1-dev
* commit '
edf618c1b7ceb283146de1e26b85a56ab04b206f':
Do not perform SDP during pairing
Andre Eisenbach [Fri, 16 Jan 2015 02:33:50 +0000 (02:33 +0000)]
am
906fc417: Merge "Do not perform SDP during pairing" into lmp-mr1-dev
* commit '
906fc4172466e7ddd0886fa51b308ce4e69c266a':
Do not perform SDP during pairing
Andre Eisenbach [Fri, 16 Jan 2015 02:01:02 +0000 (02:01 +0000)]
Merge "Do not perform SDP during pairing" into lmp-mr1-dev
Maurice Lam [Fri, 16 Jan 2015 00:57:55 +0000 (16:57 -0800)]
[WifiSetup] Remove grey Wi-Fi icon asset
Follow-up on ag/613416 which removed the last reference to the grey
Wi-Fi icon asset.
Bug:
17575719
Change-Id: I921672ef5299f630abc10fac8e2a046bb264a34f
Paul Lawrence [Thu, 15 Jan 2015 23:49:40 +0000 (15:49 -0800)]
Set font sizes of typed passwords and pins to match keyguard
Bug:
17887105
Change-Id: I598c6224b501078e9a99c9e73aa1411b430847a9
Maurice Lam [Wed, 14 Jan 2015 23:37:36 +0000 (15:37 -0800)]
Remove grey Wi-Fi icon from Setup Wizard
This removes the grey Wi-Fi icon from the empty-view in the Wi-Fi
list of Setup Wizard. Also updated the style so it looks like the
description text in other setup screens.
Also fixed the view recycling by not calling getRootAdapter in
onActivityCreated, since that will cause the Preference framework
to not cache the AccessPoint preference.
Bug:
17575719
Bug:
16518752
Change-Id: I06cbc88db1c04b29a9ce8221596265effc39b90b
Fyodor Kupolov [Tue, 23 Dec 2014 23:55:17 +0000 (15:55 -0800)]
Show Location restriction without the Settings item
In App & content access page for restricted profiles, Location restriction
should be shown without its parent element.
Also fixed an issue when app summary may be incomplete.
Bug:
15761405,
17182612
Change-Id: Ia298cf581413d124d25608f825f97a9e64baf479
Maurice Lam [Thu, 15 Jan 2015 19:43:34 +0000 (11:43 -0800)]
[WifiSetup] Don't pan the window for IME
Suppress panning the activity window for the IME because that is
causing garbage to be drawn.
Bug:
18974000
Change-Id: I42429241425be0e520e9b36d1e134748ae583076
Andre Eisenbach [Fri, 9 Jan 2015 22:52:47 +0000 (14:52 -0800)]
Do not perform SDP during pairing
As a result of commit
7de119c (ag/591931), SDP is performed when the
pairing dialog pops up. There are multiple problems with this. On badly
behaved devices an SDP request might trigger pairing from the remote
side, other devices (like Logitech keyboards) will close the connection
once SDP disconnects, causing the pairing to fail.
Further more, fetchUuidsWithSdk() is an asynchronous call. The code that
was added does not wait for SDP to complete. Thus the check for the PBAP
UUID will always fail and cause the permission check to still be
displayed.
With this change, SDP is not performed when the dialog is popped up and
PBAP permission is granted after bonding and subsequent service
discovery in accordance with final consensus in bug
16964116.
Bug:
18948640
Change-Id: I149afa8ae59b63f59ba579c12f97c3ea3d70112c
Svetoslav [Thu, 15 Jan 2015 05:11:40 +0000 (05:11 +0000)]
am
942edf4c: am
21824675: am
6491d51f: Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev
* commit '
942edf4ca6fb2e191d2ba1f5f2c2933c535516fd':
Settings not showing print jobs for a managed profile.
Svetoslav [Thu, 15 Jan 2015 05:04:51 +0000 (05:04 +0000)]
am
21824675: am
6491d51f: Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev
* commit '
21824675d5343f26fd0c4cda45d60be89d59c59b':
Settings not showing print jobs for a managed profile.
Svetoslav [Thu, 15 Jan 2015 04:53:20 +0000 (04:53 +0000)]
am
6491d51f: Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev
* commit '
6491d51fdcc63a27c3e1f27c6ece5dc3af5877eb':
Settings not showing print jobs for a managed profile.
Svetoslav [Thu, 15 Jan 2015 04:47:53 +0000 (04:47 +0000)]
Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev
Sanket Padawe [Thu, 15 Jan 2015 04:29:28 +0000 (04:29 +0000)]
am
56b16015: am
872ed290: am
b57e1f29: Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev
* commit '
56b16015bcd0c9cecdf71e1276ef6665856c3b09':
Fixed missing sim card lock setup in Security Settings.
Sanket Padawe [Thu, 15 Jan 2015 04:29:26 +0000 (04:29 +0000)]
am
2c19066e: am
0f9db227: am
e79b65d6: Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev
* commit '
2c19066e0080015950893fb5655f445adf76743e':
Fixed data connection toggle UI issue due to local cache maintained.
Geoff Mendal [Thu, 15 Jan 2015 02:56:35 +0000 (02:56 +0000)]
am
1b1a08fd: (-s ours) am
9b07944c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
1b1a08fdb8675f233a9f0f4d5d42aea87770b174':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 15 Jan 2015 02:56:34 +0000 (02:56 +0000)]
am
7b62336f: (-s ours) am
3d600a06: (-s ours) am
c51cfe3d: (-s ours) Import translations. DO NOT MERGE
* commit '
7b62336f26bc5966080e8153690da4fa28f5adf3':
Import translations. DO NOT MERGE
Sanket Padawe [Thu, 15 Jan 2015 00:42:24 +0000 (00:42 +0000)]
am
872ed290: am
b57e1f29: Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev
* commit '
872ed290de26374bb1ce9a2e43b0f75c79125ee6':
Fixed missing sim card lock setup in Security Settings.
Sanket Padawe [Thu, 15 Jan 2015 00:42:23 +0000 (00:42 +0000)]
am
0f9db227: am
e79b65d6: Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev
* commit '
0f9db227ec110e9344f9d4f96ff983780531eb76':
Fixed data connection toggle UI issue due to local cache maintained.
Sanket Padawe [Wed, 14 Jan 2015 23:50:44 +0000 (23:50 +0000)]
am
b57e1f29: Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev
* commit '
b57e1f29643e7454192973db738c13583b5c91a5':
Fixed missing sim card lock setup in Security Settings.
Sanket Padawe [Wed, 14 Jan 2015 23:50:43 +0000 (23:50 +0000)]
am
e79b65d6: Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev
* commit '
e79b65d6c6f6df7d6fd84a6f5c540bd99d71f152':
Fixed data connection toggle UI issue due to local cache maintained.
Sanket Padawe [Wed, 14 Jan 2015 23:20:04 +0000 (23:20 +0000)]
Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev
Sanket Padawe [Wed, 14 Jan 2015 23:18:13 +0000 (23:18 +0000)]
Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev
Sanket Padawe [Wed, 14 Jan 2015 22:48:27 +0000 (14:48 -0800)]
Fixed missing sim card lock setup in Security Settings.
Bug:
19008335
Change-Id: I078169b5a0215a9219e24554e71df32753213ebe
Adrian Roos [Wed, 14 Jan 2015 22:32:47 +0000 (22:32 +0000)]
Merge "Remove usages of LPU.savedPatternExists"
Lucky Zhang [Wed, 14 Jan 2015 22:32:31 +0000 (22:32 +0000)]
am
585b53e6: am
0325a858: Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev
automerge:
591a091
* commit '
591a09131162a32ad5923dc3553a464a5da1d39c':
[Settings] Wifi Setup responds to other connection state change
Adrian Roos [Wed, 14 Jan 2015 20:41:47 +0000 (20:41 +0000)]
Merge "Purge biometric weak from internal code"
Fyodor Kupolov [Wed, 14 Jan 2015 20:14:24 +0000 (20:14 +0000)]
Merge "Show confirmation when turning on "Phone calls/sms""
Geoff Mendal [Wed, 14 Jan 2015 19:24:21 +0000 (19:24 +0000)]
am
9b07944c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
9b07944c5007460b8c6792321e5db1350ec3ff55':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Jan 2015 19:24:20 +0000 (19:24 +0000)]
am
3d600a06: (-s ours) am
c51cfe3d: (-s ours) Import translations. DO NOT MERGE
* commit '
3d600a06119f2c11ba2394d64a84348aa94fd520':
Import translations. DO NOT MERGE
Sanket Padawe [Wed, 14 Jan 2015 19:03:33 +0000 (11:03 -0800)]
Fixed data connection toggle UI issue due to local cache maintained.
+ Fixed the scenario wherein more than 1 sim cannot be "On" at the same time.
Bug:
18916033
Change-Id: Ia95b54c9ee29d360a1b4542f00a9f698615912bb
Geoff Mendal [Wed, 14 Jan 2015 14:33:29 +0000 (06:33 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6d825f2584c9d3924d1fab1e8f2c56e6f71e2004
Auto-generated-cl: translation import
Geoff Mendal [Wed, 14 Jan 2015 14:24:51 +0000 (14:24 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 14 Jan 2015 14:23:15 +0000 (14:23 +0000)]
am
c51cfe3d: (-s ours) Import translations. DO NOT MERGE
* commit '
c51cfe3d8131084cebf674b06faa7360307b5425':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Jan 2015 14:23:07 +0000 (06:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifcd43881fe6a7f7cecd76278e10d99f1c01857c3
Auto-generated-cl: translation import
Geoff Mendal [Wed, 14 Jan 2015 14:16:00 +0000 (06:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic614419c04bbacc20f37c24902286fcaa11e79a9
Auto-generated-cl: translation import
Lucky Zhang [Wed, 14 Jan 2015 12:06:43 +0000 (12:06 +0000)]
am
585b53e6: am
0325a858: Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev
* commit '
585b53e6d2ddc0725ce69f6f7208ad791e8d256e':
[Settings] Wifi Setup responds to other connection state change
Lucky Zhang [Wed, 14 Jan 2015 11:59:54 +0000 (11:59 +0000)]
am
0325a858: Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev
* commit '
0325a85849ab7d08555e8ce1d95d6d239d41ef27':
[Settings] Wifi Setup responds to other connection state change
Svetoslav [Wed, 14 Jan 2015 02:48:29 +0000 (18:48 -0800)]
Settings not showing print jobs for a managed profile.
The settings app is shared among the personal and work profiles.
When fetching print jobs it was not getting the ones for the work
profile, rather the ones for the current user which is the personal
profile.
bug:
18867406
Change-Id: I99f8cf3a3e2b133a0a4d5a8915473d1190e205f4
Lucky Zhang [Wed, 14 Jan 2015 01:36:45 +0000 (01:36 +0000)]
Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev
Lucky Zhang [Tue, 13 Jan 2015 18:22:28 +0000 (10:22 -0800)]
[Settings] Wifi Setup responds to other connection state change
Made use of the two new extras isNetworkRequired and ifWifiRequired in
deciding the ui state of the wifi setting. The CL that adds these
extras in setup wizard is here (http://ag/612291).
Added logic to update the next ("skip") button state accordingly:
(1) "Skip" button should be enabled if
- wifi is not required and network is not required
- or wifi is not required, but network is required, and we have a
valid network connection
(2) "Skip" button should be disabled if
- wifi is required
- or wifi is not required, but network is required, and we have
no valid network connection
Note that the newly added logic is only run if wifi is not connected. If
wifi is already connected, the next button will show "next" and be
enabled.
This fixes the bug where wifi settings in setup wizard does not respond
to mobile data connection change.
Bug:
18783746
Change-Id: I155dcb158f790dd96a71099339f64b64cc647da0
Wink Saville [Tue, 13 Jan 2015 21:11:14 +0000 (21:11 +0000)]
am
cc26e1dc: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev
automerge:
bcad54f
* commit '
bcad54f6474b264a04a4f59fb8ad6371861f1a62':
Wink Saville [Tue, 13 Jan 2015 21:11:07 +0000 (21:11 +0000)]
am
a908d819: am
718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener.
automerge:
1015f08
* commit '
1015f08455da4c0823d98d5f74104e0fc3b7de33':
Rename reg/unreg OnSubscriptionsChangedListener.
Geoff Mendal [Tue, 13 Jan 2015 20:16:32 +0000 (20:16 +0000)]
am
4fe6117c: (-s ours) am
26310772: (-s ours) Import translations. DO NOT MERGE
automerge:
4d23238 -s ours
* commit '
4d232386311f8dbaa5baaa3781b592d3e527660c':
Import translations. DO NOT MERGE
Wink Saville [Tue, 13 Jan 2015 19:16:06 +0000 (19:16 +0000)]
am
cc26e1dc: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev
* commit '
cc26e1dc5c6f7437678dfe5c0b230bf59879d8f4':
Wink Saville [Tue, 13 Jan 2015 19:16:05 +0000 (19:16 +0000)]
am
a908d819: am
718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener.
* commit '
a908d8191acf3e4786933d67a1a4211543323a7d':
Rename reg/unreg OnSubscriptionsChangedListener.
Wink Saville [Tue, 13 Jan 2015 19:10:40 +0000 (19:10 +0000)]
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev
Wink Saville [Tue, 13 Jan 2015 19:09:54 +0000 (19:09 +0000)]
Rename reg/unreg OnSubscriptionsChangedListener.
automerge:
718c4d9
* commit '
718c4d9b1939e3e970f29fb9622e8b6ab73d2b6b':
Rename reg/unreg OnSubscriptionsChangedListener.
Wink Saville [Tue, 13 Jan 2015 19:09:51 +0000 (19:09 +0000)]
am
718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener.
* commit '
718c4d9b1939e3e970f29fb9622e8b6ab73d2b6b':
Rename reg/unreg OnSubscriptionsChangedListener.
Wink Saville [Tue, 13 Jan 2015 00:50:58 +0000 (16:50 -0800)]
Rename reg/unreg OnSubscriptionsChangedListener.
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.
Bug:
18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
Geoff Mendal [Mon, 12 Jan 2015 23:45:01 +0000 (23:45 +0000)]
am
04250824: (-s ours) Import translations. DO NOT MERGE
automerge:
3f2ece6 -s ours
* commit '
3f2ece6ceae3923dca0d54b2e65fa16e79e3752c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Jan 2015 16:40:27 +0000 (16:40 +0000)]
am
4fe6117c: (-s ours) am
26310772: (-s ours) Import translations. DO NOT MERGE
* commit '
4fe6117cc1ce411dbbcfc1b25dc1ef720901ad4b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Jan 2015 16:14:28 +0000 (16:14 +0000)]
am
26310772: (-s ours) Import translations. DO NOT MERGE
* commit '
26310772872b327029cad560fa7b3e797b7980e9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Jan 2015 16:14:25 +0000 (16:14 +0000)]
am
04250824: (-s ours) Import translations. DO NOT MERGE
* commit '
04250824ff4d5231ee17a060a7ce77fcc02a6657':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Jan 2015 15:14:04 +0000 (07:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I434030eb3a517745ca132ec904e91b8f90dc47ed
Auto-generated-cl: translation import
Geoff Mendal [Mon, 12 Jan 2015 15:03:11 +0000 (07:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3174bd9c344b8bf618340c4b21b0f739ba198095
Auto-generated-cl: translation import
Geoff Mendal [Mon, 12 Jan 2015 14:55:33 +0000 (06:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I58204e4d028fbdb98e1bb810de8d535974aeb130
Auto-generated-cl: translation import
Sanket Padawe [Fri, 9 Jan 2015 19:23:23 +0000 (19:23 +0000)]
am
058b0561: Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev automerge:
270af42
automerge:
dd0a5db
* commit '
dd0a5db0ddf16d49161053b1e0aafa7acf158a11':
Display Voice nw type if Data nw is Unknown for Sprout.
Sanket Padawe [Fri, 9 Jan 2015 19:17:18 +0000 (19:17 +0000)]
am
058b0561: Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev automerge:
270af42
* commit '
058b0561b3712f19aba28020dad3cd63762050f5':
Display Voice nw type if Data nw is Unknown for Sprout.
Sanket Padawe [Fri, 9 Jan 2015 19:11:35 +0000 (19:11 +0000)]
Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev
automerge:
270af42
* commit '
270af427cd509b002751d6e6243a02f6c199b1a0':
Display Voice nw type if Data nw is Unknown for Sprout.
Sanket Padawe [Fri, 9 Jan 2015 19:08:26 +0000 (19:08 +0000)]
Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev
Adrian Roos [Thu, 8 Jan 2015 15:20:00 +0000 (16:20 +0100)]
Remove usages of LPU.savedPatternExists
The correct method to call is isLockPatternEnabled, which
also checks whether we've actually selected a pattern.
Also removes the code for the obsolete pattern enabled setting.
Bug:
18931518
Change-Id: I6f369eb60f8f6bb1e33384cd06534c713ab52e79
Alexandra Gherghina [Fri, 9 Jan 2015 10:41:40 +0000 (10:41 +0000)]
Merge "Fix width of app notifications detail screen"
Sanket Padawe [Thu, 8 Jan 2015 23:25:19 +0000 (23:25 +0000)]
am
0c3b1371: am
f5a4abc2: Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev
automerge:
c7e5b42
* commit '
c7e5b42ac493f7f06fd8d90f87a4e7eb23acc54c':
Fixed Cellular data toggling issue in settings for multisim
Sanket Padawe [Thu, 8 Jan 2015 23:19:38 +0000 (23:19 +0000)]
am
0c3b1371: am
f5a4abc2: Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev
* commit '
0c3b13718defb18191120c578c1658c26c4d13e0':
Fixed Cellular data toggling issue in settings for multisim
OSDN Git Service
