Vikram Aggarwal
f15f9d6765
Merge "Remove back button entirely when disabled" into jb-mr1.1-dev
2012-11-15 12:53:25 -08:00
Amith Yamasani
940f6f0c46
Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev
2012-11-15 12:21:31 -08:00
Jeff Sharkey
733bd43798
Merge "Internationalize bytes and percentages." into jb-mr1.1-dev
2012-11-15 11:44:44 -08:00
Jeff Sharkey
6992d40776
Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev
2012-11-15 11:44:38 -08:00
Baligh Uddin
3058022c16
am add9d21f: Import translations. DO NOT MERGE
...
* commit 'add9d21f581272a957f8df4c9895d5c03515db13':
Import translations. DO NOT MERGE
2012-11-15 09:02:00 -08:00
Jeff Sharkey
8ef71dbcbc
Align "Make passwords visible" setting.
...
Bug: 7545894
Change-Id: I46113676c46055bd7468a0aa7289c9475e714232
2012-11-14 17:00:12 -08:00
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
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
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
a0fbc220bb
Import translations. DO NOT MERGE
...
Change-Id: I520c6d173124c8645fdfa2eb3db251f704c656c3
Auto-generated-cl: translation import
2012-11-09 11:53:40 -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
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
0925698096
am c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c74ef2f28b1b095ecb3dea78ff8d277daec84f58':
2012-11-07 18:29:07 -08:00
Michael Jurka
d9609fc0a2
Fix jank after adding a widget for lock screen
...
After adding a widget, you see a black flash, but
there's also a small sliver of wallpaper left
showing. This change covers up that small bit
of wallpaper.
Bug: 7381803
2012-11-07 16:54:46 -08:00
Michael Jurka
a108d9fc0e
Final tweaks to visuals of widget picker
2012-11-07 15:32:23 -08:00
Baligh Uddin
c74ef2f28b
am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '7d6a0f9c8b9494e3b735ea98836ff3b826e11c8e':
Import translations. DO NOT MERGE
2012-11-07 11:51:32 -08:00
Baligh Uddin
4f1a093203
am 7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '7d6a0f9c8b9494e3b735ea98836ff3b826e11c8e':
Import translations. DO NOT MERGE
2012-11-07 11:50:53 -08:00
Baligh Uddin
7d6a0f9c8b
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-11-07 11:49:24 -08:00
The Android Open Source Project
1a37da3bf4
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I0c96fcfe474c0536ddfaaea7705b4956df0e0f43
2012-11-07 11:35:14 -08:00
The Android Automerger
01785cff5f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-07 11:18:19 -08:00
Baligh Uddin
f654e3bb5b
am 9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '9d41995bd1f158b852b6a12d73390535690b8b7e':
Import translations. DO NOT MERGE
2012-11-07 11:11:53 -08:00
Michael Jurka
4e77361931
am f5336fd1: Allowing rotation while adding lockscreen widgets
...
* commit 'f5336fd114e557fce06197041aab70217308fe90':
Allowing rotation while adding lockscreen widgets
2012-11-07 11:11:51 -08:00
Michael Jurka
ef2b86b40a
am a487bca4: Updated layouts for keyguard widget picker
...
* commit 'a487bca4700a9dbd5d5d72913d0265ae86815edf':
Updated layouts for keyguard widget picker
2012-11-07 11:11:50 -08:00
Michael Jurka
02dd6c423c
am c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev
...
* commit 'c0fb8a399be0b3e4b365682c681ff24264bbef14':
Updated assets.
2012-11-07 11:11:49 -08:00
Michael Jurka
ddf272dae1
am 5c5eff45: Pass argument to lock screen to show widget after adding it
...
* commit '5c5eff45e97a2bb1b55befb87eb535a438a7bbf8':
Pass argument to lock screen to show widget after adding it
2012-11-07 11:11:48 -08:00
Michael Jurka
2419d2ed3c
am 4119788b: Add widget previews to the key guard widget picker
...
* commit '4119788b1be5d9b51e3c5cfe4e32f2aacc5a2f8f':
Add widget previews to the key guard widget picker
2012-11-07 11:11:47 -08:00
Baligh Uddin
9d41995bd1
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-11-07 10:03:26 -08:00
Michael Jurka
f5336fd114
Allowing rotation while adding lockscreen widgets
...
Also cleaning up some unused code
Bug: 7468012
2012-11-07 01:12:04 -08:00
Michael Jurka
a487bca470
Updated layouts for keyguard widget picker
...
Bug: 7381803
Change-Id: I9a6a8fe3216002b486e7b6ddf7544d9fc4e73de8
2012-11-07 00:00:11 -08:00
Michael Jurka
c0fb8a399b
Merge "Updated assets." into jb-mr1-lockscreen-dev
2012-11-06 21:10:21 -08:00
Daniel Sandler
06405ceaed
Updated assets.
...
Change-Id: Ib4e02eb1c43523e86ad8828835f76436ebb82506
2012-11-07 00:03:34 -05:00
Michael Jurka
5c5eff45e9
Pass argument to lock screen to show widget
...
after adding it
2012-11-06 16:22:04 -08:00
Baligh Uddin
213cc46288
Import translations. DO NOT MERGE
...
Change-Id: Iae38ab79b4108a612ed9048c7d3282c6287ae84b
Auto-generated-cl: translation import
2012-11-06 16:13:52 -08:00
Baligh Uddin
fb4a71b7b0
Import translations. DO NOT MERGE
...
Change-Id: I9e48644d4717391f86c10a609470c429769114e7
Auto-generated-cl: translation import
2012-11-06 16:11:40 -08:00
Michael Jurka
4119788b1b
Add widget previews to the key guard widget picker
...
Bug: 7381803
Change-Id: I86946b7d0d75f8a1f89120600be2513bdf9026f0
2012-11-06 15:14:03 -08:00
The Android Open Source Project
5a051a7f0a
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ibf539c16a9086609d5baf494ea5156c8967d02a5
2012-11-06 13:26:57 -08:00
The Android Automerger
ce561a8a59
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-06 13:13:42 -08:00
Michael Jurka
701d8a0e1a
am ab3472f5: Supporting EXTRA_APPWIDGET_OPTIONS correctly
...
* commit 'ab3472f5946c5dc3193c29513e31be7309ece378':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
2012-11-06 12:38:24 -08:00
The Android Open Source Project
f9bac00620
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: Ic248a0dc1baadcebad816f4870655a826fa7a5d7
2012-11-06 12:18:44 -08:00
Michael Jurka
ab3472f594
Supporting EXTRA_APPWIDGET_OPTIONS correctly
2012-11-05 18:56:14 -08:00
The Android Automerger
bf3c225560
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-05 18:39:13 -08:00
Jim Miller
fd34f98960
Merge "Disable the "none" security selection in settings when there's only 1 user" into jb-mr1-lockscreen-dev
2012-11-04 18:28:35 -08:00
Baligh Uddin
18facce418
am e3a4a5fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'e3a4a5fde5799fd6b26df146bec5e35bf3f856ba':
Import translations. DO NOT MERGE
2012-11-04 17:52:56 -08:00
Baligh Uddin
ecfe5f0d4c
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-11-04 17:51:15 -08:00
Baligh Uddin
e3a4a5fde5
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-11-04 17:50:45 -08:00
