Commit Graph

4672 Commits

Author SHA1 Message Date
Irfan Sheriff
b7cb3744da Allow wildcard for bypass proxy
Allow *.example.com to be bypassed

Bug: 7422561
Change-Id: Ia7bd2d5b0a19794ae3bcccb8d6b78aeb2ba9c5fb
2013-03-26 15:08:52 -07:00
Irfan Sheriff
54d4aefe0f am 61c30fe2: Merge "Fix monkey crash" into jb-mr2-dev
* commit '61c30fe2d14573378321d3a8df21ffb14a54e43b':
  Fix monkey crash
2013-03-26 14:26:06 -07:00
Irfan Sheriff
61c30fe2d1 Merge "Fix monkey crash" into jb-mr2-dev 2013-03-26 21:17:55 +00:00
Irfan Sheriff
ca8e9cd383 Fix monkey crash
Bug: 8011964
Change-Id: Idafdb7b3bc22d3280e0aa93877b7e09a23270149
2013-03-26 14:11:36 -07:00
Amith Yamasani
f3f7c1dfb7 Device Admin Settings changes for Device Owner
Disable the list entry for an active device owner, as it can't be deactivated.

Change-Id: I833561f91ae60dff8226f9118c9e3b012e5e194f
2013-03-26 13:07:25 -07:00
Johan Redestig
910b2116b0 Fix NullPointerException at RunningState
getServiceInfo returns null if you have a service defined in the
manifest as: <service android:name=".Xxx" android:exported="false" />
or and in an <application> with no label or icon.
Dont crash the Settings application because of that.

Change-Id: I6f9f69c130e610b7e4ab66426177b7bade1e1515
2013-03-26 07:59:14 +01:00
Eric Laurent
2c2bf97dd4 Display vibrate icon in volume menu
When a tablet is in vibrate mode, the notification
volume icon in the volume menu should be vibrate
and not silent.

Bug 7235006

Change-Id: I460a579a7796f8fb2cac8ff581a98f23e57d1bb0
2013-03-25 18:43:39 -07:00
Jeff Sharkey
551dd1f8ae am c64fad39: Merge "Fix Data Usage restrict logic, scrolling." into jb-mr2-dev
* commit 'c64fad3917c7dc421cf541a1d5fb11ab77b24ca0':
  Fix Data Usage restrict logic, scrolling.
2013-03-25 23:19:57 +00:00
Jeff Sharkey
c64fad3917 Merge "Fix Data Usage restrict logic, scrolling." into jb-mr2-dev 2013-03-25 23:13:22 +00:00
Jeff Sharkey
92b518c9aa Fix Data Usage restrict logic, scrolling.
Bug: 8141491
Change-Id: I4e94666c59d91fb112477781ab340fd25d03de27
2013-03-25 16:13:00 -07:00
Jeff Sharkey
1c2d34f2f8 am 8111e3d7: Merge "Read NumberPicker value after finishing edit." into jb-mr2-dev
* commit '8111e3d734b35588377cfcce412c7cdcb0da8aec':
  Read NumberPicker value after finishing edit.
2013-03-25 22:18:47 +00:00
Jeff Sharkey
d277de911d Read NumberPicker value after finishing edit.
Bug: 6881204
Change-Id: I736c9205b69914353f88028a3794db6cd43c4c74
2013-03-25 15:11:25 -07:00
Eric Laurent
45cfac3e10 am 18e688bd: Merge "Do not display volume settings if volume is fixed" into jb-mr2-dev
* commit '18e688bdd27b2e8821ec08c6775a0b0dae1b9f71':
  Do not display volume settings if volume is fixed
2013-03-25 17:16:28 +00:00
Eric Laurent
18e688bdd2 Merge "Do not display volume settings if volume is fixed" into jb-mr2-dev 2013-03-25 17:09:49 +00:00
Eric Laurent
296d9bb612 Do not display volume settings if volume is fixed
When the configuration option config_useFixedVolume is true
indicating that stream volumes cannot be modified, the volume
settings submenu is not available.

Bug 8161458

Change-Id: I6d76a2f85c642778ae8c4caa7347b50f659c1def
2013-03-21 17:40:20 -07:00
Irfan Sheriff
b3f78d9972 am 871bbbd0: Merge "Notify user that scans are still active" into jb-mr2-dev
* commit '871bbbd0d64bab970f7fba228af2779c1fcbcc46':
  Notify user that scans are still active
