Baligh Uddin
ae2a22db7f
Import translations. DO NOT MERGE
...
Change-Id: I23a0fe1f0bc3f044d2f028a621cb1070bcecb5fa
Auto-generated-cl: translation import
2013-01-02 13:44:46 -08:00
Amith Yamasani
8f716f66cf
Refresh battery stats when the battery state or charge level changes.
...
This will keep them in sync. We still don't automatically update
the stats periodically, in case the user is investigating some
behavior. That's why we have a refresh button.
Bug: 7737824
Change-Id: I8a59cad6c72f540533b3526fc476260465c73492
2012-12-26 08:41:25 -08:00
Elliott Hughes
c611de2dca
am 52d623ed
: am f141594c
: Merge "Correct check box visibility in Display / Brightness"
...
* commit '52d623ede4a697259b1b3506b0464941e376218e':
Correct check box visibility in Display / Brightness
2012-12-20 11:06:47 -08:00
Elliott Hughes
52d623ede4
am f141594c
: Merge "Correct check box visibility in Display / Brightness"
...
* commit 'f141594c0507dccd26e876bf2cd40ba15a34d68b':
Correct check box visibility in Display / Brightness
2012-12-20 11:03:50 -08:00
Elliott Hughes
f141594c05
Merge "Correct check box visibility in Display / Brightness"
2012-12-19 16:11:15 -08:00
Jeff Sharkey
d54d34557a
One final pass at unquoted NetworkPolicies.
...
Correctly shows the metered status of legacy policies in UI.
Bug: 7695807
Change-Id: I13c9f4c1716d8457343c41433afac0b5f00e02fe
2012-12-18 18:07:31 -08:00
Jeff Sharkey
53f2855808
Clean up oddly quoted NetworkPolicies.
...
Bug: 7695807
Change-Id: Ia3f04dc3e918d6ca4af62f263a9c90273b3485ff
2012-12-18 17:32:10 -08:00
Jeff Sharkey
a66c0ab094
Fix metered SSID matching regression.
...
WifiInfo changed to return SSIDs with quotes included, so relax our
identity matching to accept matches regardless of quotedness.
Bug: 7695807
Change-Id: I53c0361f9e44b4d47ec8764991a3cd545c253edd
2012-12-18 17:06:23 -08:00
The Android Open Source Project
17653f566d
am a6dd202d
: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit 'a6dd202da14c2a0e75ea03807458f5c8cd319888':
2012-12-18 09:46:45 -08:00
The Android Open Source Project
a6dd202da1
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I3ce5c84d693ade39f0ffa17313acf7b0df85b934
2012-12-18 09:44:44 -08:00
Benn Porscke
106cf669c1
Correct check box visibility in Display / Brightness
...
The check box for "Automatic brightness" should not be visible in
Brightness screen if the product configuration
config_automatic_brightness_available in config.xml is set to false.
Change-Id: I0d81137723d0eacd97aa88bf08b69e12dd4d73fa
Signed-off-by: Benn Porscke <benn.porscke@stericsson.com >
2012-12-18 10:38:41 +01:00
The Android Automerger
29a4eb7a33
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-17 20:49:51 -08:00
Jean Chalard
eaac5df7bc
am 5031683a
: am d0a9d5b6
: am a374d816
: Distinguish adding an already present word / cancelling
...
* commit '5031683a729917ae45047bfc33b7f89705c4c530':
Distinguish adding an already present word / cancelling
2012-12-17 10:48:11 -08:00
Jean Chalard
5031683a72
am d0a9d5b6
: am a374d816
: Distinguish adding an already present word / cancelling
...
* commit 'd0a9d5b6e0b557c3796616791fd3ac93d12bcad9':
Distinguish adding an already present word / cancelling
2012-12-17 10:46:29 -08:00
Jean Chalard
d0a9d5b6e0
am a374d816
: Distinguish adding an already present word / cancelling
...
* commit 'a374d81605f4ba760db9613dd8aa8d8a0370dab8':
Distinguish adding an already present word / cancelling
2012-12-17 10:44:36 -08:00
Jean Chalard
a374d81605
Distinguish adding an already present word / cancelling
...
Bug: 7725834
Change-Id: Iab3d1818f008a553868fb30e8460ea3f77c2de50
2012-12-17 15:52:07 +09:00
The Android Open Source Project
2370685553
am aca1bb4a
: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit 'aca1bb4ab86f3b27df72db37cab6bc3ccca088a9':
2012-12-14 16:48:47 -08:00
The Android Open Source Project
aca1bb4ab8
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Ida52d4ffe46a6805df540f684465dcd46db71945
2012-12-14 14:03:38 -08:00
The Android Automerger
6db1e2495d
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-14 13:56:20 -08:00
Mike Cleron
f189a15dbd
am 6d3925ce
: am 49ce96a1
: am 1f597c87
: Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
...
* commit '6d3925ce5b86c27672289fa8e29bb9229085c1ea':
Call back to whom requested to add a word to the user dict
2012-12-14 11:03:13 -08:00
Mike Cleron
6d3925ce5b
am 49ce96a1
: am 1f597c87
: Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
...
* commit '49ce96a14be5d414128b9e8ca12de281b610a57f':
Call back to whom requested to add a word to the user dict
2012-12-14 11:00:28 -08:00
Mike Cleron
49ce96a14b
am 1f597c87
: Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
...
* commit '1f597c8764b375bf87d411d11a29b2808e1d2ef9':
Call back to whom requested to add a word to the user dict
2012-12-14 10:59:17 -08:00
Mike Cleron
1f597c8764
Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
2012-12-14 10:57:18 -08:00
Przemyslaw Szczepaniak
a7d2c93c2b
Fix for setting app not playing tts sample.
...
Bug: 7666482
Change-Id: I36a775312d62d3d7a5ee600b540a328b377b46c9
2012-12-14 07:26:39 -08:00
Jean Chalard
e3f1171309
Call back to whom requested to add a word to the user dict
...
Bug: 7725834
Change-Id: I2537754789f25fa978efd457979ed130806b9fbf
2012-12-14 18:08:05 +09:00
The Android Automerger
76a1152108
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-13 15:30:57 -08:00
Irfan Sheriff
0cfbb7aabb
am 9c65a7fd
: am 878072a1
: am 2a9cbb61
: am f197105e
: Merge "Fix wifi compareTo" into jb-mr1-dev
...
* commit '9c65a7fdf4c87e10b2bf54ee7ea5bc392d0507c0':
Fix wifi compareTo
2012-12-13 11:36:40 -08:00
Irfan Sheriff
9c65a7fdf4
am 878072a1
: am 2a9cbb61
: am f197105e
: Merge "Fix wifi compareTo" into jb-mr1-dev
...
* commit '878072a11a4f481e99cdc499752b72d14a03090d':
Fix wifi compareTo
2012-12-13 11:34:46 -08:00
Irfan Sheriff
878072a11a
am 2a9cbb61
: am f197105e
: Merge "Fix wifi compareTo" into jb-mr1-dev
...
* commit '2a9cbb61b3d8bae75b3a6e769dbe1c69c563f210':
Fix wifi compareTo
2012-12-13 11:32:51 -08:00
Irfan Sheriff
2a9cbb61b3
am f197105e
: Merge "Fix wifi compareTo" into jb-mr1-dev
...
* commit 'f197105e3bd83a1f244cb690a1aa615624629961':
Fix wifi compareTo
2012-12-13 11:30:41 -08:00
Irfan Sheriff
f197105e3b
Merge "Fix wifi compareTo" into jb-mr1-dev
2012-12-13 11:28:48 -08:00
Irfan Sheriff
ebc57e3ae6
Fix wifi compareTo
...
Bug: 7521354
Change-Id: I8d77594dacb56f17126f0e33ff6e47379f615d40
2012-12-13 11:00:24 -08:00
The Android Automerger
5cf1fcb9e4
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-12 15:06:22 -08:00
Baligh Uddin
76f4cab4d9
am 3af56067
: (-s ours) am efacd47f
: am 5b4509b5
: Import translations. DO NOT MERGE
...
* commit '3af560670fdbe617d4dc0e3f64de1adbb248e84b':
Import translations. DO NOT MERGE
2012-12-12 13:44:57 -08:00
Baligh Uddin
3af560670f
am efacd47f
: am 5b4509b5
: Import translations. DO NOT MERGE
...
* commit 'efacd47f4f2f9b5103cd3bf876b819904d881da6':
Import translations. DO NOT MERGE
2012-12-12 13:42:57 -08:00
Baligh Uddin
d40c0d5f52
am badaeea8
: (-s ours) am 92ff5ebe
: Import translations. DO NOT MERGE
...
* commit 'badaeea8035f06da5568cdc4295b8a343397a804':
Import translations. DO NOT MERGE
2012-12-12 13:40:53 -08:00
Baligh Uddin
efacd47f4f
am 5b4509b5
: Import translations. DO NOT MERGE
...
* commit '5b4509b5adf2f3e12ffb7df4065fcdfd7e5e3f93':
Import translations. DO NOT MERGE
2012-12-12 13:40:49 -08:00
Baligh Uddin
badaeea803
am 92ff5ebe
: Import translations. DO NOT MERGE
...
* commit '92ff5ebe1e0bbb58b444c06d3e4b6887a3dbe120':
Import translations. DO NOT MERGE
2012-12-12 13:39:37 -08:00
Baligh Uddin
7bf8273f45
Merge "Import translations. DO NOT MERGE"
2012-12-12 13:38:57 -08:00
Baligh Uddin
66d2e17dc8
Import translations. DO NOT MERGE
...
Change-Id: Id0bade447cf518d9c5e523aa597bc432b4d5feac
Auto-generated-cl: translation import
2012-12-12 13:22:13 -08:00
Baligh Uddin
5b4509b5ad
Import translations. DO NOT MERGE
...
Change-Id: Iea0171a572174bec2168592681ee0f44d1a74083
Auto-generated-cl: translation import
2012-12-12 13:19:14 -08:00
Baligh Uddin
92ff5ebe1e
Import translations. DO NOT MERGE
...
Change-Id: I4067263fdbd86c2b1037443ad7360fb17cabe56c
Auto-generated-cl: translation import
2012-12-12 13:17:55 -08:00
Amith Yamasani
9a03c8cfb2
am 004970da
: am 0df6a277
: Merge "Grey out settings icon when it is in disabled state"
...
* commit '004970da50ddbce80321b50536625e149ff1f825':
Grey out settings icon when it is in disabled state
2012-12-12 09:57:37 -08:00
Amith Yamasani
004970da50
am 0df6a277
: Merge "Grey out settings icon when it is in disabled state"
...
* commit '0df6a2771d92e355e122195d3dceaf9a2b264ee5':
Grey out settings icon when it is in disabled state
2012-12-12 09:55:56 -08:00
Irfan Sheriff
96a06f79be
Merge "Use updated API"
2012-12-12 09:30:47 -08:00
Amith Yamasani
0df6a2771d
Merge "Grey out settings icon when it is in disabled state"
2012-12-12 09:12:47 -08:00
The Android Open Source Project
d870df94b2
am 7f5a3d10
: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit '7f5a3d10f860ee1962c4bb81fa5a552cc5fedc3e':
2012-12-12 07:36:21 -08:00
The Android Open Source Project
7f5a3d10f8
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Ia5cf13610d470a518ce526f8a46cb6241a28d124
2012-12-12 07:34:17 -08:00
Irfan Sheriff
9f86b5df78
Use updated API
...
Fetch peer details from broadcast instead of querying the whole list
each time
Change-Id: I57d82c9dc977d91675b5e5c99979732c80fb1a09
2012-12-11 22:18:59 -08:00
The Android Automerger
4d2a01d3a3
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-11 15:56:34 -08:00