OSDN Git Service
Jeff Sharkey [Mon, 26 Jan 2015 23:49:33 +0000 (23:49 +0000)]
am
78ab1669: am
4ec2b9e6: am
9c167e92: Fix secondary data usage color regression.
* commit '
78ab16692baf21d1832e5376e79894c991abe85a':
Fix secondary data usage color regression.
Jeff Sharkey [Mon, 26 Jan 2015 23:43:41 +0000 (23:43 +0000)]
am
4ec2b9e6: am
9c167e92: Fix secondary data usage color regression.
* commit '
4ec2b9e6160b386b70abb43ef2211ff0c6036345':
Fix secondary data usage color regression.
Jeff Sharkey [Mon, 26 Jan 2015 23:38:44 +0000 (23:38 +0000)]
am
9c167e92: Fix secondary data usage color regression.
* commit '
9c167e92df8b42c5ff5955c1186cacd4dc44914d':
Fix secondary data usage color regression.
Jeff Sharkey [Mon, 26 Jan 2015 22:15:59 +0000 (15:15 -0700)]
Fix secondary data usage color regression.
Show overall usage with a 50% transparency when looking at a
specific app details page. (Otherwise you can't tell them apart.)
Bug:
18927935
Change-Id: I0cad1ba0451a9dab3ed90fa5aa53c115dbe3e1d3
Geoff Mendal [Mon, 26 Jan 2015 15:29:13 +0000 (15:29 +0000)]
am
849673ed: (-s ours) am
26a3e949: (-s ours) Import translations. DO NOT MERGE automerge:
808ac6c -s ours
* commit '
849673eddda7924d33b18b25bf81758ffab7eebe':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Jan 2015 15:29:12 +0000 (15:29 +0000)]
am
956fb8ca: (-s ours) Import translations. DO NOT MERGE automerge:
f916950 -s ours
* commit '
956fb8caf1af11d09e7370d236c70766114f95c1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Jan 2015 15:20:04 +0000 (15:20 +0000)]
am
26a3e949: (-s ours) Import translations. DO NOT MERGE
automerge:
808ac6c -s ours
* commit '
808ac6cd14ee4061adc49d78f218a0f4142c153d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Jan 2015 15:19:55 +0000 (15:19 +0000)]
Import translations. DO NOT MERGE
automerge:
f916950 -s ours
* commit '
f916950094bca209768b71b63e260439614aa2eb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Jan 2015 15:16:31 +0000 (15:16 +0000)]
am
26a3e949: (-s ours) Import translations. DO NOT MERGE
* commit '
26a3e949c591fe2a51a84833fa1e835ea805efcb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Jan 2015 15:12:02 +0000 (07:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia7585d948d9ae85fa8345af5266a1c7744fddd83
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Jan 2015 14:55:29 +0000 (06:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4b0c7abc349b040b61fa2a08fc20c7ef7dcb4aca
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Jan 2015 14:43:26 +0000 (06:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iec41803b44675805c7c1df742682b986fb1015f0
Auto-generated-cl: translation import
Sanket Padawe [Sat, 24 Jan 2015 00:20:34 +0000 (00:20 +0000)]
am
2b6ab796: Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev automerge:
a8b78f9
automerge:
d0f3755
* commit '
d0f3755197eef1a1c9a3b59765b1fc55c9115202':
Hide APNs with type="ia" and apn=""
Sanket Padawe [Sat, 24 Jan 2015 00:06:37 +0000 (00:06 +0000)]
am
2b6ab796: Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev automerge:
a8b78f9
* commit '
2b6ab796f1ba4b6c29eb23eb3e71dd8c107497a9':
Hide APNs with type="ia" and apn=""
Sanket Padawe [Sat, 24 Jan 2015 00:02:33 +0000 (00:02 +0000)]
Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev
automerge:
a8b78f9
* commit '
a8b78f96ae9e06759a38c19fa625cb980d578c35':
Hide APNs with type="ia" and apn=""
Sanket Padawe [Fri, 23 Jan 2015 23:55:12 +0000 (23:55 +0000)]
Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev
Sanket Padawe [Fri, 23 Jan 2015 17:53:48 +0000 (09:53 -0800)]
Hide APNs with type="ia" and apn=""
APNs with type="ia" and no APN address (apn="") are used to
prevent an initial attach APN from being sent to the modem. This
in turn prevents the LTE ESM information procedure from being
used during the LTE attach. These APNs are meaningless and confusing to end users - so this
change hides them from the APN list.
Bug:
19101183
Change-Id: I9aacf787f8c175a301ad546f972f8972aad2a6b3
Maurice Lam [Fri, 23 Jan 2015 17:44:05 +0000 (17:44 +0000)]
Merge "[LockScreen] Don't extract UI in ChooseLockPassword"
Zoltan Szatmary-Ban [Fri, 23 Jan 2015 11:10:57 +0000 (11:10 +0000)]
am
400b8016: am
387597a2: Merge "Show removed user\'s data usage under its correct item" into lmp-mr1-dev
automerge:
489d03c
* commit '
489d03c0c3f7e360e89100ed05d03d347eff1538':
Show removed user's data usage under its correct item
Zoltan Szatmary-Ban [Fri, 23 Jan 2015 11:07:57 +0000 (11:07 +0000)]
am
400b8016: am
387597a2: Merge "Show removed user\'s data usage under its correct item" into lmp-mr1-dev
* commit '
400b801664e59ef68072e231849a0e762edcd3c8':
Show removed user's data usage under its correct item
Zoltan Szatmary-Ban [Fri, 23 Jan 2015 11:01:09 +0000 (11:01 +0000)]
am
387597a2: Merge "Show removed user\'s data usage under its correct item" into lmp-mr1-dev
* commit '
387597a2560826a22dc18cc78ffaed75f9672ff2':
Show removed user's data usage under its correct item
Zoltan Szatmary-Ban [Fri, 23 Jan 2015 10:57:13 +0000 (10:57 +0000)]
Merge "Show removed user's data usage under its correct item" into lmp-mr1-dev
Maurice Lam [Wed, 21 Jan 2015 21:26:10 +0000 (21:26 +0000)]
Merge "[WifiSetup] Don't show menu during setup"
Fyodor Kupolov [Wed, 21 Jan 2015 20:52:23 +0000 (20:52 +0000)]
Merge "Reset RunningState on user related changes"
Fyodor Kupolov [Wed, 21 Jan 2015 18:33:52 +0000 (10:33 -0800)]
Reset RunningState on user related changes
RunningState now listens to user-related broadcasts and resets its state if
necessary.
Previously, user entry was visible even after the user had been removed.
Bug:
18696308
Change-Id: I499956c434d0d05bfa2a99b5e3e71ac73fe83297
Maurice Lam [Wed, 21 Jan 2015 00:05:35 +0000 (16:05 -0800)]
[LockScreen] Don't extract UI in ChooseLockPassword
Added flagnoextractui to the EditText in ChooseLockPasswordActivity
so that the instruction text is still visible on phone landscape.
Also wrapped it in a ScrollView because for smaller screen devices
the buttons may be squeezed to fit onto the screen if the ScrollView
is not there.
Bug:
18644582
Change-Id: Ib81aadb5377aacc8d85fdeee7e1809ad3ff71213
Maurice Lam [Thu, 18 Dec 2014 19:36:16 +0000 (11:36 -0800)]
[WifiSetup] Don't show menu during setup
Hides the menu during Wi-Fi setup -- we removed the menu button from
the UI but the menu can still be started with a hardware menu button.
This change removes that ability as well (during setup).
If you want to test on a device without a hardware menu button, you
can use the command
adb shell input keyevent 82
Change-Id: Ibe3cc679353a83c995e24680c3e7dc1575d32fe0
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
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
(cherry picked from commit
cd9b1507fbb6d9f443a4fb1bb8d9d58073c7e5d0)
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
OSDN Git Service