2013-03-22 00:19:51 +00:00
Irfan Sheriff
871bbbd0d6 Merge "Notify user that scans are still active" into jb-mr2-dev 2013-03-22 00:15:13 +00:00
Irfan Sheriff
d3863aa664 Notify user that scans are still active
Bug: 8141918
Change-Id: I115ce2ac57125b8ffbb34245dc25effd4b3bebb0
2013-03-21 17:09:43 -07:00
Daniel Sandler
da8690558b am 05f9c75a: Merge "Add some extra info to the notification list rows." into jb-mr2-dev
* commit '05f9c75a7b9793f5a712029aad365926aaddf4a8':
  Add some extra info to the notification list rows.
2013-03-21 22:06:41 +00:00
Daniel Sandler
9aee0b475f am 158d57a5: Merge "Optimizations in the notification list:" into jb-mr2-dev
* commit '158d57a5d1820cd1c4479ab71da55c8840a964e1':
  Optimizations in the notification list:
2013-03-21 22:06:40 +00:00
Daniel Sandler
d744a53acf am 76c4a1bf: Merge "Keep up with INotificationListener changes." into jb-mr2-dev
* commit '76c4a1bf7c1f8e2b895bd99aa4815954e9e9bc16':
  Keep up with INotificationListener changes.
2013-03-21 22:06:40 +00:00
Daniel Sandler
05f9c75a7b Merge "Add some extra info to the notification list rows." into jb-mr2-dev 2013-03-21 22:02:43 +00:00
Daniel Sandler
158d57a5d1 Merge "Optimizations in the notification list:" into jb-mr2-dev 2013-03-21 22:02:36 +00:00
Daniel Sandler
76c4a1bf7c Merge "Keep up with INotificationListener changes." into jb-mr2-dev 2013-03-21 22:02:21 +00:00
Amith Yamasani
92d125cbb1 am 8cb10bd8: Merge "Application restrictions UI" into jb-mr2-dev
* commit '8cb10bd8fc59ce510ae015e8280f99383cddf9c5':
  Application restrictions UI
2013-03-21 07:40:36 +00:00
Amith Yamasani
8cb10bd8fc Merge "Application restrictions UI" into jb-mr2-dev 2013-03-21 06:14:39 +00:00
Amith Yamasani
233592bb43 Application restrictions UI
Refactored User Settings UI to have two types of users.
Display a list of apps to select.
Edit user restrictions.
Handle saving and updating RestrictionEntry items via
User Manager.

Change-Id: I3ad5aa71d5ef66dffd39e17ba0556f075ac10a0f
2013-03-20 22:23:45 -07:00
Irfan Sheriff
0058373a87 am adab9274: Merge "system activity for scan always available setting" into jb-mr2-dev
* commit 'adab9274c428a445c64cf350d9f1242f21746bdd':
  system activity for scan always available setting
2013-03-20 23:04:43 +00:00
Irfan Sheriff
adab9274c4 Merge "system activity for scan always available setting" into jb-mr2-dev 2013-03-20 23:00:03 +00:00
Irfan Sheriff
50f341dcd9 system activity for scan always available setting
Takes user permission via a dialog to enable scans to be always available.

Bug: 8141918
Change-Id: I1e5e45e514726c2cbfd86e747123e477e00fd7ed
2013-03-20 11:08:15 -07:00
Jeff Sharkey
8380cf569d am 58e18de7: am f8db32d8: am 74fd506b: Merge "Enable Ethernet tab in data usage"
* commit '58e18de7598cdd1fdfb6e302297bd76905a299a5':
  Enable Ethernet tab in data usage
2013-03-20 17:30:55 +00:00
Jeff Sharkey
58e18de759 am f8db32d8: am 74fd506b: Merge "Enable Ethernet tab in data usage"
* commit 'f8db32d8af46d1cb1a10cf9d49dde7ecd4ce507d':
  Enable Ethernet tab in data usage
2013-03-20 10:23:33 -07:00
Jaewan Kim
ffce9c1e9a Enable Ethernet tab in data usage
mStateSession is not initialized at the time hasEthernet is called to
set mShowEthernet, so Ethernet tab is not shown at the startup.
In this case, if the device doesn't support mobile network, user cannot
even select it from the context menu.

Bug: 8365419
Change-Id: I441971f18346c34a3adf3f18d9355075d9dce3f0
2013-03-20 11:22:30 +09:00
Russell Brenner
f76bc8b0b7 am 9f5b4919: Merge "Enable Back during setup wizard" into jb-mr2-dev
* commit '9f5b49192d281eb24cbe4e12d989857e9e195b03':
  Enable Back during setup wizard
