Commit Graph

4672 Commits

Author SHA1 Message Date
Wink Saville
a7d2fd80c2 Merge "avoid stopping app in case of accessing empty db" 2013-02-20 23:07:59 +00:00
Jeff Sharkey
2f0420be95 Merge "Give Wi-Fi Display settings split actionbar." 2013-02-20 20:36:20 +00:00
Jeff Sharkey
0c3634c97a Give Wi-Fi Display settings split actionbar.
Bug: 8156190
Change-Id: I120398e33cfbbce001a528de04d62cc92fe2f9d9
2013-02-20 12:35:16 -08:00
Michael Wright
e509cba855 Update Settings app to use new brightness dialog
Bug: 7304957
Change-Id: I3894f6fc9ae1aef92bff328006601af518111983
2013-02-20 11:03:38 -08:00
Amith Yamasani
a4a81ff4ce am a5f756c9: Merge "Prevent cursor from causing global reference leaks."
* commit 'a5f756c9e66ee81585ba81d13a8e13f809bdd875':
  Prevent cursor from causing global reference leaks.
2013-02-20 09:17:18 -08:00
Amith Yamasani
a5f756c9e6 Merge "Prevent cursor from causing global reference leaks." 2013-02-20 16:57:51 +00:00
Daniel Sandler
95c73853c9 Merge "Update notification list when notifications are posted." 2013-02-20 14:51:03 +00:00
Amith Yamasani
f6e2f577f3 Merge "Actually use the cache for names and icons." 2013-02-19 18:49:09 +00:00
Amith Yamasani
a521d11796 Actually use the cache for names and icons.
Fixes the flashes in name and icon in Battery usage screen when refreshing.
Bug: 8219466

Some earlier refactoring must have messed up the cache's scope. It will now
avoid reloading name and icon if already present in the cache.

Change-Id: I99c1f14dd53828dcb74cf12c02c47628e2e64d30
2013-02-19 10:40:33 -08:00
Irfan Sheriff
a51d1fb345 Use updated enterprise API
Change-Id: If41fad5fae5864555bb1de3fc99130682b1cdff1
2013-02-15 15:38:21 -08:00
Irfan Sheriff
0e22188088 Fix EAP field display for a new network
We now hide certain EAP fields based on the type chosen. For a
new network, we should set a default and handle this the same
way

Change-Id: I9c8605694ba51bc588a49f711dcf31517ea3f6e4
2013-02-15 15:38:00 -08:00
Irfan Sheriff
ce68912621 Allow only valid EAP configs
We allow configuring all possible EAP fields today even though
some of the configs make no sense and will not result in a
successful connection.

Allow only support configs for various EAP methods

Change-Id: I2e3e8d4d6203acb2eac8cd645df39e1a9ca579ab
2013-02-15 15:37:19 -08:00
Irfan Sheriff
f3a0201202 Update enterprise API usage
Also, remove the unnecessary keystore lock/unlock checks since these
are now controlled at lockscreen

Change-Id: If65c4029d4cf2b8377fbc3512c9f691572125995
2013-02-15 15:36:51 -08:00
Amith Yamasani
07d195ed28 am 1ef6a106: Merge "Fix Settings app crash after enabled multi-user"
* commit '1ef6a106d50f6fce2e2a810075a55bb264fa5c23':
  Fix Settings app crash after enabled multi-user
2013-02-15 10:17:17 -08:00
Amith Yamasani
1ef6a106d5 Merge "Fix Settings app crash after enabled multi-user" 2013-02-15 17:15:41 +00:00
Hyejin Kim
88c80b10a2 avoid stopping app in case of accessing empty db
When accessing empty database, Setting App is stopped, sometimes.
To avoid stopping app, check null for cursor

