Commit Graph

19351 Commits

Author SHA1 Message Date
Maurice Lam
d9165c06a4 [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
2015-01-21 09:48:42 -08:00
Sanket Padawe
913ebd7909 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.
2015-01-21 17:23:18 +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
cf4bb0840e Merge "Import translations. DO NOT MERGE" 2015-01-21 15:13:37 +00:00
Geoff Mendal
8d15f5b991 Import translations. DO NOT MERGE
Change-Id: Ie87f2b8f1370dfc3bbde2ff76c3ca0816c86949b
Auto-generated-cl: translation import
2015-01-21 07:12:37 -08:00
Geoff Mendal
c1d297e2e2 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
2015-01-21 15:08:37 +00:00
Geoff Mendal
50fc98395e Import translations. DO NOT MERGE automerge: 75c5298 -s ours automerge: 9f62273 -s ours
automerge: e272db9  -s ours

* commit 'e272db9505dbfc02dd1d4af208dc18536961443b':
  Import translations. DO NOT MERGE
2015-01-21 15:08:30 +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
50f2081f6b 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
2015-01-20 21:49:49 +00: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
f3428e435e Merge "Import translations. DO NOT MERGE" 2015-01-19 15:29:17 +00:00
Geoff Mendal
edc6444af7 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
2015-01-19 15:28:11 +00:00
Geoff Mendal
80b03b607a am 8c302e34: (-s ours) am 21df8221: (-s ours) am 69b87f79: (-s ours) Import translations. DO NOT MERGE
* commit '8c302e34220ae13eacbd997eb955f55c545601e6':
  Import translations. DO NOT MERGE
2015-01-19 15:28:09 +00:00
Geoff Mendal
3c075f8fd3 Import translations. DO NOT MERGE
Change-Id: I9b5b4d49b4e7cfb40b84c2381db5921eec95bece
Auto-generated-cl: translation import
2015-01-19 07:24:33 -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
Paul Lawrence
792da778f3 Merge "Make cryptkeeper background dark black" 2015-01-16 21:31:05 +00:00
Paul Lawrence
8e53d7ff08 Make cryptkeeper background dark black
Bug: 18331607
Change-Id: Ia6ab86efa49753cd180b60c5cbcdbe8f274ab5e7
2015-01-16 13:16:10 -08:00
Fyodor Kupolov
b0afc2a0dc Merge "Show Location restriction without the Settings item" 2015-01-16 21:00:03 +00:00
Zoltan Szatmary-Ban
3af2e4c35c Eliminate duplicated code in Settings for category headers
Change-Id: I5bdba2ad4f9e1987f9e818af9d5aa96a9d558f6b
2015-01-16 15:48:13 +00:00
Paul Lawrence
d300f3f3a4 Merge "Set font sizes of typed passwords and pins to match keyguard" 2015-01-16 14:59:48 +00:00
Maurice Lam
143d821c03 Merge "[WifiSetup] Remove grey Wi-Fi icon asset" 2015-01-16 02:52:49 +00:00
Andre Eisenbach
77f3c6e5c3 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
2015-01-16 02:52:25 +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
b93ee59f29 [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
2015-01-15 16:57:55 -08:00
Paul Lawrence
33c4f7b4c7 Set font sizes of typed passwords and pins to match keyguard
Bug: 17887105
Change-Id: I598c6224b501078e9a99c9e73aa1411b430847a9
2015-01-15 15:49:40 -08:00
Maurice Lam
859dcab128 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
2015-01-15 14:33:31 -08:00
Fyodor Kupolov
bc02b84cb5 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
2015-01-15 11:58:19 -08: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
2f08914e32 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.
2015-01-15 05:11:40 +00: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