Commit Graph

18135 Commits

Author SHA1 Message Date
Jeff Sharkey
4ec2b9e616 am 9c167e92: Fix secondary data usage color regression.
* commit '9c167e92df8b42c5ff5955c1186cacd4dc44914d':
  Fix secondary data usage color regression.
2015-01-26 23:38:44 +00:00
Jeff Sharkey
9c167e92df 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
2015-01-26 14:18:19 -08:00
Geoff Mendal
849673eddd am 26a3e949: (-s ours) Import translations. DO NOT MERGE
automerge: 808ac6c  -s ours

* commit '808ac6cd14ee4061adc49d78f218a0f4142c153d':
  Import translations. DO NOT MERGE
2015-01-26 15:20:04 +00:00
Geoff Mendal
956fb8caf1 Import translations. DO NOT MERGE
automerge: f916950  -s ours

* commit 'f916950094bca209768b71b63e260439614aa2eb':
  Import translations. DO NOT MERGE
2015-01-26 15:19:55 +00:00
Geoff Mendal
808ac6cd14 am 26a3e949: (-s ours) Import translations. DO NOT MERGE
* commit '26a3e949c591fe2a51a84833fa1e835ea805efcb':
  Import translations. DO NOT MERGE
2015-01-26 15:16:31 +00:00
Geoff Mendal
f916950094 Import translations. DO NOT MERGE
Change-Id: I4b0c7abc349b040b61fa2a08fc20c7ef7dcb4aca
Auto-generated-cl: translation import
2015-01-26 06:55:29 -08:00
Geoff Mendal
26a3e949c5 Import translations. DO NOT MERGE
Change-Id: Iec41803b44675805c7c1df742682b986fb1015f0
Auto-generated-cl: translation import
2015-01-26 06:43:26 -08:00
Sanket Padawe
d0f3755197 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=""
2015-01-24 00:06:37 +00:00
Sanket Padawe
2b6ab796f1 Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev
automerge: a8b78f9

* commit 'a8b78f96ae9e06759a38c19fa625cb980d578c35':
  Hide APNs with type="ia" and apn=""
2015-01-24 00:02:33 +00:00
Sanket Padawe
a8b78f96ae Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev 2015-01-23 23:55:13 +00:00
Sanket Padawe
a7f21a3100 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
2015-01-23 09:53:48 -08:00
Zoltan Szatmary-Ban
489d03c0c3 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
2015-01-23 11:07:57 +00:00
Zoltan Szatmary-Ban
400b801664 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
2015-01-23 11:01:09 +00:00
Zoltan Szatmary-Ban
387597a256 Merge "Show removed user's data usage under its correct item" into lmp-mr1-dev 2015-01-23 10:57:14 +00:00
Pavel Zhamaitsiak
cb267a6f8c Add button in "hidden" settings to flip "VoLTE Provisioned" flag
VoLTE Provisioned flag can be lost when new device image is flashed. Currently
there is no way to trigger Verizon provisioning update from device. This patch
adds button in hidden settings which allow to manually change value of the
flag.

Bug: 19038362
Change-Id: I23f13004dbcf9eaf711c66261696772b1d7bfd6e
2015-01-22 02:57:37 +00:00
Sanket Padawe
e3acb02bb5 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.
2015-01-21 17:20:50 +00:00
Sanket Padawe
49c85c4356 Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev
automerge: 5f1eb2d

* commit '5f1eb2d72a1a7dfb42398176c24445a906cd380c':
  Fixed data connection toggle crash in Settings.
2015-01-21 17:13:05 +00:00
Sanket Padawe
5f1eb2d72a Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev 2015-01-21 17:08:45 +00:00
Geoff Mendal
ea7411bde6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge: 2898f37  -s ours

* commit '2898f37b65b956fb92a0dc67ea5c8afb2c959c6b':
  Import translations. DO NOT MERGE
2015-01-21 15:03:37 +00:00
Geoff Mendal
e272db9505 Import translations. DO NOT MERGE automerge: 75c5298 -s ours
automerge: 9f62273  -s ours

* commit '9f622737ecdc7a6a1ffba1ff76b8f9688d6b4198':
  Import translations. DO NOT MERGE
2015-01-21 15:03:29 +00:00
Geoff Mendal
2898f37b65 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-01-21 14:59:27 +00:00
Geoff Mendal
9f622737ec Import translations. DO NOT MERGE
automerge: 75c5298  -s ours

* commit '75c5298e06eb54dbc96ccc17696ba8e1c8316ee7':
  Import translations. DO NOT MERGE