Change-Id: I71ec067f502d12a9215a9abdbe9e23fc07af17bb
2013-02-16 01:02:30 +09:00
Daniel Sandler
8fd91ae6c9 Update notification list when notifications are posted.
Change-Id: I4b7f1ae117401747d1788a0b009f36388cc2f4eb
2013-02-14 17:06:33 -05:00
Kenny Root
595a891922 resolved conflicts for merge of bbe409d3 to master
Change-Id: I5d64f8d628636f3621b765873aade25eca948576
2013-02-14 13:33:22 -08:00
Kenny Root
ca714d8d0c KeyStore: stop using state()
Change-Id: Ia8fc945666c59c0b9a9bd6f890cc2a6b8859e1d4
2013-02-14 12:06:38 -08:00
Dianne Hackborn
7ff56d331e App ops: new labels, fix crash, fix updating list.
- Add new labels for media ops.
- Fix crash due to missing boolean entry for access notifications op.
- Fix updating op category lists to remain stable (not jump
  back to the top).

Change-Id: I505cfd91b1ff92587a627d33f3ac7a21145a9bbd
2013-02-13 11:02:12 -08:00
Irfan Sheriff
7bb10dbca5 Merge "Use updated enterprise API" 2013-02-12 22:57:14 +00: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
Irfan Sheriff
c577427b55 Use updated enterprise API
Change-Id: If41fad5fae5864555bb1de3fc99130682b1cdff1
2013-02-12 10:41:13 -08:00
Dianne Hackborn
acc495a935 Merge "App ops: add "draw on top" op, improve switch ordering." 2013-02-07 08:09:02 +00:00
Dianne Hackborn
d69e8dc441 App ops: add "draw on top" op, improve switch ordering.
Change-Id: Ibe490305650f986f3ccf1ea25012272287455f59
2013-02-07 00:01:10 -08:00
Irfan Sheriff
bd4e10579b am 5c879e48: am 414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal event"
# By sunil duttu
# Via Android Git Automerger (1) and others
* commit '5c879e48eddfe617125733f2be46854a0266a23b':
  P2PSetting:Avoid p2p_find on group removal event
2013-02-06 11:20:40 -08:00
Irfan Sheriff
5c879e48ed am 414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal event"
# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '414d9e9c6928581d4f91b008c109a6a4630bfaae':
  P2PSetting:Avoid p2p_find on group removal event
2013-02-06 11:16:24 -08:00
Irfan Sheriff
e58d6da635 Merge "Fix EAP field display for a new network" 2013-02-06 19:03:37 +00:00
Irfan Sheriff
d181bb62bc Fix EAP field display for a new network
We now hide certain EAP fields based on the type chosen. For a
new network, we should set a default and handle this the same
way

Change-Id: I9c8605694ba51bc588a49f711dcf31517ea3f6e4
2013-02-06 10:51:13 -08:00
sunil duttu
7c872478eb P2PSetting:Avoid p2p_find on group removal event
Immediately after group termination p2p_find is being issued
from settings and this causing issue whenever user sends
connection request immediately after group_removal_event.

Change-Id: I41e5f520f7d9475d0ec890d40eea172d9d66d06e
2013-02-06 23:18:30 +05:30
Irfan Sheriff
4cd0f1191b am 6639dee4: am 203631b2: Merge "wifiSettings: Updating the networkinfo on supplicant event"
# By sunil duttu
# Via Android Git Automerger (1) and others
* commit '6639dee497304c359141caf9b0452699a6d64aa9':
  wifiSettings: Updating the networkinfo on supplicant event
2013-02-06 09:02:26 -08:00
Irfan Sheriff
6639dee497 am 203631b2: Merge "wifiSettings: Updating the networkinfo on supplicant event"
# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '203631b24cd3947bcba2ab24789e4cfec487eff7':
  wifiSettings: Updating the networkinfo on supplicant event
2013-02-06 08:58:31 -08:00
sunil duttu
f99d52cf71 wifiSettings: Updating the networkinfo on supplicant event
In framework we update the networkId on supplicant state change
these changes in the network info should be reflected in settings.
there by updating the networkinfo.
The problem we are facing without this fix is when we have single
saved AP profile Switching off the AP when we are in connecting
tate resulting in a behavior Where UI keep showing connecting
to that AP instead of showing it as out of range.

