Amith Yamasani
0aa79c7394
am 60977265: Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev
...
* commit '609772652250a4408c4cfef2560d145fd365db2b':
Use AlarmManager calls to set date/time, instead of SystemClock.setTime
2012-11-16 10:45:44 -08:00
Amith Yamasani
6097726522
Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev
2012-11-16 10:43:04 -08:00
Amith Yamasani
5f05010438
Use AlarmManager calls to set date/time, instead of SystemClock.setTime
...
This way secondary users' settings app can request the system server to
set the time. Alarm driver cannot be opened as a secondary user.
Bug: 7459635
Change-Id: I1ae1630dc448021d35280a297c5d9960f8e8fc2e
2012-11-15 14:44:41 -08:00
Vikram Aggarwal
49a872436c
am f15f9d67: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev
...
* commit 'f15f9d67652dacc7f8d2764245f79b25d2c6c67b':
Remove back button entirely when disabled
2012-11-15 12:55:36 -08:00
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
4c326c2d2d
am 940f6f0c: Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev
...
* commit '940f6f0c46d2558bc30d1fe788150ae6d295779b':
Fix a race condition when switching between settings panels
2012-11-15 12:23:50 -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
05407e77e0
am 733bd437: Merge "Internationalize bytes and percentages." into jb-mr1.1-dev
...
* commit '733bd43798c292b35d06b02fe3722a52481886a8':
Internationalize bytes and percentages.
2012-11-15 11:47:37 -08:00
Jeff Sharkey
1fde57fed5
am 6992d407: Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev
...
* commit '6992d407760b1b5ed3744566c1d9bca9ae1a77be':
Align "Make passwords visible" setting.
2012-11-15 11:47:35 -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
68c7237ace
am 3058022c: am add9d21f: Import translations. DO NOT MERGE
...
* commit '3058022c169b04680cb48f143364ab799e75ee85':
Import translations. DO NOT MERGE
2012-11-15 09:04:59 -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
Baligh Uddin
58a5515759
am ec5c2a46: Import translations. DO NOT MERGE
...
* commit 'ec5c2a4603848cbf2027367b7942014f9fae48c5':
Import translations. DO NOT MERGE
2012-11-15 09:01:30 -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
29483a5334
Import translations. DO NOT MERGE
...
Change-Id: I5c6c76ef1e388527b9ad204ca689d17ede0218ea
Auto-generated-cl: translation import
2012-11-14 12:40:01 -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
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
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
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
90ef462ca7
am 09256980: am c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '09256980960cd5de7633f3a0f69cef2a676a6812':
2012-11-07 18:34:44 -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
c25bfc07af
am 4f1a0932: am 7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '4f1a09320321cc758df1d33358e6353d3614bdb0':
Import translations. DO NOT MERGE
2012-11-07 11:53:29 -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
c8c238212d
am 1a37da3b: Reconcile with jb-mr1-release - do not merge
...
* commit '1a37da3bf44546f41734fd7ffdac066a256ea271':
2012-11-07 11:37:20 -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
c3876ebb45
am f654e3bb: am 9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit 'f654e3bb5b340360690c45b88442d9bf454fa44c':
Import translations. DO NOT MERGE
2012-11-07 11:14:08 -08:00
Michael Jurka
4ee20f36fa
am 4e773619: am f5336fd1: Allowing rotation while adding lockscreen widgets
...
* commit '4e7736193118373836c6fd558c4142972d6a74e2':
Allowing rotation while adding lockscreen widgets
2012-11-07 11:14:07 -08:00
Michael Jurka
f31af7d14f
am ef2b86b4: am a487bca4: Updated layouts for keyguard widget picker
...
* commit 'ef2b86b40a207b21c7f6b056552a44278d0533f1':
Updated layouts for keyguard widget picker
2012-11-07 11:14:06 -08:00
Michael Jurka
686e8287a0
am 02dd6c42: am c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev
...
* commit '02dd6c423c362a2975cd2cb33bf98355c3083647':
Updated assets.
2012-11-07 11:14:05 -08:00
Michael Jurka
504bd1eede
am ddf272da: am 5c5eff45: Pass argument to lock screen to show widget after adding it
...
* commit 'ddf272dae119191a5314a8ac76edb53469ed5bec':
Pass argument to lock screen to show widget after adding it
2012-11-07 11:14:03 -08:00
Michael Jurka
bd5337813f
am 2419d2ed: am 4119788b: Add widget previews to the key guard widget picker
...
* commit '2419d2ed3c20261edf18761b87a8bd7b7713171e':
Add widget previews to the key guard widget picker
2012-11-07 11:14:02 -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