Commit Graph

8025 Commits

Author SHA1 Message Date
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
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
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
906fc41724 Merge "Do not perform SDP during pairing" into lmp-mr1-dev 2015-01-16 02:01:05 +00: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
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
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
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
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
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
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
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
Lucky Zhang
9fe89bbb2e [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
2015-01-13 17:20:42 -08:00
Wink Saville
b91be0cfc7 am a908d819: am 718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener.
automerge: 1015f08

* commit '1015f08455da4c0823d98d5f74104e0fc3b7de33':
  Rename reg/unreg OnSubscriptionsChangedListener.
2015-01-13 21:11:07 +00:00
Wink Saville
1015f08455 am a908d819: am 718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener.
* commit 'a908d8191acf3e4786933d67a1a4211543323a7d':
  Rename reg/unreg OnSubscriptionsChangedListener.
2015-01-13 19:16:05 +00:00
Wink Saville
718c4d9b19 Rename reg/unreg OnSubscriptionsChangedListener.
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
2015-01-13 08:36:25 -08:00
Sanket Padawe
7a89dde862 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.
2015-01-09 19:23:23 +00:00
Sanket Padawe
dd0a5db0dd 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.
2015-01-09 19:17:18 +00:00
Sanket Padawe
270af427cd Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev 2015-01-09 19:08:26 +00:00
Adrian Roos
6b879f50f6 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
2015-01-09 14:35:52 +01:00
Alexandra Gherghina
08309d2072 Merge "Fix width of app notifications detail screen" 2015-01-09 10:41:42 +00:00
Sanket Padawe
4e4860bbcb 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
2015-01-08 23:25:19 +00:00
Sanket Padawe
c7e5b42ac4 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
2015-01-08 23:19:38 +00:00
Sanket Padawe
f5a4abc205 Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev 2015-01-08 23:09:11 +00:00
Sanket Padawe
4201391899 Display Voice nw type if Data nw is Unknown for Sprout.
For multisim device when default data connection is set to 1st sim,
getDataNetworkType() returns Unknown for 2nd sim. In that case use
getVoiceNetworkType() to display Cellular nw type in sim status.

Bug: 18922147
Change-Id: Id7c39f8717737b60bde988cbd1c85ce8f6768a6f
2015-01-08 12:37:34 -08:00
Sanket Padawe
24f834d745 Fixed Cellular data toggling issue in settings for multisim
Bug: 18916033
Bug: 18779784
Change-Id: Ifda57b5ae89268f921ee2b75b5b6d90d75514540
2015-01-08 11:23:11 -08:00
Fyodor Kupolov
dbbd4fca44 Show confirmation when turning on "Phone calls/sms"
Added confirmation dialog, when turning on "Phone calls and sms" setting for
secondary users and guests.

Bug:15761405
Change-Id: I39b2181f0b5460db9a964c6883f053a6c6336622
2015-01-08 11:21:26 -08:00
Marco Nelissen
2c47e6f823 Register USB receiver
This makes USB mode selection work properly, and prevents developer
options from crashing on exit.

Change-Id: I4c822f2694b0d87438827ff0da0d974c93ddbcab
2015-01-08 10:49:46 -08:00
Benjamin Franz
6a0cd973d8 am d8e53f27: Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev automerge: ceee535
automerge: cc18d73

* commit 'cc18d7393bfcd11a668623f6a322243dc733fdc8':
  Block BluetoothPermissionRequest notification on managed profiles.
2015-01-08 17:54:29 +00:00
Benjamin Franz
cc18d7393b am d8e53f27: Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev automerge: ceee535
* commit 'd8e53f271f1aa90f92d239f48120ffc6c5b87055':
  Block BluetoothPermissionRequest notification on managed profiles.
2015-01-08 17:49:11 +00:00
Benjamin Franz
ceee535c65 Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev 2015-01-08 17:40:09 +00:00
Alexandra Gherghina
fa7dacb157 Fix width of app notifications detail screen
Bug: 17137945
Change-Id: I52056f6ff217b695a21b096145b13b6b687e124c
2015-01-08 10:36:17 +00:00
Adrian Roos
f788718f21 Purge biometric weak from internal code
Bug: 18931518
Change-Id: I5da41908b1d6895a69f981e139f2d268327fafcd
2015-01-07 20:52:09 +01:00
Andres Morales
c2fb78627f am dfb448d2: am f58a646b: am f11feccf: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev
* commit 'dfb448d23ec666f9fdbb1ee44ccaef12ea98a80c':
  Don't display Write NFC option if no NFC
2015-01-07 16:37:55 +00:00