Change-Id: I04073b9a4068f4b75216ebfd431adc126583f15c
2013-02-06 12:04:37 +05:30
Dianne Hackborn
2ae050796a Merge "App ops: add modify settings op." 2013-02-06 01:36:47 +00:00
Dianne Hackborn
3b13d2b786 App ops: add modify settings op.
Change-Id: I7aab6c7f565a20fe24156956895a7db20c8d3aaa
2013-02-05 17:31:10 -08:00
Mathias Agopian
a2d9f48153 Merge "fix an issue where sensors power usage wasn't reported properly" 2013-02-06 01:16:09 +00:00
Dianne Hackborn
9833787387 App ops: add UI for SMS ops.
Change-Id: I595df9a286ba5389f9e309516dc4a8ab34773277
2013-02-05 11:57:00 -08:00
Amith Yamasani
82562e2696 Merge "Improve error message to figure out which fragment class is problematic." 2013-02-05 19:15:07 +00:00
Amith Yamasani
258f7c7e1c Improve error message to figure out which fragment class is problematic.
Bug: 8057867
Change-Id: I6ad0bc8c8a6ed9bc8a1cca5debffe15c6de3a1b5
2013-02-05 10:56:55 -08:00
Mathias Agopian
b287ba3e2b fix an issue where sensors power usage wasn't reported properly
the battery service records a sensor's *handle*, but the
PowerUsageSummary code used it as a sensor *type*.

Change-Id: I0d2cbdffc24238d5e02f0d6369fa44ed990176a4
2013-02-04 19:24:46 -08:00
Jaewan Kim
bb0e621f18 Fix Settings app crash after enabled multi-user
Bug: 8128225
Change-Id: I2918a5ec36e861a1ce4b2e67cf7607929732a7bf
2013-02-04 15:36:17 +09:00
Benoit Goby
4ea8937707 Merge "Settings: Add setting to clear adb public keys" 2013-02-02 02:38:48 +00:00
Dianne Hackborn
8b0afc7fb5 App ops: improve presentation.
Change-Id: Ia8702f9421a2cf2e27e8e24bfdc596321ace515a
2013-02-01 17:29:15 -08:00
Dianne Hackborn
27daaab633 App ops: Support neighboring cells, call phone, improve UI.
Change-Id: I0783c7ae941499cf9847bcf657141c3aea76f59d
2013-02-01 15:14:42 -08:00
Daniel Sandler
df3f6d6c47 Migrate package notification controls to AppOps.
We still show the [X] Show Notifications box in
InstalledAppDetails for now, however the information should
be mostly in sync with the AppOps screen. ("Mostly" because
there's no way to register for changes to AppOp modes at
present.)

Change-Id: Ia5cdda26c140aed8ee7329caaeedac04b8cbd8f1
2013-02-01 13:29:52 -05:00
Daniel Sandler
f6ab51cd67 Merge "Fix bugs with null AppOp permissions." 2013-02-01 14:43:39 +00:00
Per Allard
5416d07100 Prevent cursor from causing global reference leaks.
To fix this the ContentQueryMap needs to be closed
when onStop is called so any global references can
be reclaimed.

Change-Id: I0c679c10b0d75ab0aac2fe499563c57d934e318a
2013-02-01 08:09:04 +01:00
Daniel Sandler
7d3a4c160c Fix bugs with null AppOp permissions.
Change-Id: I9f199d4f5843fbba374ced8206902098811b3786
2013-01-31 15:48:56 -05:00
Svetoslav
ce51eb18b3 Merge "Remove "enhance web scripts" from settings." 2013-01-31 03:17:06 +00:00
Dianne Hackborn
596f0cfb46 Improve resetting of application state.
We now reset preferred apps to our defaults, instead of
just clearing everything out.

Change-Id: I70f713ce62b2ffb2d7f6a8e056978847734c27f7
2013-01-29 15:22:22 -08:00