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
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
2958debb37
Merge "Import translations. DO NOT MERGE"
2012-11-07 10:03:39 -08:00
Baligh Uddin
9d41995bd1
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-11-07 10:03:26 -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
ee0b817643
Import translations. DO NOT MERGE
...
Change-Id: I72271a629a76cef1d6abb787e082c770243d829f
Auto-generated-cl: translation import
2012-11-06 16:17:34 -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
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
838c59385e
am 6deb028a
: am b19c4ced
: am 701d8a0e
: am ab3472f5
: Supporting EXTRA_APPWIDGET_OPTIONS correctly
...
* commit '6deb028a9e358166e850bb3182cf5c6a62846921':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
2012-11-06 12:50:32 -08:00
Michael Jurka
6deb028a9e
am b19c4ced
: am 701d8a0e
: am ab3472f5
: Supporting EXTRA_APPWIDGET_OPTIONS correctly
...
* commit 'b19c4ced11debd52313d9bfcb3b66dabba84b5b1':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
2012-11-06 12:48:24 -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
The Android Open Source Project
91dee482cc
am 51177f0c
: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit '51177f0c301344296162a8af7cca37990d239e53':
2012-11-06 12:40:09 -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
51177f0c30
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I538dcad23578c67aac157ea9c60b5e27da195d69
2012-11-06 12:37:59 -08:00
The Android Open Source Project
60e3644c6f
am 2197081f
: (-s ours) am 374808ea
: am f9bac006
: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '2197081fa0bf8bd1282e17b933c30b84e9b65b18':
2012-11-06 12:33:58 -08:00
The Android Open Source Project
2197081fa0
am 374808ea
: am f9bac006
: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '374808ea223870c2ef12b009bbf6bb6b29a3d4b5':
2012-11-06 12:29:51 -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
The Android Automerger
1d0f1b685a
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-06 02:29:12 -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
9ebcbb2504
am 75d6191e
: am 95b2db64
: am fd34f989
: Merge "Disable the "none" security selection in settings when there\'s only 1 user" into jb-mr1-lockscreen-dev
...
* commit '75d6191e1f0dc893aee4fab7e8225123add1ec54':
Disable the "none" security selection in settings when there's only 1 user
2012-11-05 15:41:01 -08:00
Baligh Uddin
3f2fafe87f
am e386f325
: (-s ours) am 7c99551a
: am 18facce4
: am e3a4a5fd
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'e386f32521270a262f3fd899ad8b314e7c06eda2':
2012-11-05 15:41:00 -08:00
Baligh Uddin
6468b174a3
am f5e9cca7
: (-s ours) am 94c4b78a
: am ecfe5f0d
: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit 'f5e9cca7a07e9a9824ed93ade0ffffb5cf97590e':
Import translations. DO NOT MERGE
2012-11-05 15:40:58 -08:00
Jim Miller
75d6191e1f
am 95b2db64
: am fd34f989
: Merge "Disable the "none" security selection in settings when there\'s only 1 user" into jb-mr1-lockscreen-dev
...
* commit '95b2db64d4197883739e4b1be5ece409583ceb36':
Disable the "none" security selection in settings when there's only 1 user
2012-11-05 15:38:26 -08:00
Baligh Uddin
e386f32521
am 7c99551a
: am 18facce4
: am e3a4a5fd
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '7c99551aaca4f9f19c0d47d71ff6fc6a71a45ad2':
2012-11-05 15:38:25 -08:00
Baligh Uddin
f5e9cca7a0
am 94c4b78a
: am ecfe5f0d
: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit '94c4b78acb387aa926a3fbdf4efd7b14e8edc45e':
Import translations. DO NOT MERGE
2012-11-05 15:38:24 -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
The Android Open Source Project
adbbf7f77c
am 8926c734
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '8926c73425638fcb10359307669c2aa26bb2c18c':
2012-11-05 14:23:39 -08:00
The Android Open Source Project
8926c73425
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I3275f5314289403f5cd8e8accceec4f38404c7d1
2012-11-05 14:21:32 -08:00
Baligh Uddin
7906e10271
am c82b385b
: (-s ours) am 50bfc55e
: am e3a4a5fd
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c82b385ba2822a5f90a770fa66e4183f5fbc7df7':
Import translations. DO NOT MERGE
2012-11-05 14:18:01 -08:00
Baligh Uddin
c82b385ba2
am 50bfc55e
: am e3a4a5fd
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '50bfc55e4190a2ffdadd9a9eb318e5c948ba7e66':
Import translations. DO NOT MERGE
2012-11-05 14:15:12 -08:00