Irfan Sheriff
7bb10dbca5
Merge "Use updated enterprise API"
2013-02-12 22:57:14 +00:00
Baligh Uddin
6a5b50a6c3
Merge "Import translations. DO NOT MERGE"
2013-02-12 21:30:38 +00:00
Baligh Uddin
988bb46d8b
Import translations. DO NOT MERGE
...
Change-Id: Iba047f24fc3edbd4c57a5e53c8c6ef6f8acb5c03
Auto-generated-cl: translation import
2013-02-12 12:27:01 -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
Irfan Sheriff
c577427b55
Use updated enterprise API
...
Change-Id: If41fad5fae5864555bb1de3fc99130682b1cdff1
2013-02-12 10:41:13 -08:00
Baligh Uddin
46e1578bfa
Import translations. DO NOT MERGE
...
Change-Id: Ia18ab88594e12fcb1151329b127db50b1102f780
Auto-generated-cl: translation import
2013-02-11 09:12:24 -08:00
Baligh Uddin
f095664f4c
Import translations. DO NOT MERGE
...
Change-Id: If973bc69ae7c28f8353eb8cafb1cf2cc7d86a711
Auto-generated-cl: translation import
2013-02-08 11:03:45 -08:00
Baligh Uddin
e891784434
Merge "Import translations. DO NOT MERGE"
2013-02-08 01:20:04 +00:00
Jeff Sharkey
fa6587d842
Clean up RTL in Wi-Fi details dialog.
...
Bug: 7677078
Change-Id: Ic7652bc7bd0bc24ccacbe1135e763190cc6f12cd
2013-02-07 15:45:29 -08:00
Michael Jurka
7a15c14d5c
Merge "Update theme of ActivityPicker"
2013-02-07 10:09:15 +00: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
Baligh Uddin
5fad6c18cb
Import translations. DO NOT MERGE
...
Change-Id: I90ee946c8575cc443beee288f6ded5a96afc0e55
Auto-generated-cl: translation import
2013-02-06 14:17:49 -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
Irfan Sheriff
414d9e9c69
Merge "P2PSetting:Avoid p2p_find on group removal event"
2013-02-06 18:13:59 +00: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
Irfan Sheriff
203631b24c
Merge "wifiSettings: Updating the networkinfo on supplicant event"
2013-02-06 16:42:45 +00:00
Michael Jurka
167c208ae5
Update theme of ActivityPicker
...
Bug: 7971340
2013-02-06 15:01:53 +01: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
Baligh Uddin
a3e4fc98bd
Merge "Import translations. DO NOT MERGE"
2013-02-05 20:07:34 +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
Baligh Uddin
2095f96afc
Import translations. DO NOT MERGE
...
Change-Id: I6091aef5f86bfdc58cfe83f15e1292e7d86339dd
Auto-generated-cl: translation import
2013-02-04 09:59:27 -08: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
Russell Brenner
6b99860a9a
Merge "Use non-breaking hyphen for "Wi-Fi""
2013-02-01 21:20:29 +00:00
Russell Brenner
6de9905cfc
Use non-breaking hyphen for "Wi-Fi"
...
Strings flagged with 'translatable="false"' have not been altered.
Bug: 6632800
Change-Id: I1676d3fed7d6faec6ab4ec58d851fa976df2c43a
2013-02-01 10:57:49 -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
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
Baligh Uddin
131b6f81f9
Import translations. DO NOT MERGE
...
Change-Id: Ia4458289713f2e9f6c47882d2f2e99d36f6e2aec
Auto-generated-cl: translation import
2013-01-30 10:43:41 -08: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
Svetoslav
53023d6178
Remove "enhance web scripts" from settings.
...
See change Ic125514c34f191aea0416a469e4b3481ab3200b9 for details.
bug:8089372
Change-Id: I47eda16579c29051aa24b8d4c38035439aa00915
2013-01-29 13:57:04 -08:00
Russell Brenner
159def092c
Merge "Revert "Use non-breaking hyphen for "Wi-Fi"""
2013-01-28 19:35:55 +00:00
Russell Brenner
6ffefbfd11
Revert "Use non-breaking hyphen for "Wi-Fi""
...
This reverts commit 6a98b9bf58
Change-Id: Ia4168462988e37f3470c510453c31c73ed63ab7b
2013-01-28 19:33:40 +00:00
Baligh Uddin
c9754065ce
Merge "Revert "Import translations. DO NOT MERGE""
2013-01-28 19:32:20 +00:00
Baligh Uddin
dc02f711a6
Revert "Import translations. DO NOT MERGE"
...
broken build.
This reverts commit 3e93c29207
Change-Id: Ib1f8d64f12add5ffbf1a777d22525fc55e226bc3
2013-01-28 19:32:01 +00:00
Russell Brenner
6a98b9bf58
Use non-breaking hyphen for "Wi-Fi"
...
Bug: 6632800
Change-Id: I5838a16ffce10ae6df4b2b5fd504b43124b6de3e
2013-01-28 10:55:37 -08:00