PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,528 Commits 1 Branch 0 Tags
aa0b0b19e9cd0ecb49f74b4987b48ddb42d37982
Commit Graph

4587 Commits

Author SHA1 Message Date
Eric Laurent
62143dab23 am 899e4f27: Merge "Display vibrate icon in volume menu" into jb-mr2-dev 
* commit '899e4f27f1866acee29c67e6f19b50308a3b12c3':
  Display vibrate icon in volume menu
 2013-03-28 15:32:55 -07:00
Eric Laurent
899e4f27f1 Merge "Display vibrate icon in volume menu" into jb-mr2-dev 2013-03-28 22:27:45 +00:00
Kenny Root
b9d0a35ea1 am a8645309: am 0d52fc18: am 9dc478ec: Merge "Add ability to install credentials as other UID" 
* commit 'a86453096979d027d65390f657568c945fea1b3d':
  Add ability to install credentials as other UID
 2013-03-28 14:36:37 -07:00
Kenny Root
a864530969 am 0d52fc18: am 9dc478ec: Merge "Add ability to install credentials as other UID" 
* commit '0d52fc184defef46378e7ba095091c7bab1ee459':
  Add ability to install credentials as other UID
 2013-03-28 14:32:50 -07:00
Maggie Benthall
38fa64a7a5 am 02e8ca3e: Merge "Respect user restrictions about adding/removing accounts, sideloading" into jb-mr2-dev 
* commit '02e8ca3e9ad966bd523241aaa1eecf58865027a8':
  Respect user restrictions about adding/removing accounts, sideloading
 2013-03-28 12:20:07 -07:00
Maggie Benthall
02e8ca3e9a Merge "Respect user restrictions about adding/removing accounts, sideloading" into jb-mr2-dev 2013-03-28 19:17:14 +00:00
Kenny Root
7422474c72 Add ability to install credentials as other UID 
We need the ability to install from the system UID to wifi UID
to explicitly bind WiFi credentials to the WiFi profile. This adds the
ability for Wifi Settings to invoke installation of a PKCS12 file for
the wifi UID.

Bug: 8183258
Change-Id: I357c4387baf7e2f6fd6acc9046d9e6b52fdd4bb0
 2013-03-28 11:35:24 -07:00
Maggie Benthall
0c5a401a58 Respect user restrictions about adding/removing accounts, sideloading 
Hide or disable options in the settings app when the user is restricted from
making changes.

Remove "Add account" button from Settings menu, and "remove account" option from menu in AccountSyncSettings.
Remove sideloading checkbox in SecuritySettings.

Also handle replacement of UserManager.isShareLocationToggleAllowed() with hasUserRestriction, which takes a restriction key string.

Change-Id: I34c74fd5aed8956ba00f92e3d3c657b608454dfe
 2013-03-27 18:12:44 -04:00
Amith Yamasani
07aa7b8e18 am 0fb0d016: Merge "Split User settings into limited and trusted." into jb-mr2-dev 
* commit '0fb0d016dd51b0d8b882d92de58f5c2ea28a9208':
  Split User settings into limited and trusted.
 2013-03-27 12:36:52 -07:00
Amith Yamasani
0fb0d016dd Merge "Split User settings into limited and trusted." into jb-mr2-dev 2013-03-27 19:30:55 +00:00
Amith Yamasani
864e3b7c51 Split User settings into limited and trusted. 
Also show avatars with the circular frame like on lockscreen.

Change-Id: I032d842555b2f50a07166460f9cfb1963366dbb1
 2013-03-27 12:27:01 -07:00
Irfan Sheriff
1e1baa824b am 05d67f62: Merge "Allow wildcard for bypass proxy" into jb-mr2-dev 
* commit '05d67f62b7370b3bbe3bf691ae01b8a46dd04606':
  Allow wildcard for bypass proxy
 2013-03-26 15:44:43 -07:00
Irfan Sheriff
05d67f62b7 Merge "Allow wildcard for bypass proxy" into jb-mr2-dev 2013-03-26 22:41:17 +00:00
Amith Yamasani
f1c9b70801 am 86ecd3c4: Merge "Device Admin Settings changes for Device Owner" into jb-mr2-dev 
* commit '86ecd3c437be3478ee17347df46ae53af0eef5ba':
  Device Admin Settings changes for Device Owner
 2013-03-26 15:31:35 -07:00
Amith Yamasani
86ecd3c437 Merge "Device Admin Settings changes for Device Owner" into jb-mr2-dev 2013-03-26 22:27:29 +00:00
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