2013-03-19 21:13:22 +00:00
Russell Brenner
9f5b49192d Merge "Enable Back during setup wizard" into jb-mr2-dev 2013-03-19 21:09:00 +00:00
Russell Brenner
eca454ebc2 Enable Back during setup wizard
Aside from enabling the system back button, updated the result codes
to distinguish back (RESULT_CANCEL) from skip (RESULT_SKIP).

This CL should have been uploaded along with http://ag/284254,
which has already been merged.

Bug: 6477759
Bug: 8409375
Change-Id: I031acda1d675ee79a3166a51073113093211709d
2013-03-19 14:03:11 -07:00
Daniel Sandler
95860491fe Add some extra info to the notification list rows.
Change-Id: Ie6ad130bd0e6daf8562c477f0297ba914d3f22d1
2013-03-19 00:12:41 -04:00
Daniel Sandler
738b8715ab Optimizations in the notification list:
- sort notifications by timestamp
	- deal with notification bursts better by waiting to
	  refresh the list until things settle down

Change-Id: Ie41051afcb0a7a917f2a97a3311628b34626c125
2013-03-19 00:12:41 -04:00
Daniel Sandler
e16dcfb16a Keep up with INotificationListener changes.
Requires change Ia69f2ba0 in f/b.

Change-Id: I4a8f719150651bbf94c48ef83fcad2f82db9582b
2013-03-18 23:06:05 -04:00
Jeff Sharkey
0994e8708e am e6890387: Merge "Allow disabling both MTP and PTP." into jb-mr2-dev
* commit 'e6890387dfde592bee4462c3da48d73e35e71a39':
  Allow disabling both MTP and PTP.
2013-03-18 22:53:11 +00:00
Jeff Sharkey
e6890387df Merge "Allow disabling both MTP and PTP." into jb-mr2-dev 2013-03-18 22:48:35 +00:00
Jeff Sharkey
cfd328b64f Allow disabling both MTP and PTP.
Require that MTP and PTP are mutually exclusive when enabled, but
allow them to be both disabled.  Users can enable them again under
Storage menu item in Settings.

Bug: 6518257
Change-Id: I43419fa619ce2c62dd5e8c14d6c645d24fd8943a
2013-03-18 15:46:35 -07:00
Todd Poynor
691b1aac40 am ff36b739: Merge "battery history details: update status bars on any change" into jb-mr2-dev
* commit 'ff36b73986439551ee4de4b4f00fdd987a734989':
  battery history details: update status bars on any change
2013-03-18 20:48:51 +00:00
Todd Poynor
ff36b73986 Merge "battery history details: update status bars on any change" into jb-mr2-dev 2013-03-18 20:39:40 +00:00
Todd Poynor
56247a63fc battery history details: update status bars on any change
Don't apply the "X axis (time) still within previous pixel" optimization
to the status bars below the battery level graph.  Keep the path cursor
position and previous state variables up-to-date in this case.

Bug: 8132455
Change-Id: I09390256e3e71d34813de655a1d01ec054ee778a
2013-03-18 12:30:44 -07:00
Robert Greenwalt
8c34c11b81 am 3c8a4c3b: am cd1c38cf: am ae9ebfd1: Merge "add MVNO field for APN Editor"
* commit '3c8a4c3b5939bb9134900266c12f67e33919675e':
  add MVNO field for APN Editor
2013-03-17 16:38:54 +00:00
Robert Greenwalt
3c8a4c3b59 am cd1c38cf: am ae9ebfd1: Merge "add MVNO field for APN Editor"
* commit 'cd1c38cf23e640d878767e189e10dbf26b6a0141':
  add MVNO field for APN Editor
2013-03-17 09:31:04 -07:00
Robert Greenwalt
ae9ebfd153 Merge "add MVNO field for APN Editor" 2013-03-16 00:55:30 +00:00
Irfan Sheriff
595f4e66a1 am 474958fc: Merge "Allow user to change scan always available setting" into jb-mr2-dev
* commit '474958fc670e18347b2135d0ffd118f921ad7ccb':
  Allow user to change scan always available setting
2013-03-14 21:40:00 +00:00
Irfan Sheriff
474958fc67 Merge "Allow user to change scan always available setting" into jb-mr2-dev 2013-03-14 21:32:42 +00:00