Commit Graph

11810 Commits

Author SHA1 Message Date
Ivan Kovac
14c81b48f7 Wrong referring to the resource - id/android:id
We were referring to the resource defined as
@+android:id with R.id. which is wrong. This
fix changes the @+android:id/ to @+id/

Change-Id: Ifdca7347bff31311c9c07aecdb110946e4a239ed
2013-11-26 12:42:24 +01:00
Lorenzo Colitti
540d26e844 Merge "Dynamically update connectivity and IP address." 2013-11-26 01:07:25 +00:00
Lorenzo Colitti
20ab234f3d Merge "Cache preferences and services in status dialog." 2013-11-26 01:06:38 +00:00
Lorenzo Colitti
5448b25481 Dynamically update connectivity and IP address.
The settings status page dynamically updates mobile network
status (in/out of service, signal strength, network type, etc.)
but not IP address and connectivity information. Dynamically
update that information as well, for consistency.

For consistency, also update the advanced wifi settings page.

[Cherry-pick of deb8f08ace]

Bug: 10232006
Change-Id: I3a292d8bd9e36ab16c37e107eefff4b37d884a4c
2013-11-25 17:34:45 +09:00
Lorenzo Colitti
b088c8a7c7 Cache preferences and services in status dialog.
Currently, the status dialog fetches the preferences and system
services that it uses to display connectivity information (e.g.,
IP and MAC addresses) only when the dialog is first opened. This
is fine because the connectivity information is only filled in
once and never updated.

In order to have this information update dynamically (like the
rest of the dialog), fetch and cache these objects in onCreate.
The next change will actually make this information update on
network changes.

[Cherry-pick of 6eb6a90821]

Bug: 10232006
Change-Id: Ib4072674543e517cf6935e3e03f35090e728090a
2013-11-25 17:34:08 +09:00
The Android Open Source Project
ca99cb71ea Merge commit 'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e' into HEAD 2013-11-22 10:35:36 -08:00
Elliott Hughes
98f5e1861d am c3a6cd6e: Merge "Move a line into try block"
* commit 'c3a6cd6ee531c81f776551caa40b63732115e971':
  Move a line into try block
2013-11-05 10:30:01 -08:00
Elliott Hughes
c3a6cd6ee5 Merge "Move a line into try block" 2013-11-05 16:48:47 +00:00
Shuhrat Dehkanov
7e77699895 Move a line into try block
Currently, NumberFormatException is never handled as
Integer.parseInt() is called outside try block.
This moves that line inside try block.

Change-Id: I54544f5a665ca0f821de5351001755cb965078dc
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>
2013-11-01 17:39:44 +09:00
Ed Heyl
bc6aa63a1a am 5af7e568: am 67390aad: merge in klp-release (no-op)
* commit '5af7e568115097a6759f6bfc11620690944381c8':
  updated launcher settings icon to gray gear
  Load account type icons in a background thread before scrolling down
  Updated de-blued backgrounds for settings power widget.
  Add print job settings screen.
2013-10-16 17:56:40 -07:00
Ed Heyl
5af7e56811 am 67390aad: merge in klp-release (no-op)
* commit '67390aad4f8a091dc14ea825ede292f8a52efb47':
  updated launcher settings icon to gray gear
  Load account type icons in a background thread before scrolling down
  Updated de-blued backgrounds for settings power widget.
  Add print job settings screen.
2013-10-16 17:52:06 -07:00
Ed Heyl
67390aad4f merge in klp-release (no-op) 2013-10-16 17:46:24 -07:00
Christopher Tate
06c0a90d78 am a31d8b71: am 235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE
* commit 'a31d8b7194793a2ef01f36bd07d70043762de02e':
  User ID, not uid, in an EXTRA_USER_HANDLE
2013-10-16 13:43:46 -07:00
Christopher Tate
a31d8b7194 am 235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE
* commit '235e5d686fc73cfd82605bac86dcc9673916c5b7':
  User ID, not uid, in an EXTRA_USER_HANDLE
2013-10-16 13:41:43 -07:00
Christopher Tate
235e5d686f User ID, not uid, in an EXTRA_USER_HANDLE
Bug 11208808

Change-Id: Ica30c2114c922fc38460cafc14c02f10051717c9
2013-10-16 13:27:27 -07:00
The Android Automerger
89f46886e4 merge in klp-release history after reset to klp-dev 2013-10-15 06:01:17 -07:00
Torne (Richard Coles)
67e72aa49e am 9880646e: am f88e5442: Merge "Remove experimental WebView setting." into klp-dev
* commit '9880646e197331b99ba9824b7d47f12391c82bf4':
  Remove experimental WebView setting.
