Commit Graph

10204 Commits

Author SHA1 Message Date
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
Baligh Uddin
5420f85bee Import translations. DO NOT MERGE
Change-Id: I51826906358134f3ea734f0c35af1dfce10f4530
Auto-generated-cl: translation import
2013-02-19 13:40:48 -08: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
5f80875582 am ff5b96fb: Merge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029
* commit 'ff5b96fb19e3a56a8803547a0c9cd11cfd97746c':
  Use updated enterprise API
  Fix EAP field display for a new network
  Allow only valid EAP configs
  Update enterprise API usage
2013-02-15 16:18:51 -08:00
Irfan Sheriff
ff5b96fb19 Merge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029
* changes:
  Use updated enterprise API
  Fix EAP field display for a new network
  Allow only valid EAP configs
  Update enterprise API usage
2013-02-15 23:42:50 +00: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
Baligh Uddin
215e0cb0c0 Import translations. DO NOT MERGE
Change-Id: I4bb5b296199aa3d33d9e653e2f982e67178c3e7f
Auto-generated-cl: translation import
2013-02-15 14:48:57 -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
bbe409d3ce Merge "KeyStore: stop using state()" 2013-02-14 20:18:11 +00: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
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