Baligh Uddin
dbf91c105a
Merge commit '0b849a70'
...
Resolve conflict.
Conflicts:
AndroidManifest.xml
2013-08-02 14:51:33 -07:00
Dianne Hackborn
ca1b745824
Completely remove app ops activity.
...
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
2013-08-02 14:35:10 -07:00
Dave Burke
0b849a704b
am 1a32d477: am 136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
...
* commit '1a32d477934399ca5331863fe17651c1dbf165b8':
Revert "Completely remove app ops activity."
2013-08-02 13:42:04 -07:00
Dave Burke
db2c568894
Revert "Completely remove app ops activity."
...
This reverts commit 1ad26e9c37
2013-08-02 20:25:35 +00:00
Baligh Uddin
15885f4998
Merge commit '99d5938c'
...
Resolve conflict per ag/326799
Conflicts:
AndroidManifest.xml
2013-08-01 15:04:30 -07:00
Sascha Prueter
99d5938cf2
am df195650: am d346fce2: Merge "Completely remove app ops activity." into jb-mr2-dev
...
* commit 'df195650191ba2d5a6090ff0721242b044b9b010':
Completely remove app ops activity.
2013-08-01 14:01:13 -07:00
Amith Yamasani
a7fd2a5d66
Merge "Whitelist fragments appropriate for an activity"
2013-08-01 17:18:39 +00:00
Lifu Tang
fc86f69d3b
Implemented RadioButtonPreference
...
Change-Id: I047b6a95f3001b60e7500f85c25d507e1ca1ad0f
2013-07-31 11:07:27 -07:00
Amith Yamasani
a677ee210c
Whitelist fragments appropriate for an activity
...
Change-Id: If4f8c4e9d9949b652946cffe0ebb09b587e5a042
2013-07-30 16:24:58 -07:00
Lifu Tang
83ab7c932e
Moved LocationSettings into location sub-package
...
Change-Id: I55b30df5b6889576539b8cb880e3032f417ddfd7
2013-07-29 12:13:48 -07:00
Amith Yamasani
e5965f4a06
Merge "Permission to manage device admins"
2013-07-24 00:07:03 +00:00
Amith Yamasani
9247265466
Permission to manage device admins
...
Change-Id: I4c3c86cc6c0dba16c51dc45f62e1213ad5be5df0
2013-07-19 12:37:42 -07:00
Alan Viverette
341ff66e03
Move accessibility settings to their own package
...
Change-Id: I5822bf4a81f5ade4ee0649ed30c2daa40d7e8fe2
2013-07-18 17:49:33 -07:00
Brian Carlstrom
f32ba13a76
Add developer option for switching between Dalvik and ART
...
Change-Id: Ia5a8649e52b607b31429fca258a8fdf62217426c
2013-07-10 09:49:07 -07:00
Dianne Hackborn
1ad26e9c37
Completely remove app ops activity.
...
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
2013-07-01 12:54:54 -07:00
Satoshi Kataoka
71c915b672
Show subtype locales in the personal dictionary
...
...and change the destination of the intent
Bug: 9117704
Bug: 8856930
Change-Id: I39e55d2c5ca9a602f9a586625dcf25d5fb065a0a
2013-06-20 19:28:34 +09:00
Amith Yamasani
03a9fb6723
am 29294d84: am f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev
...
* commit '29294d8408c3a754ea118160d29931e5646a5e1a':
Don't show ApnEditor as a dialog
2013-06-07 14:57:38 -07:00
Amith Yamasani
29294d8408
am f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev
...
* commit 'f3e827e83da8d6aa70850c85bbe87d2f9feb82b1':
Don't show ApnEditor as a dialog
2013-06-07 14:55:09 -07:00
Amith Yamasani
34bd7e68db
Don't show ApnEditor as a dialog
...
Else it would be missing the menu buttons.
Bug: 7328535
Change-Id: I8e30eec0b3d23dadd9ab6f1efbaa185fe1b6b431
2013-06-07 10:19:55 -07:00
Amith Yamasani
52d8db7fb2
am 966c2d3f: am b514a95c: am 4abe488a: Merge "No back icon in action bar of APN Settings"
...
* commit '966c2d3fc61a1fed5c5e587c6ef29b2b68d01372':
No back icon in action bar of APN Settings
2013-05-20 18:26:12 -07:00
Amith Yamasani
b514a95ce7
am 4abe488a: Merge "No back icon in action bar of APN Settings"
...
* commit '4abe488a5f18d04513b294dce1f7f63d0c9cf3a0':
No back icon in action bar of APN Settings
2013-05-20 18:16:42 -07:00
smitha.x.smitha
0a20f2e5a2
No back icon in action bar of APN Settings
...
When entering the APN menu, the actionbar is missing a back
icon allowing the user to go back to the previous pane.
Added parentActivityName in ApnSettings, to enable action
bar back icon.
Change-Id: Iee8bb420f47c0e2c0d9a43739f534466abba30db
2013-05-20 09:55:09 +02:00
Robert Greenwalt
39da2f9129
am b2dccc41: am d5d61a0a: Merge "Remove wifi scan-always dialog." into jb-mr2-dev
...
* commit 'b2dccc418410cd2c35213fddb5da7dce1d91c47b':
Remove wifi scan-always dialog.
2013-05-13 14:15:41 -07:00
Robert Greenwalt
7e59f73e9c
Remove wifi scan-always dialog.
...
When wifi is switched off we no longer want a notification dialog
about scan-always, instead using in-panel text.
bug:8907190
Change-Id: I707f306a056068d92f69070873f1e6330b598b1e
2013-05-13 11:39:08 -07:00
Dianne Hackborn
6e91babeda
Update UI to add new audio app ops.
...
Change-Id: I307d25bdd6bee2e7d7a9df32849ef206abaf2318
2013-05-06 16:13:34 -07:00
Satoshi Kataoka
5df3307309
Fix the title of the fragments of the personal dictionary settings
...
Bug: 8600958
Change-Id: I9b8bab21b144385bc2386e7fcb67e1c197f84113
2013-04-30 16:08:00 +09:00
Jake Hamby
5e9bd86bc6
Add support to display regulatory info from *#07#.
...
Add a new action and Activity so the phone dialer can display
regulatory info via "*#07#".
Regulatory info is supplied per device by a Settings app resource
overlay. This overlay must set the boolean resource
"config_show_regulatory_info" to true, and provide either a drawable
named "regulatory_info.png" with the info in graphical form, or a
string resource named "regulatory_info_text" containing the required
information in HTML format.
Bug: 8259869
Change-Id: I73c1431a1a6d1736f9d3e4bd5be7e3771c85cbcb
2013-04-23 13:06:54 -07:00
Matthew Xie
89d44ec66c
Change SettingsAppWidgetProvider export to be false
...
This will protect settings from external broadcaster.
bug 7961958
Change-Id: Id6d0bf83ef19f2b5c2641231cba2dc65a1492797
2013-04-18 23:43:42 -07:00
Dianne Hackborn
5125862bf7
Fix issue #8647812 : Hide app ops choice from settings shortcut
...
Change-Id: Ifa26a70f4614d3530cc27b360df2b6d5f03b28e3
2013-04-18 15:07:19 -07:00
Amith Yamasani
cc395695fc
Embed the app restrictions fragment in the dual-pane settings.
...
Change the limited user creation flow to show the usual message before
actually adding the user. Might need to customize the message for limited
users.
Removed the old activity wrapper and moved the logic to UserSettings.
Removed the finish button.
Bug: 8566751
Change-Id: Ie9e1a03736c41758b0bb6e79d004ad662a5af7f4
2013-04-11 18:21:07 -07:00
Daniel Sandler
79b9bfe56e
Notification listeners can be enabled in Settings>Security.
...
Also known as android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS.
Bug: 8454150
Change-Id: I0c2433bf58ba4c78cd461326bd014535c7f67578
2013-04-05 19:57:03 +00:00
Amith Yamasani
2601cd9142
Implement proper settings restrictions
...
Settings restrictions for limited users translate to user
restrictions specified in UserManager. Added required strings.
TODO: Add NFC restriction.
Change-Id: If1f81319131855f5dc1b27fe5bd54a4fef616d7f
2013-03-31 18:20:36 -07:00
Irfan Sheriff
0f41b49d1f
Add install support for WIFI UID
...
Bug: 8472221
Change-Id: If203760fc960b4d8987d745e49ef1d4355c45adf
2013-03-29 11:40:16 -07:00
Irfan Sheriff
d3863aa664
Notify user that scans are still active
...
Bug: 8141918
Change-Id: I115ce2ac57125b8ffbb34245dc25effd4b3bebb0
2013-03-21 17:09:43 -07: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
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
0c3634c97a
Give Wi-Fi Display settings split actionbar.
...
Bug: 8156190
2013-02-20 12:35:16 -08:00
Daniel Sandler
328e2d2666
Show the user's list of notifications in Settings.
...
Requires new APIs in change I41338230 and change Icce8d6f9
from frameworks/base.
Change-Id: I21b645bdc265b477453f9b177f6776e2c58bd323
2013-02-12 14:33:04 -05:00
Michael Jurka
167c208ae5
Update theme of ActivityPicker
...
Bug: 7971340
2013-02-06 15:01:53 +01:00
Dianne Hackborn
a522a8ef82
Quick and dirty UI for viewing app op information.
...
Change-Id: If17bfbe84cf438ca9bb37bf446564f39de99cee1
2013-01-15 19:20:19 -08:00
Jeff Sharkey
cc0d26bb14
Invert split action bar logic.
...
The majority of Settings activities don't want split action bars, so
invert the logic to be opt-in instead of opt-out.
Bug: 7545845
Change-Id: I794f6df911dda61904e02a0f6b917ab92c846293
2013-01-11 11:16:31 -08:00
Danielle Millett
495626818d
Merge "Removing tutorial for choosing a pattern as part of b/7459863" into jb-mr1.1-dev
2012-11-30 18:26:58 -08:00
Daniel Sandler
77ec6de156
Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev
2012-11-30 10:58:04 -08:00
Jeff Sharkey
c2b43dbee8
Avoid split action bar when it only has one item. DO NOT MERGE.
...
Bug: 7632944
Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988
2012-11-29 14:50:02 -08:00
Daniel Sandler
7dee75c424
Add android.settings.DREAM_SETTINGS for Daydream settings.
...
Bug: 7480927
Change-Id: I5777f7c4aec9ad7d7eb9f7eeb882d2342cb481c3
2012-11-27 22:41:30 -05:00
Danielle Millett
12c1451f1f
Removing tutorial for choosing a pattern as part of b/7459863
...
Removing the tutorial that is shown the first time a user sets up
a pattern as their lock type.
Change-Id: If73c936e41458af729740fe5b178b9452c7dd2c0
2012-11-21 15:44:16 -05:00
Amith Yamasani
5f05010438
Use AlarmManager calls to set date/time, instead of SystemClock.setTime
...
This way secondary users' settings app can request the system server to
set the time. Alarm driver cannot be opened as a secondary user.
Bug: 7459635
Change-Id: I1ae1630dc448021d35280a297c5d9960f8e8fc2e
2012-11-15 14:44:41 -08:00
Michael Jurka
0b2bd8d11d
New widget picker for keyguard widgets
...
New layout for widget picker is still not up to
final design, but this change prepares all the
backend work
Also, remove use of features filter from the
picker, since this is being removed from the API
Change-Id: I9b332e22cf34b98c20c720602c920d28aed01d6c
2012-10-31 16:46:24 -07:00
Amith Yamasani
21c2904ba3
Revert "Show warning dialog in a multiuser system when adding a new account."
...
This reverts commit eb71f26897
2012-10-05 19:56:18 -07:00