2013-10-15 03:37:07 -07:00
Torne (Richard Coles)
9880646e19 am f88e5442: Merge "Remove experimental WebView setting." into klp-dev
* commit 'f88e5442f5d2492d415864d1cd118d610b0005d0':
  Remove experimental WebView setting.
2013-10-15 03:34:15 -07:00
Torne (Richard Coles)
f88e5442f5 Merge "Remove experimental WebView setting." into klp-dev 2013-10-15 10:31:46 +00:00
Baligh Uddin
81d0f1b93c am 9f9a9652: (-s ours) am 740702ce: (-s ours) Import translations. DO NOT MERGE
* commit '9f9a9652099204c2e15f1c1660e6886162932943':
  Import translations. DO NOT MERGE
2013-10-14 19:01:01 -07:00
Baligh Uddin
9f9a965209 am 740702ce: (-s ours) Import translations. DO NOT MERGE
* commit '740702ced3d69f3c0b8208ace86e88e4a76ccba0':
  Import translations. DO NOT MERGE
2013-10-14 17:19:28 -07:00
Baligh Uddin
740702ced3 Import translations. DO NOT MERGE
Change-Id: I53c3eb76acc7cfd73101c70e2db66f66da45e8c3
Auto-generated-cl: translation import
2013-10-14 15:24:56 -07:00
Torne (Richard Coles)
0bf324c628 Remove experimental WebView setting.
The experimental WebView is no longer experimental; remove the setting
from the settings app.

Bug: 10427705
Change-Id: Iaad17b132f21cad3d32ee5800a9274863962cc87
2013-10-14 17:35:43 +01:00
The Android Automerger
9ece30cb75 merge in klp-release history after reset to klp-dev 2013-10-13 06:02:42 -07:00
Baligh Uddin
ce4a93f3f4 am fea253e0: (-s ours) am 37473121: (-s ours) Import translations. DO NOT MERGE
* commit 'fea253e00a835ed876211dba9d0f37edc9f162e9':
  Import translations. DO NOT MERGE
2013-10-12 06:46:01 -07:00
Baligh Uddin
fea253e00a am 37473121: (-s ours) Import translations. DO NOT MERGE
* commit '37473121937ad62b616e849e21954cf39583e465':
  Import translations. DO NOT MERGE
2013-10-12 06:43:48 -07:00
Baligh Uddin
3747312193 Import translations. DO NOT MERGE
Change-Id: Ib4e08a38decb3b697e53959546b74baaf0836211
Auto-generated-cl: translation import
2013-10-12 00:56:01 -07:00
Baligh Uddin
d7e8a7f813 am 84c377f5: (-s ours) am 9c861f80: (-s ours) Import translations. DO NOT MERGE
* commit '84c377f51a0995b2f70028df12abb9f98c44e915':
  Import translations. DO NOT MERGE
2013-10-11 15:03:27 -07:00
Baligh Uddin
7508ef29dc am 8dd824b6: (-s ours) Import translations. DO NOT MERGE
* commit '8dd824b60b9345df7409bbd35e1b9ff7b3b051e6':
  Import translations. DO NOT MERGE
2013-10-11 15:03:26 -07:00
Baligh Uddin
84c377f51a am 9c861f80: (-s ours) Import translations. DO NOT MERGE
* commit '9c861f80a2f87d007c7bce7493a154d33702f785':
  Import translations. DO NOT MERGE
2013-10-11 15:01:27 -07:00
Baligh Uddin
8dd824b60b Import translations. DO NOT MERGE
Change-Id: Iab8ff1d8541b26f8bc44905b98dd847ca4faa870
Auto-generated-cl: translation import
2013-10-11 14:51:44 -07:00
Baligh Uddin
9c861f80a2 Import translations. DO NOT MERGE
Change-Id: Id47b239bd151fd77314c38caf065c8f0d24ed62b
Auto-generated-cl: translation import
2013-10-11 14:47:56 -07:00
Zhihai Xu
c326942dfd am cf71c2d3: am 83936d96: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
* commit 'cf71c2d3e31375fa68fd65f1ec39fcce62a4b4c3':
  BT keeps on asking me if I want to allow car to do stuff
2013-10-11 14:10:13 -07:00
Zhihai Xu
cf71c2d3e3 am 83936d96: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
* commit '83936d967d0e880401843161feda649c5bd96bc1':
  BT keeps on asking me if I want to allow car to do stuff
