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

10286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
49182a26e7 Import translations. DO NOT MERGE 
Change-Id: I4cdb85276f2ff6e50f4978eaad3481a248a52fcb
Auto-generated-cl: translation import
 2013-03-27 10:41:39 -07:00
Baligh Uddin
3ba60dcb8e Import translations. DO NOT MERGE 
Change-Id: I7b83d0e661e36dfe47e342bf9e6086099c4b6be9
Auto-generated-cl: translation import
 2013-03-27 10:38:59 -07:00
Jeff Sharkey
984415cc96 am f7ad8e39: Merge "Fix padding so TextViews are baseline aligned." into jb-mr2-dev 
* commit 'f7ad8e39748087e4e33a511d1c439b72ebd979b9':
  Fix padding so TextViews are baseline aligned.
 2013-03-27 09:51:27 -07:00
Jeff Sharkey
f7ad8e3974 Merge "Fix padding so TextViews are baseline aligned." into jb-mr2-dev 2013-03-27 16:46:33 +00:00
Jeff Sharkey
ca60dc7fcd Fix padding so TextViews are baseline aligned. 
Also removed unused layout.

Change-Id: I1dd69c3766a58d389fb2fadcf04b23210af3d00a
 2013-03-27 09:46:06 -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
8111e3d734 Merge "Read NumberPicker value after finishing edit." into jb-mr2-dev 2013-03-25 22:12:35 +00:00
Jeff Sharkey
d277de911d Read NumberPicker value after finishing edit. 
Bug: 6881204
Change-Id: I736c9205b69914353f88028a3794db6cd43c4c74
 2013-03-25 15:11:25 -07:00
Baligh Uddin
164e73ca4b Merge "Import translations. DO NOT MERGE" 2013-03-25 21:03:39 +00:00
Baligh Uddin
d4693817a8 am a042cbf6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'a042cbf653679af3208905178f58ea5ec035ae1d':
  Import translations. DO NOT MERGE
 2013-03-25 21:02:43 +00:00
Baligh Uddin
a042cbf653 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-25 20:57:42 +00:00
Baligh Uddin
5fec9e5507 Import translations. DO NOT MERGE 
Change-Id: I9a68ce9bb321f72d21f45500427ef6c7c05d3e82
Auto-generated-cl: translation import
 2013-03-25 13:26:38 -07:00
Baligh Uddin
1b51d62a32 Import translations. DO NOT MERGE 
Change-Id: I898d0fd6ce299f2ffb6cc38805baf566e83f501f
Auto-generated-cl: translation import
 2013-03-25 13:22:50 -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
Baligh Uddin
66f552eefd am fd906e28: (-s ours) Import translations. DO NOT MERGE 
* commit 'fd906e28d8c105bf31051228afaa100fb10f3420':
  Import translations. DO NOT MERGE
 2013-03-22 18:54:38 +00:00
Baligh Uddin
9c65b1652e Import translations. DO NOT MERGE 
Change-Id: Ieb6e68acb5825785163fd24b92568c97f3b66851
Auto-generated-cl: translation import
 2013-03-22 11:40:40 -07:00
Baligh Uddin
fd906e28d8 Import translations. DO NOT MERGE 
Change-Id: I2a3ca4e806acc10e961d5720761de5f9e608455a
Auto-generated-cl: translation import
 2013-03-22 11:37:52 -07:00
Irfan Sheriff
4e77e3b7d3 am 358d1825: Fix build 
* commit '358d1825a4f51b9d28b437cbf02df842a56a6d15':
  Fix build
 2013-03-22 00:57:55 +00:00
Irfan Sheriff
358d1825a4 Fix build 
Change-Id: Ic2eacc240e693cb523c9189c7bd62e1bf17fd85c
 2013-03-21 17:49:31 -07: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
Baligh Uddin
431a3a84da am cdd47208: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'cdd47208ad3ff8c0cfa152774c282795d1497d63':
  Import translations. DO NOT MERGE
 2013-03-20 19:55:56 +00:00