Commit Graph

20174 Commits

Author SHA1 Message Date
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
xinhe
82ff3d5c56 set softAP on a specified band, including both 2.4 and 5 GHz band
Bug:18929692
Change-Id: I455e9b17e5091596beb0246ccfd981c5d2b932f0
2015-01-16 10:50:56 -08: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
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
0640ac69d3 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.
2015-01-15 04:29:28 +00:00
Sanket Padawe
701a0af6c0 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.
2015-01-15 04:29:26 +00:00
Geoff Mendal
68b179c850 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
2015-01-15 02:56:35 +00:00
Geoff Mendal
e1e8402552 am 7b62336f: (-s ours) am 3d600a06: (-s ours) am c51cfe3d: (-s ours) Import translations. DO NOT MERGE
* commit '7b62336f26bc5966080e8153690da4fa28f5adf3':
  Import translations. DO NOT MERGE
2015-01-15 02:56:34 +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
Adrian Roos
4c60d16936 Merge "Remove usages of LPU.savedPatternExists" 2015-01-14 22:33:08 +00:00
Lucky Zhang
53cc0556d8 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
2015-01-14 22:32:31 +00:00
Adrian Roos
c6e261e76b Merge "Purge biometric weak from internal code" 2015-01-14 20:41:48 +00:00
Fyodor Kupolov
c4bfeaeb7f Merge "Show confirmation when turning on "Phone calls/sms"" 2015-01-14 20:14:24 +00:00
Geoff Mendal
1b1a08fdb8 am 9b07944c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '9b07944c5007460b8c6792321e5db1350ec3ff55':
  Import translations. DO NOT MERGE
2015-01-14 19:24:21 +00:00
Geoff Mendal
7b62336f26 am 3d600a06: (-s ours) am c51cfe3d: (-s ours) Import translations. DO NOT MERGE
* commit '3d600a06119f2c11ba2394d64a84348aa94fd520':
  Import translations. DO NOT MERGE
2015-01-14 19:24:20 +00:00
Sanket Padawe
d819270f0f 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
2015-01-14 11:03:33 -08:00
Geoff Mendal
dbf7e211e4 Import translations. DO NOT MERGE
Change-Id: I6d825f2584c9d3924d1fab1e8f2c56e6f71e2004
Auto-generated-cl: translation import
2015-01-14 06:33:29 -08:00
Geoff Mendal
9b07944c50 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-01-14 14:24:51 +00:00
Geoff Mendal
3d600a0611 am c51cfe3d: (-s ours) Import translations. DO NOT MERGE
* commit 'c51cfe3d8131084cebf674b06faa7360307b5425':
  Import translations. DO NOT MERGE
2015-01-14 14:23:15 +00:00
Geoff Mendal
23fd634e2d Import translations. DO NOT MERGE
Change-Id: Ifcd43881fe6a7f7cecd76278e10d99f1c01857c3
Auto-generated-cl: translation import
2015-01-14 06:23:07 -08:00
Geoff Mendal
c51cfe3d81 Import translations. DO NOT MERGE
Change-Id: Ic614419c04bbacc20f37c24902286fcaa11e79a9
Auto-generated-cl: translation import
2015-01-14 06:16:00 -08:00
Lucky Zhang
591a091311 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
2015-01-14 12:06:43 +00:00
Lucky Zhang
585b53e6d2 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
2015-01-14 11:59:54 +00:00
Svetoslav
6cfe799654 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
2015-01-13 18:48:33 -08:00
Lucky Zhang
0325a85849 Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev 2015-01-14 01:36:45 +00:00