OSDN Git Service
Amith Yamasani [Thu, 15 Nov 2012 20:23:50 +0000 (12:23 -0800)]
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
Amith Yamasani [Thu, 15 Nov 2012 20:21:31 +0000 (12:21 -0800)]
Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev
Jeff Sharkey [Thu, 15 Nov 2012 19:47:37 +0000 (11:47 -0800)]
am
733bd437: Merge "Internationalize bytes and percentages." into jb-mr1.1-dev
* commit '
733bd43798c292b35d06b02fe3722a52481886a8':
Internationalize bytes and percentages.
Jeff Sharkey [Thu, 15 Nov 2012 19:47:35 +0000 (11:47 -0800)]
am
6992d407: Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev
* commit '
6992d407760b1b5ed3744566c1d9bca9ae1a77be':
Align "Make passwords visible" setting.
Jeff Sharkey [Thu, 15 Nov 2012 19:44:40 +0000 (11:44 -0800)]
Merge "Internationalize bytes and percentages." into jb-mr1.1-dev
Jeff Sharkey [Thu, 15 Nov 2012 19:44:37 +0000 (11:44 -0800)]
Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev
Baligh Uddin [Thu, 15 Nov 2012 17:04:59 +0000 (09:04 -0800)]
am
3058022c: am
add9d21f: Import translations. DO NOT MERGE
* commit '
3058022c169b04680cb48f143364ab799e75ee85':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 15 Nov 2012 17:02:00 +0000 (09:02 -0800)]
am
add9d21f: Import translations. DO NOT MERGE
* commit '
add9d21f581272a957f8df4c9895d5c03515db13':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 15 Nov 2012 17:01:30 +0000 (09:01 -0800)]
am
ec5c2a46: Import translations. DO NOT MERGE
* commit '
ec5c2a4603848cbf2027367b7942014f9fae48c5':
Import translations. DO NOT MERGE
Jeff Sharkey [Thu, 15 Nov 2012 01:00:12 +0000 (17:00 -0800)]
Align "Make passwords visible" setting.
Bug:
7545894
Change-Id: I46113676c46055bd7468a0aa7289c9475e714232
Jeff Sharkey [Thu, 15 Nov 2012 00:53:12 +0000 (16:53 -0800)]
Internationalize bytes and percentages.
Bug:
7545890
Change-Id: I634fafe9d61a2ebbf7a0cc56d8255457ee9fe1b2
Amith Yamasani [Thu, 15 Nov 2012 00:23:40 +0000 (16:23 -0800)]
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
Baligh Uddin [Wed, 14 Nov 2012 20:43:52 +0000 (12:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I42acdae7131e469b7f01371d33abf9fa7c92cc1d
Auto-generated-cl: translation import
Baligh Uddin [Wed, 14 Nov 2012 20:41:58 +0000 (12:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4d8e15ea1297b2ec3efd3decd24629e4b6360e76
Auto-generated-cl: translation import
Baligh Uddin [Wed, 14 Nov 2012 20:40:01 +0000 (12:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5c6c76ef1e388527b9ad204ca689d17ede0218ea
Auto-generated-cl: translation import
Baligh Uddin [Sat, 10 Nov 2012 06:42:02 +0000 (22:42 -0800)]
am
42d97684: am
a0fbc220: Import translations. DO NOT MERGE
* commit '
42d976842081d3e40cdc68774573fedd90f21575':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 00:15:33 +0000 (16:15 -0800)]
am
a0fbc220: Import translations. DO NOT MERGE
* commit '
a0fbc220bb401f97103a0a22d14a45e33ca7a149':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 19:53:40 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I520c6d173124c8645fdfa2eb3db251f704c656c3
Auto-generated-cl: translation import
Baligh Uddin [Fri, 9 Nov 2012 19:51:15 +0000 (11:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia83d3a7041a3af738961ccf10bc96d540bc1f147
Auto-generated-cl: translation import
The Android Open Source Project [Thu, 8 Nov 2012 22:22:21 +0000 (14:22 -0800)]
am
15d91c6e: Reconcile with jb-mr1-release - do not merge
* commit '
15d91c6e825d6529cf03478410c3ff92d8879b53':
The Android Open Source Project [Thu, 8 Nov 2012 22:19:27 +0000 (14:19 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Iaa26de823282e7aba1ec495c04de885dd5267982
The Android Automerger [Thu, 8 Nov 2012 21:54:19 +0000 (13:54 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Michael Jurka [Thu, 8 Nov 2012 21:15:32 +0000 (13:15 -0800)]
am
ffffbf40: am
d9609fc0: Fix jank after adding a widget for lock screen
* commit '
ffffbf400b528262ffee791a0c607a6d2affed72':
Fix jank after adding a widget for lock screen
Michael Jurka [Thu, 8 Nov 2012 21:15:31 +0000 (13:15 -0800)]
am
caf13b22: am
a108d9fc: Final tweaks to visuals of widget picker
* commit '
caf13b22c072dc48ace4c53065c78fd0dac131ef':
Final tweaks to visuals of widget picker
Michael Jurka [Thu, 8 Nov 2012 21:10:47 +0000 (13:10 -0800)]
am
d9609fc0: Fix jank after adding a widget for lock screen
* commit '
d9609fc0a2be07e9100dbb83f3549dad1d9b3c51':
Fix jank after adding a widget for lock screen
Michael Jurka [Thu, 8 Nov 2012 21:10:46 +0000 (13:10 -0800)]
am
a108d9fc: Final tweaks to visuals of widget picker
* commit '
a108d9fc0edd3b4f741fae595e35a246fbc700ff':
Final tweaks to visuals of widget picker
Baligh Uddin [Thu, 8 Nov 2012 02:34:44 +0000 (18:34 -0800)]
am
09256980: am
c74ef2f2: am
7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
09256980960cd5de7633f3a0f69cef2a676a6812':
Baligh Uddin [Thu, 8 Nov 2012 02:29:07 +0000 (18:29 -0800)]
am
c74ef2f2: am
7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c74ef2f28b1b095ecb3dea78ff8d277daec84f58':
Michael Jurka [Thu, 8 Nov 2012 00:54:35 +0000 (16:54 -0800)]
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
Michael Jurka [Wed, 7 Nov 2012 23:31:47 +0000 (15:31 -0800)]
Final tweaks to visuals of widget picker
Baligh Uddin [Wed, 7 Nov 2012 19:53:29 +0000 (11:53 -0800)]
am
4f1a0932: am
7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
4f1a09320321cc758df1d33358e6353d3614bdb0':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Nov 2012 19:51:32 +0000 (11:51 -0800)]
am
7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
7d6a0f9c8b9494e3b735ea98836ff3b826e11c8e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Nov 2012 19:50:53 +0000 (11:50 -0800)]
am
7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
7d6a0f9c8b9494e3b735ea98836ff3b826e11c8e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Nov 2012 19:49:24 +0000 (11:49 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
The Android Open Source Project [Wed, 7 Nov 2012 19:37:20 +0000 (11:37 -0800)]
am
1a37da3b: Reconcile with jb-mr1-release - do not merge
* commit '
1a37da3bf44546f41734fd7ffdac066a256ea271':
The Android Open Source Project [Wed, 7 Nov 2012 19:35:14 +0000 (11:35 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I0c96fcfe474c0536ddfaaea7705b4956df0e0f43
The Android Automerger [Wed, 7 Nov 2012 19:18:19 +0000 (11:18 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Wed, 7 Nov 2012 19:14:08 +0000 (11:14 -0800)]
am
f654e3bb: am
9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
f654e3bb5b340360690c45b88442d9bf454fa44c':
Import translations. DO NOT MERGE
Michael Jurka [Wed, 7 Nov 2012 19:14:07 +0000 (11:14 -0800)]
am
4e773619: am
f5336fd1: Allowing rotation while adding lockscreen widgets
* commit '
4e7736193118373836c6fd558c4142972d6a74e2':
Allowing rotation while adding lockscreen widgets
Michael Jurka [Wed, 7 Nov 2012 19:14:06 +0000 (11:14 -0800)]
am
ef2b86b4: am
a487bca4: Updated layouts for keyguard widget picker
* commit '
ef2b86b40a207b21c7f6b056552a44278d0533f1':
Updated layouts for keyguard widget picker
Michael Jurka [Wed, 7 Nov 2012 19:14:05 +0000 (11:14 -0800)]
am
02dd6c42: am
c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev
* commit '
02dd6c423c362a2975cd2cb33bf98355c3083647':
Updated assets.
Michael Jurka [Wed, 7 Nov 2012 19:14:03 +0000 (11:14 -0800)]
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
Michael Jurka [Wed, 7 Nov 2012 19:14:02 +0000 (11:14 -0800)]
am
2419d2ed: am
4119788b: Add widget previews to the key guard widget picker
* commit '
2419d2ed3c20261edf18761b87a8bd7b7713171e':
Add widget previews to the key guard widget picker
Baligh Uddin [Wed, 7 Nov 2012 19:11:53 +0000 (11:11 -0800)]
am
9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
9d41995bd1f158b852b6a12d73390535690b8b7e':
Import translations. DO NOT MERGE
Michael Jurka [Wed, 7 Nov 2012 19:11:51 +0000 (11:11 -0800)]
am
f5336fd1: Allowing rotation while adding lockscreen widgets
* commit '
f5336fd114e557fce06197041aab70217308fe90':
Allowing rotation while adding lockscreen widgets
Michael Jurka [Wed, 7 Nov 2012 19:11:50 +0000 (11:11 -0800)]
am
a487bca4: Updated layouts for keyguard widget picker
* commit '
a487bca4700a9dbd5d5d72913d0265ae86815edf':
Updated layouts for keyguard widget picker
Michael Jurka [Wed, 7 Nov 2012 19:11:49 +0000 (11:11 -0800)]
am
c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev
* commit '
c0fb8a399be0b3e4b365682c681ff24264bbef14':
Updated assets.
Michael Jurka [Wed, 7 Nov 2012 19:11:48 +0000 (11:11 -0800)]
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
Michael Jurka [Wed, 7 Nov 2012 19:11:47 +0000 (11:11 -0800)]
am
4119788b: Add widget previews to the key guard widget picker
* commit '
4119788b1be5d9b51e3c5cfe4e32f2aacc5a2f8f':
Add widget previews to the key guard widget picker
Baligh Uddin [Wed, 7 Nov 2012 18:03:25 +0000 (10:03 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Wed, 7 Nov 2012 18:02:52 +0000 (10:02 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Michael Jurka [Wed, 7 Nov 2012 09:11:28 +0000 (01:11 -0800)]
Allowing rotation while adding lockscreen widgets
Also cleaning up some unused code
Bug:
7468012
Michael Jurka [Wed, 7 Nov 2012 05:08:31 +0000 (21:08 -0800)]
Updated layouts for keyguard widget picker
Bug:
7381803
Change-Id: I9a6a8fe3216002b486e7b6ddf7544d9fc4e73de8
Michael Jurka [Wed, 7 Nov 2012 05:10:21 +0000 (21:10 -0800)]
Merge "Updated assets." into jb-mr1-lockscreen-dev
Daniel Sandler [Wed, 7 Nov 2012 05:03:34 +0000 (00:03 -0500)]
Updated assets.
Change-Id: Ib4e02eb1c43523e86ad8828835f76436ebb82506
Michael Jurka [Wed, 7 Nov 2012 00:22:04 +0000 (16:22 -0800)]
Pass argument to lock screen to show widget
after adding it
Baligh Uddin [Wed, 7 Nov 2012 00:13:52 +0000 (16:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iae38ab79b4108a612ed9048c7d3282c6287ae84b
Auto-generated-cl: translation import
Baligh Uddin [Wed, 7 Nov 2012 00:11:40 +0000 (16:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9e48644d4717391f86c10a609470c429769114e7
Auto-generated-cl: translation import
Baligh Uddin [Wed, 7 Nov 2012 00:09:13 +0000 (16:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iad0dcfb3ccccfb814a7ba85ae346fe5dd3336d48
Auto-generated-cl: translation import
Michael Jurka [Sat, 3 Nov 2012 06:05:34 +0000 (23:05 -0700)]
Add widget previews to the key guard widget picker
Bug:
7381803
Change-Id: I86946b7d0d75f8a1f89120600be2513bdf9026f0
The Android Open Source Project [Tue, 6 Nov 2012 21:29:17 +0000 (13:29 -0800)]
am
5a051a7f: Reconcile with jb-mr1-release - do not merge
* commit '
5a051a7f0af2e206afd8c1e765eb80690345a536':
The Android Open Source Project [Tue, 6 Nov 2012 21:26:57 +0000 (13:26 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ibf539c16a9086609d5baf494ea5156c8967d02a5
The Android Automerger [Tue, 6 Nov 2012 21:13:42 +0000 (13:13 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Michael Jurka [Tue, 6 Nov 2012 20:46:14 +0000 (12:46 -0800)]
am
701d8a0e: am
ab3472f5: Supporting EXTRA_APPWIDGET_OPTIONS correctly
* commit '
701d8a0e1af9d667b5c03a30ffb275359f048415':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
Michael Jurka [Tue, 6 Nov 2012 20:38:24 +0000 (12:38 -0800)]
am
ab3472f5: Supporting EXTRA_APPWIDGET_OPTIONS correctly
* commit '
ab3472f5946c5dc3193c29513e31be7309ece378':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
The Android Open Source Project [Tue, 6 Nov 2012 20:23:56 +0000 (12:23 -0800)]
am
f9bac006: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
f9bac00620691f281df42d390517da2e37df8749':
Remove blank translation string from en-GB, so it can show English.
Manually enter translations for msgid:
9014073093293520112
Fix layout with no access points
Added info about why Wi-Fi is required
Show warnings when skipping Wi-Fi connection
Fix regression in Bluetooth settings.
Addressing issue where power control widget disappears issue
7205586
Fix NPE in DeviceInfoSettings
Fix a crash in InstalledAppDetails
Tweaking mechanism for adding keyguard widgets
Fix issue #
7178865: Selecting an app from Settings > Apps>...
Must initialize the new atomic..
Fix crash in Settings > Security
Wifi settings are in a different namespace now
Update Settings app to use new namespace for airplane-mode settings
The Android Open Source Project [Tue, 6 Nov 2012 20:18:44 +0000 (12:18 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ic248a0dc1baadcebad816f4870655a826fa7a5d7
Michael Jurka [Tue, 6 Nov 2012 02:56:14 +0000 (18:56 -0800)]
Supporting EXTRA_APPWIDGET_OPTIONS correctly
The Android Automerger [Tue, 6 Nov 2012 02:39:13 +0000 (18:39 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jim Miller [Mon, 5 Nov 2012 23:36:01 +0000 (15:36 -0800)]
am
fd34f989: Merge "Disable the "none" security selection in settings when there\'s only 1 user" into jb-mr1-lockscreen-dev
* commit '
fd34f989608dc02b0cdfbb7012c4c824a5107ded':
Disable the "none" security selection in settings when there's only 1 user
Baligh Uddin [Mon, 5 Nov 2012 23:36:00 +0000 (15:36 -0800)]
am
18facce4: am
e3a4a5fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
18facce4183adc1b058f9d04f3dfd3fe1e8fae2f':
Baligh Uddin [Mon, 5 Nov 2012 23:35:55 +0000 (15:35 -0800)]
am
ecfe5f0d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
ecfe5f0d4c31151ee8585ec5521ced2e6e6581b9':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 22:11:57 +0000 (14:11 -0800)]
am
e3a4a5fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
e3a4a5fde5799fd6b26df146bec5e35bf3f856ba':
Import translations. DO NOT MERGE
Jim Miller [Mon, 5 Nov 2012 02:28:34 +0000 (18:28 -0800)]
Merge "Disable the "none" security selection in settings when there's only 1 user" into jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 5 Nov 2012 01:52:56 +0000 (17:52 -0800)]
am
e3a4a5fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
e3a4a5fde5799fd6b26df146bec5e35bf3f856ba':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 01:51:14 +0000 (17:51 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 5 Nov 2012 01:50:58 +0000 (17:50 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Mon, 5 Nov 2012 01:50:45 +0000 (17:50 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
The Android Automerger [Sat, 3 Nov 2012 00:34:52 +0000 (17:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dianne Hackborn [Fri, 2 Nov 2012 22:20:29 +0000 (15:20 -0700)]
am
4de4061c: Fix issue #
7448596: Can\'t uninstall app that was installed by another user
* commit '
4de4061c8bb9475cbc5d98f83bf3b2c8ec222407':
Fix issue #
7448596: Can't uninstall app that was installed by another user
Jim Miller [Fri, 2 Nov 2012 02:39:21 +0000 (19:39 -0700)]
Disable the "none" security selection in settings when there's only 1 user
Fixes bug
7454567
Change-Id: Ifffa1403af8d45bc3c7da1f459b87f0a2c064b80
Baligh Uddin [Fri, 2 Nov 2012 08:42:19 +0000 (01:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4aeb203952a8889425968e0e600f846d0a216c81
Auto-generated-cl: translation import
Baligh Uddin [Fri, 2 Nov 2012 08:40:39 +0000 (01:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I43bce84488cadd7c2c8637e9bac2fdf0d7a1ea58
Auto-generated-cl: translation import
Baligh Uddin [Fri, 2 Nov 2012 08:38:57 +0000 (01:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I01e080a0c1111417cc502fa4fe126b1431763809
Auto-generated-cl: translation import
Michael Jurka [Thu, 1 Nov 2012 01:36:03 +0000 (18:36 -0700)]
am
0b2bd8d1: New widget picker for keyguard widgets
* commit '
0b2bd8d11d6947a6ce71db0691ba341aec7a2964':
New widget picker for keyguard widgets
Eric Laurent [Thu, 1 Nov 2012 01:36:02 +0000 (18:36 -0700)]
am
523d9dc4: am
f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
* commit '
523d9dc460d3af22372860f4d3f83a4529257545':
Justin Ho [Thu, 1 Nov 2012 01:36:00 +0000 (18:36 -0700)]
am
5da02a47: am
29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev
* commit '
5da02a476944c6ca3672cf00265f7f163028a8c5':
Jeff Sharkey [Thu, 1 Nov 2012 01:35:59 +0000 (18:35 -0700)]
am
58e97bf4: am
c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
* commit '
58e97bf41f1ee38d401146553d3de8678b437b8b':
Baligh Uddin [Thu, 1 Nov 2012 01:35:57 +0000 (18:35 -0700)]
am
d1d9e350: am
2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
d1d9e350452e1147f9a0c5b312f869f652fb9722':
Baligh Uddin [Thu, 1 Nov 2012 01:35:56 +0000 (18:35 -0700)]
am
eb70ca29: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
eb70ca293a2edbba128a74bb268089f4a59e1c75':
Import translations. DO NOT MERGE
Vikram Aggarwal [Thu, 1 Nov 2012 01:35:54 +0000 (18:35 -0700)]
am
ee284023: am
8d028a87: Allow wireless charging during encrypt
* commit '
ee2840231ce60fcc7ae2f0fa045ffa94a2877c90':
Baligh Uddin [Thu, 1 Nov 2012 01:35:48 +0000 (18:35 -0700)]
am
910fe047: am
e42e7b85: (-s ours) Import translations. DO NOT MERGE
* commit '
910fe0479a07df0f3a2eaeee4d1191c9f32ea5c9':
Baligh Uddin [Thu, 1 Nov 2012 01:35:31 +0000 (18:35 -0700)]
am
9ad78e88: (-s ours) Import translations. DO NOT MERGE
* commit '
9ad78e880f98fdf53cb40bcdcf0f9af3ea795bc6':
Import translations. DO NOT MERGE
The Android Automerger [Thu, 1 Nov 2012 01:34:23 +0000 (18:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dianne Hackborn [Thu, 1 Nov 2012 00:15:58 +0000 (17:15 -0700)]
Fix issue #
7448596: Can't uninstall app that was installed by another user
Change-Id: I6614346f8da80ffedd71645ee2920cf85b92c87c
Michael Jurka [Tue, 30 Oct 2012 22:32:27 +0000 (15:32 -0700)]
New widget picker for keyguard widgets
New layout for widget picker is still not up to
final design, but this change prepares all the
backend work
Also, remove use of features filter from the
picker, since this is being removed from the API
Change-Id: I9b332e22cf34b98c20c720602c920d28aed01d6c
The Android Automerger [Wed, 31 Oct 2012 03:12:35 +0000 (20:12 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eric Laurent [Tue, 30 Oct 2012 21:14:40 +0000 (14:14 -0700)]
am
f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
* commit '
f79daa942005608e56a4a0d7f414fedccd56e467':
display audio dialog when connecting low end dock
Eric Laurent [Tue, 30 Oct 2012 21:14:14 +0000 (14:14 -0700)]
am
f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
* commit '
f79daa942005608e56a4a0d7f414fedccd56e467':
display audio dialog when connecting low end dock
Eric Laurent [Tue, 30 Oct 2012 21:12:22 +0000 (14:12 -0700)]
Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
OSDN Git Service
