Commit Graph

8541 Commits

Author SHA1 Message Date
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
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
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
The Android Automerger
2df1470570 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-02 17:34:52 -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
The Android Automerger
eed7a47758 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-31 18:34:23 -07:00
Dianne Hackborn
4de4061c8b Fix issue #7448596: Can't uninstall app that was installed by another user
Change-Id: I6614346f8da80ffedd71645ee2920cf85b92c87c
2012-10-31 18:12:03 -07:00
Michael Jurka
0b2bd8d11d 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
2012-10-31 16:46:24 -07:00
The Android Automerger
859ce033ec merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-30 20:12:35 -07:00
Eric Laurent
523d9dc460 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
2012-10-30 14:14:40 -07:00
Eric Laurent
f79daa9420 Merge "display audio dialog when connecting low end dock" into jb-mr1-dev 2012-10-30 14:12:23 -07:00
Justin Ho
5da02a4769 am 29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev
* commit '29c4c88be2c2f225a1daff551b4e32ed03cc1bda':
  Whoops, missed a 'Sleep Mode' -> 'Daydream' string.
2012-10-30 11:17:54 -07:00
Justin Ho
29c4c88be2 Merge "Whoops, missed a 'Sleep Mode' -> 'Daydream' string." into jb-mr1-dev 2012-10-30 11:16:45 -07:00
Eric Laurent
f892bc856c display audio dialog when connecting low end dock
Display a dialog to enable the use of the dock audio connection
when a low end dock is connected for the first time.

Modify DockService to process docked and undocked messages even if
the device indicated is null (meaning the dock is not a bluetooth dock)
only for low end docks.

Bug 7302106.

Change-Id: I331d83a74fecf5f26b24bfc178342df414bd8153
2012-10-30 10:41:46 -07:00
The Android Automerger
82c45c7019 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-30 08:53:03 -07:00
Daniel Sandler
bcebe48f67 Whoops, missed a 'Sleep Mode' -> 'Daydream' string.
Change-Id: I7ed00811e2c31459aaa32336dba4ff75b095f5ef
2012-10-30 09:59:16 -04:00
Jeff Sharkey
58e97bf41f am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
* commit 'c2c9d5bde11113d3fc86f1ea25b41e7446e3d833':
  Selectively enable bugreport in power menu.
2012-10-29 16:37:17 -07:00
Jeff Sharkey
c2c9d5bde1 Merge "Selectively enable bugreport in power menu." into jb-mr1-dev 2012-10-29 16:35:08 -07:00
Baligh Uddin
d1d9e35045 am 2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '2e0679ed54cda79fa3f5ae6f75fb2a71aeb40f54':
  Import translations. DO NOT MERGE
2012-10-29 15:22:47 -07:00
Baligh Uddin
eb70ca293a Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-10-29 15:20:30 -07:00
Baligh Uddin
2e0679ed54 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-29 15:19:59 -07:00
Vikram Aggarwal
ee2840231c am 8d028a87: Allow wireless charging during encrypt
* commit '8d028a87e97f9420f9db31a6b8aa80859fe393b3':
  Allow wireless charging during encrypt
2012-10-29 15:14:23 -07:00
Jeff Sharkey
2817c46c04 Selectively enable bugreport in power menu.
The underlying bugreport init service depends on USB debugging being
turned on for user builds.  This change makes the developer options
UI reflect this constraint.

Bug: 7427434
Change-Id: I8dc16cc53ec4a97a3b39ee631694456be3bde081
2012-10-29 14:57:41 -07:00
Baligh Uddin
33ed3e0591 Import translations. DO NOT MERGE
Change-Id: Ifdee0ced0a57d8ccf512e12166ea1ec66418a6c2
Auto-generated-cl: translation import
2012-10-29 13:31:03 -07:00
Baligh Uddin
fc66cb8386 Import translations. DO NOT MERGE
Change-Id: Iab4a9535ce1e86eb842f82bcbb9a7e689a168064
Auto-generated-cl: translation import
2012-10-29 13:24:42 -07:00