2013-10-11 14:06:13 -07:00
Zhihai Xu
83936d967d Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev 2013-10-11 21:02:51 +00:00
Dianne Hackborn
47be2e84d0 am 4f00b368: am b1e33884: Allow tapping on memory status regions to filter proc stats.
* commit '4f00b368f9fcc27d43dfc63c3ac9d6fedf8a070d':
  Allow tapping on memory status regions to filter proc stats.
2013-10-11 12:50:07 -07:00
Zhihai Xu
9998639a65 BT keeps on asking me if I want to allow car to do stuff
We can remember it as a non persist global value when user click no.
This value won't be saved when power down.
We will restore the permission choice
when we are disconnected with the remote device.
So the "no" choice selected by user will only take effect
until we are disconnected with the remote device.

bug:11176511
Change-Id: Ic0c0829587cf7a812b5fa96fbd381921f67c186f
2013-10-11 12:15:19 -07:00
Dianne Hackborn
4f00b368f9 am b1e33884: Allow tapping on memory status regions to filter proc stats.
* commit 'b1e33884190732a58bfbfe659898e02d41fe39f4':
  Allow tapping on memory status regions to filter proc stats.
2013-10-11 11:59:51 -07:00
Dianne Hackborn
b1e3388419 Allow tapping on memory status regions to filter proc stats.
Change-Id: Iade56907df648a95600919578154635c49ac9dce
2013-10-11 11:54:34 -07:00
Baligh Uddin
b13b799588 am bcdb5eec: (-s ours) am 6e96aff5: (-s ours) Import translations. DO NOT MERGE
* commit 'bcdb5eec863be4b46b608bda586c889760afba0a':
  Import translations. DO NOT MERGE
2013-10-11 08:30:50 -07:00
Baligh Uddin
bcdb5eec86 am 6e96aff5: (-s ours) Import translations. DO NOT MERGE
* commit '6e96aff5546f02199cf4c8aba0bae132d7d35e43':
  Import translations. DO NOT MERGE
2013-10-11 08:27:19 -07:00
Baligh Uddin
672c00c34b am 3104c1ce: (-s ours) Import translations. DO NOT MERGE
* commit '3104c1ce9fd8e06e5c380898b1e9f017825c996a':
  Import translations. DO NOT MERGE
2013-10-11 08:27:07 -07:00
Baligh Uddin
3104c1ce9f Import translations. DO NOT MERGE
Change-Id: I227ca980e6c3ac5e58184a2b06f8e9151cf99edf
Auto-generated-cl: translation import
2013-10-11 01:17:11 -07:00
Baligh Uddin
6e96aff554 Import translations. DO NOT MERGE
Change-Id: I7a39d70c7962e6c2721ea408712e9bdd23770cea
Auto-generated-cl: translation import
2013-10-11 01:12:20 -07:00
David Christie
156cec37aa am df0698e9: am 6d6d4976: Merge "Change location settings icons from crosshair to pin -b/8142654" into klp-dev
* commit 'df0698e9f655718743c2d065eae481f1f9d1aba3':
  Change location settings icons from crosshair to pin -b/8142654
2013-10-10 16:05:36 -07:00
David Christie
df0698e9f6 am 6d6d4976: Merge "Change location settings icons from crosshair to pin -b/8142654" into klp-dev
* commit '6d6d4976104e811dab2eb8a4d3ff0680fc7eb46a':
  Change location settings icons from crosshair to pin -b/8142654
2013-10-10 15:39:06 -07:00
David Christie
6d6d497610 Merge "Change location settings icons from crosshair to pin -b/8142654" into klp-dev 2013-10-10 22:28:31 +00:00
Svetoslav
be74fb8d72 am 43b8946f: am d9f156dd: Coalescing multiple print job notifications (Settings)
* commit '43b8946fb3071a1454aa17c352a34c2d389c096e':
  Coalescing multiple print job notifications (Settings)
2013-10-10 10:17:46 -07:00
Svetoslav
43b8946fb3 am d9f156dd: Coalescing multiple print job notifications (Settings)
* commit 'd9f156ddf072775c894db1ca3c3fe8989be4dbeb':
  Coalescing multiple print job notifications (Settings)
2013-10-10 10:14:27 -07:00
The Android Automerger
b695bb97af merge in klp-release history after reset to klp-dev 2013-10-10 06:01:39 -07:00