OSDN Git Service
Dianne Hackborn [Thu, 6 Jun 2013 19:29:04 +0000 (12:29 -0700)]
am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
0bccd7e7f4d6fe4d5c7e1fef151f50ebed7addaf':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:26:39 +0000 (12:26 -0700)]
am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
5f28c77bc64deb132082eaab0ebd544ba5111bd0':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:23:05 +0000 (12:23 -0700)]
am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
d60861258169083f3174734af821fc8078ec5d2f':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Wed, 22 May 2013 18:29:36 +0000 (11:29 -0700)]
Fix issue #
9074296: Device Admins can activate in a way...
...that makes it impossible to deactive/uninstall them
Don't allow device admins to directly launch the add UI if
they are malformed.
(cherry picked from commit
8274b6770219a469ab8a5254206d0d81bd5c96d3)
Changes due to make the cherry-pick apply:
* Replaced PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS with 0
in the PackageManager.queryBroadcastReceivers invocation. The above
constant was introduced in API Level 18 only. DeviceAdminSettings
class from which this fix was extracted is not passing in the above
flag when it invokes queryBroadcastReceivers either.
Change-Id: I64d2792cd06bacbd4bfc600a10046d51a9383606
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:27:42 +0000 (12:27 -0700)]
am
8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
8638eeb4e925009fcc91fd9a9965740c25fe518a':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:22:07 +0000 (12:22 -0700)]
Reconcile with jb-mr1-release - do not merge
Jean Chalard [Mon, 17 Dec 2012 05:58:04 +0000 (14:58 +0900)]
Distinguish adding an already present word / cancelling
Bug:
7725834
Change-Id: Iab3d1818f008a553868fb30e8460ea3f77c2de50
Mike Cleron [Fri, 14 Dec 2012 18:57:17 +0000 (10:57 -0800)]
Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
Jean Chalard [Thu, 13 Dec 2012 06:34:11 +0000 (15:34 +0900)]
Call back to whom requested to add a word to the user dict
Bug:
7725834
Change-Id: I2537754789f25fa978efd457979ed130806b9fbf
Irfan Sheriff [Thu, 13 Dec 2012 19:30:41 +0000 (11:30 -0800)]
am
f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev
* commit '
f197105e3bd83a1f244cb690a1aa615624629961':
Fix wifi compareTo
Irfan Sheriff [Thu, 13 Dec 2012 19:28:47 +0000 (11:28 -0800)]
Merge "Fix wifi compareTo" into jb-mr1-dev
Irfan Sheriff [Thu, 29 Nov 2012 20:31:06 +0000 (12:31 -0800)]
Fix wifi compareTo
Bug:
7521354
Change-Id: I8d77594dacb56f17126f0e33ff6e47379f615d40
Baligh Uddin [Wed, 12 Dec 2012 21:19:14 +0000 (13:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iea0171a572174bec2168592681ee0f44d1a74083
Auto-generated-cl: translation import
Baligh Uddin [Mon, 10 Dec 2012 18:57:09 +0000 (10:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5d16be7510affd0f6e453fe42ecf833c680313e5
Auto-generated-cl: translation import
Baligh Uddin [Fri, 7 Dec 2012 19:35:18 +0000 (11:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0958247f9b14b944fb0bdc04517e65aabba166c1
Auto-generated-cl: translation import
Amith Yamasani [Thu, 6 Dec 2012 22:40:51 +0000 (14:40 -0800)]
Pass the locale code in the help url for help pages.
Otherwise the help will always be shown in English.
Bug:
7564049
Change-Id: I94da36aa1ae5aabd118178866b7e570bb77add34
Jake Hamby [Tue, 4 Dec 2012 01:24:30 +0000 (17:24 -0800)]
Add latest area info broadcast to Settings status screen.
When the SIM has a Brazilian country code, add an item to the
status screen to show the most recently received area info cell
broadcast, requested from CellBroadcastReceiver, which also
broadcasts any updates to the area info. To read the area info
broadcast or request it from CellBroadcastReceiver requires
READ_PHONE_STATE permission.
Bug:
7445881
Change-Id: I387e23ecd0802b212ecb3e44f900a3a7a4b27e76
Baligh Uddin [Tue, 4 Dec 2012 21:46:55 +0000 (13:46 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Baligh Uddin [Tue, 4 Dec 2012 19:16:12 +0000 (11:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2ef0dc90375c2d1b8d341b2e747352d4a3313925
Auto-generated-cl: translation import
Daniel Sandler [Tue, 4 Dec 2012 19:00:59 +0000 (11:00 -0800)]
Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
Baligh Uddin [Tue, 4 Dec 2012 16:15:04 +0000 (08:15 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Daniel Sandler [Tue, 4 Dec 2012 14:05:10 +0000 (09:05 -0500)]
Revised language for notification ringtone picker.
Bug:
7659273
Change-Id: Id2702881d3789447ee18530749897448306d4148
Baligh Uddin [Mon, 3 Dec 2012 20:06:15 +0000 (12:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id0c38bd59bc3019d70d4c8320019ce0cb0a697ef
Auto-generated-cl: translation import
Danielle Millett [Wed, 21 Nov 2012 16:20:10 +0000 (11:20 -0500)]
Better layouts for security screen setups as part of b/
7459863
The major change is that choose pattern and confirm pattern layouts
no longer uses a split screen layout on tablets. The new layout
closely mimics the layout for portrait.
Other minor changes include:
-Made the header font size for confirm pattern and choose pattern
medium (this matches with face unlock changes).
-Made the buttons on choose pattern for landscape phone side-by-side
rather than above each other (to be consistent with face unlock).
-Removed the black background from phone landscape confirm pattern
since it's inconsistent with all the other layouts.
Change-Id: I4473fe880ac471a3b5bc5399a454b10504589f87
Danielle Millett [Sat, 1 Dec 2012 02:26:58 +0000 (18:26 -0800)]
Merge "Removing tutorial for choosing a pattern as part of b/
7459863" into jb-mr1.1-dev
Jeff Sharkey [Sat, 1 Dec 2012 01:44:52 +0000 (17:44 -0800)]
Merge "Push scrollbars to screen edges." into jb-mr1.1-dev
Jeff Sharkey [Sat, 1 Dec 2012 01:44:48 +0000 (17:44 -0800)]
Merge "Fix text alignment and simplify layouts." into jb-mr1.1-dev
Jeff Sharkey [Sat, 1 Dec 2012 01:44:23 +0000 (17:44 -0800)]
Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev
Amith Yamasani [Sat, 1 Dec 2012 00:42:05 +0000 (16:42 -0800)]
Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev
Jeff Sharkey [Fri, 30 Nov 2012 20:36:53 +0000 (12:36 -0800)]
Push scrollbars to screen edges.
Push scrollbar to screen edges on custom ListView and ScrollViews to
match Preferences framework behavior.
Bug:
7633165
Change-Id: Ideecd0e243c7de7bf977caef2b1585e707a00ca4
Jeff Sharkey [Fri, 30 Nov 2012 20:38:55 +0000 (12:38 -0800)]
Fix text alignment and simplify layouts.
Fix Apps items to correctly base align text, and to align correctly
in RTL mode. Use GridLayout to reduce layout complexity.
Bug:
7633350,
7132595
Change-Id: Ic3563cfe408ebcdaef1ed693cc6b01b886d700ea
Amith Yamasani [Fri, 30 Nov 2012 22:20:04 +0000 (14:20 -0800)]
Disable USB debugging checkbox and backup password for secondary users
This prevents secondary users from turning on adb debugging, even if they
find a way to launch developer options. Similarly, don't let them add or
change the adb backup password.
Bug:
7637920
Change-Id: I297f0c515a276ede6a7f12d2add72faec4eeb384
Jeff Sharkey [Fri, 30 Nov 2012 20:32:58 +0000 (12:32 -0800)]
Fix incorrectly inverted text color.
Bug:
7632947
Change-Id: I2eb8c4c24bda5b08215204330c30431bf6d0fc27
Daniel Sandler [Fri, 30 Nov 2012 18:58:03 +0000 (10:58 -0800)]
Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev
Evan Charlton [Fri, 30 Nov 2012 18:15:24 +0000 (10:15 -0800)]
Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev
Baligh Uddin [Fri, 30 Nov 2012 05:23:45 +0000 (21:23 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Jeff Sharkey [Fri, 30 Nov 2012 01:58:21 +0000 (17:58 -0800)]
Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev
Jeff Sharkey [Fri, 30 Nov 2012 01:58:19 +0000 (17:58 -0800)]
Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev
Jake Hamby [Thu, 29 Nov 2012 23:06:20 +0000 (15:06 -0800)]
Add string resource removed by previous commit.
The "bluetooth_permission_request" string resource was removed in
a previous commit, but is still referenced by a manifest element.
Add the original string resource to strings.xml.
Bug:
7641406
Change-Id: I9a41760c74d8a243ff5e8d2d7938f81207e75173
Jeff Sharkey [Thu, 29 Nov 2012 01:41:16 +0000 (17:41 -0800)]
Use uniform font size for APNs and timezones. DO NOT MERGE.
Also get rid of some orange highlight!
Bug:
7632945
Change-Id: I6a4b59f4eef81b128d128f5a429fb96f6366843a
Jeff Sharkey [Thu, 29 Nov 2012 01:09:19 +0000 (17:09 -0800)]
Avoid split action bar when it only has one item. DO NOT MERGE.
Bug:
7632944
Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988
Jake Hamby [Thu, 29 Nov 2012 22:14:10 +0000 (14:14 -0800)]
Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev
Baligh Uddin [Thu, 29 Nov 2012 19:05:49 +0000 (11:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: I89608bcb397958bf76472adb67ec1402f4a3ed5c
Auto-generated-cl: translation import
Dianne Hackborn [Thu, 29 Nov 2012 02:18:00 +0000 (18:18 -0800)]
Merge "Be quiet!" into jb-mr1.1-dev
Dianne Hackborn [Thu, 29 Nov 2012 02:05:00 +0000 (18:05 -0800)]
Be quiet!
Change-Id: Ifcce5bf4b2fca35fe50a2684983dc726534c3d0c
Adam Cohen [Thu, 29 Nov 2012 01:47:18 +0000 (17:47 -0800)]
Merge "Making sure keyguard and homescreen only display eligible widgets (issue
7550090)" into jb-mr1.1-dev
Adam Cohen [Thu, 29 Nov 2012 00:37:44 +0000 (16:37 -0800)]
Making sure keyguard and homescreen only display eligible widgets (issue
7550090)
Change-Id: Ia1eb902618855e1a86a84c9090cdeefe5a404fd7
John Spurlock [Wed, 28 Nov 2012 14:30:28 +0000 (06:30 -0800)]
Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev
Daniel Sandler [Wed, 28 Nov 2012 03:41:30 +0000 (22:41 -0500)]
Add android.settings.DREAM_SETTINGS for Daydream settings.
Bug:
7480927
Change-Id: I5777f7c4aec9ad7d7eb9f7eeb882d2342cb481c3
Baligh Uddin [Tue, 27 Nov 2012 22:23:27 +0000 (14:23 -0800)]
am
42db418f: Import translations. DO NOT MERGE
* commit '
42db418f963dfd200a75b518971c719215af352a':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 27 Nov 2012 22:22:35 +0000 (14:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibe10143bc63383ced22f10c1b7d35f90424dcb2f
Auto-generated-cl: translation import
Baligh Uddin [Tue, 27 Nov 2012 22:21:30 +0000 (14:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5b887c229653be7d975d36f96b2cdc66ebb498a9
Auto-generated-cl: translation import
John Spurlock [Tue, 27 Nov 2012 15:15:51 +0000 (10:15 -0500)]
Update a few dream setting strings to ease translation.
Clarify that sleep = asleep and charging as we do in the ui.
Bug:
7564443
Change-Id: Id50938d6d4052fd4223e212125d10f4bfd0c6908
Baligh Uddin [Mon, 26 Nov 2012 17:35:59 +0000 (09:35 -0800)]
am
40129973: (-s ours) Import translations. DO NOT MERGE
* commit '
401299739295b2305707810bbae2e49eadac50ba':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 23 Nov 2012 07:19:57 +0000 (23:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibdf26abbd3f779772241bddcaa321ef7cec0d19b
Auto-generated-cl: translation import
Baligh Uddin [Fri, 23 Nov 2012 07:18:51 +0000 (23:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I21102fa6155368b3948a2606f9e30fde08b508b1
Auto-generated-cl: translation import
Baligh Uddin [Thu, 22 Nov 2012 19:17:40 +0000 (11:17 -0800)]
am
e71a8772: Import translations. DO NOT MERGE
* commit '
e71a8772bbc92a72e68484bb6c0aa2e3c0baa64d':
Import translations. DO NOT MERGE
Danielle Millett [Wed, 21 Nov 2012 20:44:16 +0000 (15:44 -0500)]
Removing tutorial for choosing a pattern as part of b/
7459863
Removing the tutorial that is shown the first time a user sets up
a pattern as their lock type.
Change-Id: If73c936e41458af729740fe5b178b9452c7dd2c0
Baligh Uddin [Wed, 21 Nov 2012 08:04:32 +0000 (00:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: I275d3bec8048e4da0d30b6deabc6966f6b0785fe
Auto-generated-cl: translation import
Jake Hamby [Tue, 12 Jun 2012 00:04:14 +0000 (17:04 -0700)]
Fix Bluetooth enable dialog to match Android style guide.
When an app requests to enable Bluetooth and/or Bluetooth discovery,
we show a dialog for user confirmation. Remove the dialog title,
update the message text and button labels to be more descriptive,
and use the standard dialog layout instead of a custom layout.
Also fixes the button layout on the Bluetooth permission test app so
that the "Discoverable" button doesn't wrap to two lines.
Bug:
6001468
Change-Id: I731e2f31b4c822395fc3f83584a092550d9ae7d3
Baligh Uddin [Sat, 17 Nov 2012 01:59:01 +0000 (17:59 -0800)]
am
7ed1879f: Import translations. DO NOT MERGE
* commit '
7ed1879f283e4c92fe47ab345c5fdf405e95f233':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Nov 2012 23:51:59 +0000 (15:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: If48dc63e0112cc63e76b635047b38cde4b33ea06
Auto-generated-cl: translation import
Eric Laurent [Fri, 16 Nov 2012 22:05:00 +0000 (14:05 -0800)]
Merge "fix dock audio enable dialog" into jb-mr1.1-dev
Amith Yamasani [Fri, 16 Nov 2012 18:43:03 +0000 (10:43 -0800)]
Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev
Amith Yamasani [Thu, 1 Nov 2012 22:36:29 +0000 (15:36 -0700)]
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
Vikram Aggarwal [Thu, 15 Nov 2012 20:53:25 +0000 (12:53 -0800)]
Merge "Remove back button entirely when disabled" into jb-mr1.1-dev
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: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:02:00 +0000 (09:02 -0800)]
am
add9d21f: Import translations. DO NOT MERGE
* commit '
add9d21f581272a957f8df4c9895d5c03515db13':
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
Eric Laurent [Mon, 12 Nov 2012 22:29:17 +0000 (14:29 -0800)]
fix dock audio enable dialog
The dock audio enable setting is not saved if the user
dismisses the dialog without checking or unchecking the check box.
The dialog is then displayed each time the device is docked until the
user checks/unchecks the dialog or goes to sound settings to enable
or disable dock audio.
Bug
7518165.
Change-Id: Ifbc6179e78b64b5b7577ac750acf9846525e47c5
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
Vikram Aggarwal [Fri, 9 Nov 2012 00:54:59 +0000 (16:54 -0800)]
Remove back button entirely when disabled
Bug:
7480506 Encryption screen shows back button
Change-Id: Iba2706fd6b61303178b472071f32d65bdf72e50d
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
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: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: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
Evan Charlton [Thu, 8 Nov 2012 00:18:17 +0000 (16:18 -0800)]
Use plurals for the developer steps countdown
When counting down how many steps are left before the user becomes a
developer, use plurals so that "steps" becomes "step" correctly.
Change-Id: I5dbe2c229c9e6ed0c45aaae8c303b23efc76f75d
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: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: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: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
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