Jeff Sharkey
f707491cfb
Internationalize bytes and percentages.
...
Bug: 7545890
Change-Id: I634fafe9d61a2ebbf7a0cc56d8255457ee9fe1b2
2012-11-14 16:56:11 -08:00
Amith Yamasani
5cdc937251
Fix a race condition when switching between settings panels
...
The fragment was removed while the images were being loaded, so the
activity was null. This fix holds on to the Resources object.
Bug: 7490425
Change-Id: Ic2d8dd3c620fc34ce8255104001e17b39f828601
2012-11-14 16:23:40 -08:00
Baligh Uddin
66198d1960
Import translations. DO NOT MERGE
...
Change-Id: I2b21085868d064aac7cd6aca8cf6de807183faf5
Auto-generated-cl: translation import
2012-11-14 12:46:31 -08:00
The Android Open Source Project
053826adea
am f83027c2
: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit 'f83027c29eeea639c5320ef4c209a8ecf98a092b':
2012-11-14 12:44:55 -08:00
Baligh Uddin
ec5c2a4603
Import translations. DO NOT MERGE
...
Change-Id: I42acdae7131e469b7f01371d33abf9fa7c92cc1d
Auto-generated-cl: translation import
2012-11-14 12:43:52 -08:00
Baligh Uddin
add9d21f58
Import translations. DO NOT MERGE
...
Change-Id: I4d8e15ea1297b2ec3efd3decd24629e4b6360e76
Auto-generated-cl: translation import
2012-11-14 12:41:58 -08:00
The Android Open Source Project
f83027c29e
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Idc625a7e75edb599c0223c45d868e34ea5de9774
2012-11-14 12:41:28 -08:00
Baligh Uddin
29483a5334
Import translations. DO NOT MERGE
...
Change-Id: I5c6c76ef1e388527b9ad204ca689d17ede0218ea
Auto-generated-cl: translation import
2012-11-14 12:40:01 -08:00
The Android Automerger
644a30ed1b
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-14 11:29:00 -08:00
Eric Laurent
9f4afb0762
fix dock audio enable dialog
...
The dock audio enable setting is not saved if the user
dismisses the dialog without checking or unchecking the check box.
The dialog is then displayed each time the device is docked until the
user checks/unchecks the dialog or goes to sound settings to enable
or disable dock audio.
Bug 7518165.
Change-Id: Ifbc6179e78b64b5b7577ac750acf9846525e47c5
2012-11-12 14:29:17 -08:00
Baligh Uddin
67d511e518
am 9cd44a18
: (-s ours) am 3206fb2b
: am 42d97684
: am a0fbc220
: Import translations. DO NOT MERGE
...
* commit '9cd44a18c7d208cac0dc3c213cf4d6567cc945e0':
Import translations. DO NOT MERGE
2012-11-09 22:49:17 -08:00
Baligh Uddin
9cd44a18c7
am 3206fb2b
: am 42d97684
: am a0fbc220
: Import translations. DO NOT MERGE
...
* commit '3206fb2bb2fff97db47f1eeb3e0e0b7025f7fada':
Import translations. DO NOT MERGE
2012-11-09 22:45:13 -08:00
Baligh Uddin
e69632fe7e
am 0ae2c422
: (-s ours) am 7468d94e
: Import translations. DO NOT MERGE
...
* commit '0ae2c4225c6b665d015f4a601c619073f4cf4d59':
Import translations. DO NOT MERGE
2012-11-09 22:44:31 -08:00
Baligh Uddin
3206fb2bb2
am 42d97684
: am a0fbc220
: Import translations. DO NOT MERGE
...
* commit '42d976842081d3e40cdc68774573fedd90f21575':
Import translations. DO NOT MERGE
2012-11-09 22:42:02 -08:00
Baligh Uddin
0ae2c4225c
am 7468d94e
: Import translations. DO NOT MERGE
...
* commit '7468d94e31301ba3e0accb15cc26cd47438e1642':
Import translations. DO NOT MERGE
2012-11-09 16:15:59 -08:00
Baligh Uddin
42d9768420
am a0fbc220
: Import translations. DO NOT MERGE
...
* commit 'a0fbc220bb401f97103a0a22d14a45e33ca7a149':
Import translations. DO NOT MERGE
2012-11-09 16:15:33 -08:00
Vikram Aggarwal
bf459dafdc
Remove back button entirely when disabled
...
Bug: 7480506 Encryption screen shows back button
Change-Id: Iba2706fd6b61303178b472071f32d65bdf72e50d
2012-11-09 14:40:22 -08:00
Baligh Uddin
38e351fed8
Import translations. DO NOT MERGE
...
Change-Id: I7083f0a03dd217ef4713306f9f87e0c984e16909
Auto-generated-cl: translation import
2012-11-09 11:58:53 -08:00
Baligh Uddin
a0fbc220bb
Import translations. DO NOT MERGE
...
Change-Id: I520c6d173124c8645fdfa2eb3db251f704c656c3
Auto-generated-cl: translation import
2012-11-09 11:53:40 -08:00
Baligh Uddin
7468d94e31
Import translations. DO NOT MERGE
...
Change-Id: Ia83d3a7041a3af738961ccf10bc96d540bc1f147
Auto-generated-cl: translation import
2012-11-09 11:51:15 -08:00
The Android Open Source Project
3542b51f59
am 0c9b200b
: (-s ours) am fee1840f
: am 15d91c6e
: Reconcile with jb-mr1-release - do not merge
...
* commit '0c9b200b943a7bd4bc04296d2ffe3d28a5e57288':
2012-11-08 15:52:01 -08:00
Michael Jurka
3015bd32cf
am a5bb85e4
: am 8bb938dc
: am ffffbf40
: am d9609fc0
: Fix jank after adding a widget for lock screen
...
* commit 'a5bb85e4f80216b84309e616322e3c093c59dc58':
Fix jank after adding a widget for lock screen
2012-11-08 15:52:00 -08:00
Michael Jurka
0c9a46e050
am 1f35075b
: am 80eed80e
: am caf13b22
: am a108d9fc
: Final tweaks to visuals of widget picker
...
* commit '1f35075b5ea3b6d033849ad7ea3aab88c030d747':
Final tweaks to visuals of widget picker
2012-11-08 15:51:55 -08:00
Baligh Uddin
70990ff343
am 49be9660
: (-s ours) am 90ef462c
: am 09256980
: am c74ef2f2
: am 7d6a0f9c
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '49be9660bf6ab52b7aeda68d5bc6fabd35edb7ae':
2012-11-08 15:51:53 -08:00
Baligh Uddin
f57fc828ed
am 3522253c
: (-s ours) am c25bfc07
: am 4f1a0932
: am 7d6a0f9c
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '3522253c4c101619d216e77f380bdca61023d0f5':
Import translations. DO NOT MERGE
2012-11-08 15:51:52 -08:00
The Android Open Source Project
08697fe8cc
am 349564e9
: (-s ours) am c8c23821
: am 1a37da3b
: Reconcile with jb-mr1-release - do not merge
...
* commit '349564e9245b7842b4445349d0a447021e2ba0b0':
2012-11-08 15:51:51 -08:00
The Android Open Source Project
0c9b200b94
am fee1840f
: am 15d91c6e
: Reconcile with jb-mr1-release - do not merge
...
* commit 'fee1840f3d6d68c5f3d4e4ab9372305e154c64a9':
2012-11-08 15:47:52 -08:00
Michael Jurka
a5bb85e4f8
am 8bb938dc
: am ffffbf40
: am d9609fc0
: Fix jank after adding a widget for lock screen
...
* commit '8bb938dcc9a7d1c9f465439121171793fb405d14':
Fix jank after adding a widget for lock screen
2012-11-08 15:47:42 -08:00
Michael Jurka
1f35075b5e
am 80eed80e
: am caf13b22
: am a108d9fc
: Final tweaks to visuals of widget picker
...
* commit '80eed80e3b048672ac09c297a4971e79dd480d45':
Final tweaks to visuals of widget picker
2012-11-08 15:47:41 -08:00
Baligh Uddin
49be9660bf
am 90ef462c
: am 09256980
: am c74ef2f2
: am 7d6a0f9c
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '90ef462ca76a6c800feddc125badb6f483782b6e':
2012-11-08 15:43:47 -08:00
Baligh Uddin
3522253c4c
am c25bfc07
: am 4f1a0932
: am 7d6a0f9c
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c25bfc07af873793abb19fe95295aa8bf0cd2ebc':
Import translations. DO NOT MERGE
2012-11-08 15:42:36 -08:00
The Android Open Source Project
349564e924
am c8c23821
: am 1a37da3b
: Reconcile with jb-mr1-release - do not merge
...
* commit 'c8c238212ded8d4e774ad7cdc06de58626fedce2':
2012-11-08 15:42:14 -08:00
The Android Open Source Project
fee1840f3d
am 15d91c6e
: Reconcile with jb-mr1-release - do not merge
...
* commit '15d91c6e825d6529cf03478410c3ff92d8879b53':
2012-11-08 14:22:21 -08:00
The Android Open Source Project
15d91c6e82
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Iaa26de823282e7aba1ec495c04de885dd5267982
2012-11-08 14:19:27 -08:00
The Android Automerger
79bf08d246
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-08 13:54:19 -08:00
Michael Jurka
8bb938dcc9
am ffffbf40
: am d9609fc0
: Fix jank after adding a widget for lock screen
...
* commit 'ffffbf400b528262ffee791a0c607a6d2affed72':
Fix jank after adding a widget for lock screen
2012-11-08 13:15:32 -08:00
Michael Jurka
80eed80e3b
am caf13b22
: am a108d9fc
: Final tweaks to visuals of widget picker
...
* commit 'caf13b22c072dc48ace4c53065c78fd0dac131ef':
Final tweaks to visuals of widget picker
2012-11-08 13:15:31 -08:00
Michael Jurka
ffffbf400b
am d9609fc0
: Fix jank after adding a widget for lock screen
...
* commit 'd9609fc0a2be07e9100dbb83f3549dad1d9b3c51':
Fix jank after adding a widget for lock screen
2012-11-08 13:10:47 -08:00
Michael Jurka
caf13b22c0
am a108d9fc
: Final tweaks to visuals of widget picker
...
* commit 'a108d9fc0edd3b4f741fae595e35a246fbc700ff':
Final tweaks to visuals of widget picker
2012-11-08 13:10:46 -08:00
Baligh Uddin
62f8e61bdb
am 8c062ff5
: (-s ours) am c3876ebb
: am f654e3bb
: am 9d41995b
: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '8c062ff5c4a167084192e6773a95449781d6f2dc':
Import translations. DO NOT MERGE
2012-11-08 06:32:03 -08:00
Michael Jurka
8ec346c446
am 06dfc8ae
: am 4ee20f36
: am 4e773619
: am f5336fd1
: Allowing rotation while adding lockscreen widgets
...
* commit '06dfc8aeb604158a177caddd3194e68ecb38373d':
Allowing rotation while adding lockscreen widgets
2012-11-08 06:32:01 -08:00
Michael Jurka
6602f95990
am dae2b315
: am f31af7d1
: am ef2b86b4
: am a487bca4
: Updated layouts for keyguard widget picker
...
* commit 'dae2b315fcbd8961ba0396234eb13baa99464f0b':
Updated layouts for keyguard widget picker
2012-11-08 06:32:00 -08:00
Michael Jurka
b59c43f862
am e2d65f1d
: am 686e8287
: am 02dd6c42
: am c0fb8a39
: Merge "Updated assets." into jb-mr1-lockscreen-dev
...
* commit 'e2d65f1d0090be684d6eabfacbbbedeb0685021b':
Updated assets.
2012-11-08 06:31:59 -08:00
Michael Jurka
b7c915088a
am 5bd9c4d6
: am 504bd1ee
: am ddf272da
: am 5c5eff45
: Pass argument to lock screen to show widget after adding it
...
* commit '5bd9c4d6c7332e2a0dab0bfc97114f5521862bdd':
Pass argument to lock screen to show widget after adding it
2012-11-08 06:31:57 -08:00
Michael Jurka
0abb4e5730
am 09e9bdd6
: am bd533781
: am 2419d2ed
: am 4119788b
: Add widget previews to the key guard widget picker
...
* commit '09e9bdd64d3c720ec9d6d3db75b8dedcd31a6157':
Add widget previews to the key guard widget picker
2012-11-08 06:31:56 -08:00
Baligh Uddin
e77c0b753a
am 470d258e
: (-s ours) am cbc0d030
: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '470d258efd29264e893891152aa2992dcffc9711':
Import translations. DO NOT MERGE
2012-11-08 06:31:55 -08:00
Baligh Uddin
8c062ff5c4
am c3876ebb
: am f654e3bb
: am 9d41995b
: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit 'c3876ebb450bd8fbba14d03bdf278243dc825c2d':
Import translations. DO NOT MERGE
2012-11-08 06:27:27 -08:00
Michael Jurka
06dfc8aeb6
am 4ee20f36
: am 4e773619
: am f5336fd1
: Allowing rotation while adding lockscreen widgets
...
* commit '4ee20f36fa71fc0ecd0d1cd3c46d271e7096376d':
Allowing rotation while adding lockscreen widgets
2012-11-08 06:27:26 -08:00
Michael Jurka
dae2b315fc
am f31af7d1
: am ef2b86b4
: am a487bca4
: Updated layouts for keyguard widget picker
...
* commit 'f31af7d14f88ed6cf2c5c6b6067cc9436d98b110':
Updated layouts for keyguard widget picker
2012-11-08 06:27:25 -08:00
Michael Jurka
e2d65f1d00
am 686e8287
: am 02dd6c42
: am c0fb8a39
: Merge "Updated assets." into jb-mr1-lockscreen-dev
...
* commit '686e8287a0b3799aa75258676fc7546691e1a4df':
Updated assets.
2012-11-08 06:27:24 -08:00