2015-01-21 14:58:59 +00:00
Geoff Mendal
1359290622 Import translations. DO NOT MERGE
Change-Id: I7b3a724e783b9e279200e43f876d3a30ee813fc0
Auto-generated-cl: translation import
2015-01-21 06:55:59 -08:00
Geoff Mendal
75c5298e06 Import translations. DO NOT MERGE
Change-Id: Iec85d27eb1b30f9d04c74b75e35d86e3a9d3a4e8
Auto-generated-cl: translation import
2015-01-21 06:44:20 -08:00
Maurice Lam
1cca45bc6e 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
2015-01-20 21:44:58 +00:00
Maurice Lam
a1f6660423 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
2015-01-20 21:26:38 +00:00
Maurice Lam
ff649c601d Merge "[WifiSetup] Don't pan the window for IME" into lmp-mr1-dev 2015-01-20 21:21:41 +00:00
Sanket Padawe
766ab606e3 Fixed data connection toggle crash in Settings.
Bug: 19066882
Change-Id: Ib2c7b55d059ddda0543f11ded039ac82bc036850
2015-01-20 10:36:15 -08:00
Geoff Mendal
f7282d213a am e7b79f16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'e7b79f16c1548ba2c40af4452167c64ba442566e':
  Import translations. DO NOT MERGE
2015-01-19 15:20:49 +00:00
Geoff Mendal
8c302e3422 am 21df8221: (-s ours) am 69b87f79: (-s ours) Import translations. DO NOT MERGE
* commit '21df822137b4750d1be2ccf7895876758255c8d0':
  Import translations. DO NOT MERGE
2015-01-19 15:20:48 +00:00
Geoff Mendal
e7b79f16c1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-01-19 15:18:14 +00:00
Geoff Mendal
21df822137 am 69b87f79: (-s ours) Import translations. DO NOT MERGE
* commit '69b87f79256a5edacb90ab7ccce069737ca59b3d':
  Import translations. DO NOT MERGE
2015-01-19 15:14:52 +00:00
Geoff Mendal
e06ab11084 Import translations. DO NOT MERGE
Change-Id: I33eb0003d296f51618451be42ed108d03e833fe7
Auto-generated-cl: translation import
2015-01-19 07:14:45 -08:00
Geoff Mendal
69b87f7925 Import translations. DO NOT MERGE
Change-Id: I5e8d466062fa0483aecaefdac20c34e219b43b3a
Auto-generated-cl: translation import
2015-01-19 07:07:29 -08:00
Zoltan Szatmary-Ban
77c1d36de5 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 cd9b1507fb)
2015-01-19 10:53:45 +00:00
Andre Eisenbach
b1789780f7 am edf618c1: am 906fc417: Merge "Do not perform SDP during pairing" into lmp-mr1-dev
* commit 'edf618c1b7ceb283146de1e26b85a56ab04b206f':
  Do not perform SDP during pairing
2015-01-16 02:47:55 +00:00
Andre Eisenbach
edf618c1b7 am 906fc417: Merge "Do not perform SDP during pairing" into lmp-mr1-dev
* commit '906fc4172466e7ddd0886fa51b308ce4e69c266a':
  Do not perform SDP during pairing
2015-01-16 02:33:50 +00:00
Andre Eisenbach
906fc41724 Merge "Do not perform SDP during pairing" into lmp-mr1-dev 2015-01-16 02:01:05 +00:00
Maurice Lam
98f245069b [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
2015-01-15 11:55:15 -08:00
Andre Eisenbach
63e0f16c63 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
2015-01-15 11:24:49 -08:00
Svetoslav
942edf4ca6 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.
2015-01-15 05:04:51 +00:00
Svetoslav
21824675d5 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.
2015-01-15 04:53:20 +00:00
Svetoslav
6491d51fdc Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev 2015-01-15 04:47:54 +00:00
Sanket Padawe
56b16015bc 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.
2015-01-15 00:42:24 +00:00
Sanket Padawe
2c19066e00 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.
2015-01-15 00:42:23 +00:00
Sanket Padawe
872ed290de 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.
2015-01-14 23:50:44 +00:00
Sanket Padawe
0f9db227ec 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.
2015-01-14 23:50:43 +00:00
Sanket Padawe
b57e1f2964 Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev 2015-01-14 23:20:05 +00:00
Sanket Padawe
e79b65d6c6 Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev 2015-01-14 23:18:13 +00:00
Sanket Padawe
247842017e Fixed missing sim card lock setup in Security Settings.
Bug: 19008335
Change-Id: I078169b5a0215a9219e24554e71df32753213ebe
2015-01-14 14:48:27 -08:00