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
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
cbc0d03093
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-11-07 10:02:52 -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
c0cd36ec8c
Import translations. DO NOT MERGE
...
Change-Id: Iad0dcfb3ccccfb814a7ba85ae346fe5dd3336d48
Auto-generated-cl: translation import
2012-11-06 16:09:13 -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
a60f3ae723
am 5a051a7f: Reconcile with jb-mr1-release - do not merge
...
* commit '5a051a7f0af2e206afd8c1e765eb80690345a536':
2012-11-06 13:29:17 -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
b19c4ced11
am 701d8a0e: am ab3472f5: Supporting EXTRA_APPWIDGET_OPTIONS correctly
...
* commit '701d8a0e1af9d667b5c03a30ffb275359f048415':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
2012-11-06 12:46:14 -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
374808ea22
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
2012-11-06 12:23:56 -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
95b2db64d4
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
2012-11-05 15:36:01 -08:00
Baligh Uddin
7c99551aac
am 18facce4: am e3a4a5fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '18facce4183adc1b058f9d04f3dfd3fe1e8fae2f':
2012-11-05 15:36:00 -08:00
Baligh Uddin
94c4b78acb
am ecfe5f0d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit 'ecfe5f0d4c31151ee8585ec5521ced2e6e6581b9':
Import translations. DO NOT MERGE
2012-11-05 15:35:55 -08:00
Baligh Uddin
50bfc55e41
am e3a4a5fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'e3a4a5fde5799fd6b26df146bec5e35bf3f856ba':
Import translations. DO NOT MERGE
2012-11-05 14:11:57 -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
091c12c398
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-11-04 17:50:59 -08:00
Baligh Uddin
e3a4a5fde5
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-11-04 17:50:45 -08:00
The Android Automerger
2df1470570
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-02 17:34:52 -07:00
Dianne Hackborn
b52e8ca60d
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
2012-11-02 15:20:29 -07:00
Jim Miller
783ea85bec
Disable the "none" security selection in settings when there's only 1 user
...
Fixes bug 7454567
Change-Id: Ifffa1403af8d45bc3c7da1f459b87f0a2c064b80
2012-11-02 13:19:32 -07:00
Baligh Uddin
e5860279d8
Import translations. DO NOT MERGE
...
Change-Id: I4aeb203952a8889425968e0e600f846d0a216c81
Auto-generated-cl: translation import
2012-11-02 01:42:19 -07:00
Baligh Uddin
8b24ac004b
Import translations. DO NOT MERGE
...
Change-Id: I43bce84488cadd7c2c8637e9bac2fdf0d7a1ea58
Auto-generated-cl: translation import
2012-11-02 01:40:39 -07:00
Baligh Uddin
3f5ba40054
Import translations. DO NOT MERGE
...
Change-Id: I01e080a0c1111417cc502fa4fe126b1431763809
Auto-generated-cl: translation import
2012-11-02 01:38:57 -07:00
Michael Jurka
6df9ce11ca
am 0b2bd8d1: New widget picker for keyguard widgets
...
* commit '0b2bd8d11d6947a6ce71db0691ba341aec7a2964':
New widget picker for keyguard widgets
2012-10-31 18:36:03 -07:00
Eric Laurent
a6843064be
am 523d9dc4: am f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
...
* commit '523d9dc460d3af22372860f4d3f83a4529257545':
2012-10-31 18:36:02 -07:00
Justin Ho
a724bb1fac
am 5da02a47: am 29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev
...
* commit '5da02a476944c6ca3672cf00265f7f163028a8c5':
2012-10-31 18:36:00 -07:00
Jeff Sharkey
2eec33fed7
am 58e97bf4: am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
...
* commit '58e97bf41f1ee38d401146553d3de8678b437b8b':
2012-10-31 18:35:59 -07:00
Baligh Uddin
a4197d13b9
am d1d9e350: am 2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'd1d9e350452e1147f9a0c5b312f869f652fb9722':
2012-10-31 18:35:57 -07:00
Baligh Uddin
723498fd4a
am eb70ca29: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit 'eb70ca293a2edbba128a74bb268089f4a59e1c75':
Import translations. DO NOT MERGE
2012-10-31 18:35:56 -07:00
Vikram Aggarwal
a27e1cb204
am ee284023: am 8d028a87: Allow wireless charging during encrypt
...
* commit 'ee2840231ce60fcc7ae2f0fa045ffa94a2877c90':
2012-10-31 18:35:54 -07:00
Baligh Uddin
a10a75ca16
am 910fe047: am e42e7b85: (-s ours) Import translations. DO NOT MERGE
...
* commit '910fe0479a07df0f3a2eaeee4d1191c9f32ea5c9':
2012-10-31 18:35:48 -07:00
