git.osdn.net Git - android-x86/packages-apps-Settings.git/log

Baligh Uddin [Thu, 22 Nov 2012 19:22:19 +0000 (11:22 -0800)]

am 0d7cc3b5: (-s ours) am 6dca6273: am 61b6c47e: am e71a8772: Import translations. DO NOT MERGE

* commit '0d7cc3b5ea7d3b94a58dfda94196007ac1806b37':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 22 Nov 2012 19:21:21 +0000 (11:21 -0800)]

am 6dca6273: am 61b6c47e: am e71a8772: Import translations. DO NOT MERGE

* commit '6dca62736d1bf83b2236094dbea76d0e79cd91fa':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 22 Nov 2012 19:19:32 +0000 (11:19 -0800)]

am 61b6c47e: am e71a8772: Import translations. DO NOT MERGE

* commit '61b6c47e6c93ab20e8362517c48bd515c5647bdf':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sat, 17 Nov 2012 02:06:13 +0000 (18:06 -0800)]

am aaa9d694: (-s ours) am 1fd5703d: am e9f89cfb: am 7ed1879f: Import translations. DO NOT MERGE

* commit 'aaa9d694019a1afaf98fb70285098bc981764d80':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sat, 17 Nov 2012 02:04:17 +0000 (18:04 -0800)]

am 1fd5703d: am e9f89cfb: am 7ed1879f: Import translations. DO NOT MERGE

* commit '1fd5703d5e67d42a3a8819aa0db675b987671791':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sat, 17 Nov 2012 02:02:20 +0000 (18:02 -0800)]

am e9f89cfb: am 7ed1879f: Import translations. DO NOT MERGE

* commit 'e9f89cfbf5309453e8efc2826815592660e9e1c2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Laurent [Fri, 16 Nov 2012 22:12:17 +0000 (14:12 -0800)]

am 4f103c0c: am ccc1d614: am 15c27bb4: Merge "fix dock audio enable dialog" into jb-mr1.1-dev

* commit '4f103c0c1aed90e771b9f1d02b07ebb8b7780636':
fix dock audio enable dialog

commit | commitdiff | tree

Eric Laurent [Fri, 16 Nov 2012 22:09:47 +0000 (14:09 -0800)]

am ccc1d614: am 15c27bb4: Merge "fix dock audio enable dialog" into jb-mr1.1-dev

* commit 'ccc1d614899459e2bb34ff977760bbb1cb225e95':
fix dock audio enable dialog

commit | commitdiff | tree

Eric Laurent [Fri, 16 Nov 2012 22:07:07 +0000 (14:07 -0800)]

am 15c27bb4: Merge "fix dock audio enable dialog" into jb-mr1.1-dev

* commit '15c27bb40bc493e898442e8e4ac9b52dd89dae58':
fix dock audio enable dialog

commit | commitdiff | tree

Eric Laurent [Fri, 16 Nov 2012 22:05:00 +0000 (14:05 -0800)]

Merge "fix dock audio enable dialog" into jb-mr1.1-dev

commit | commitdiff | tree

Amith Yamasani [Fri, 16 Nov 2012 19:37:30 +0000 (11:37 -0800)]

am 21b5aacf: am 0aa79c73: am 60977265: Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev

* commit '21b5aacf34e5249b59cdbf0cc349fa2d604a25a4':
Use AlarmManager calls to set date/time, instead of SystemClock.setTime

commit | commitdiff | tree

Amith Yamasani [Fri, 16 Nov 2012 18:48:59 +0000 (10:48 -0800)]

am 0aa79c73: am 60977265: Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev

* commit '0aa79c73948af7600f289928b18b3231d9679f81':
Use AlarmManager calls to set date/time, instead of SystemClock.setTime

commit | commitdiff | tree

Amith Yamasani [Fri, 16 Nov 2012 18:45:44 +0000 (10:45 -0800)]

am 60977265: Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev

* commit '609772652250a4408c4cfef2560d145fd365db2b':
Use AlarmManager calls to set date/time, instead of SystemClock.setTime

commit | commitdiff | tree

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

commit | commitdiff | tree

Vikram Aggarwal [Fri, 16 Nov 2012 18:38:13 +0000 (10:38 -0800)]

am 8761a053: am 49a87243: am f15f9d67: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev

* commit '8761a0536b618c3dd2711b26142469b6a6591423':
Remove back button entirely when disabled

commit | commitdiff | tree

Amith Yamasani [Fri, 16 Nov 2012 18:38:04 +0000 (10:38 -0800)]

am f6c07cab: am 4c326c2d: am 940f6f0c: Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev

* commit 'f6c07cab362219ef4457b9fc418c6e11e34b17e0':
Fix a race condition when switching between settings panels

commit | commitdiff | tree

Jeff Sharkey [Fri, 16 Nov 2012 18:37:37 +0000 (10:37 -0800)]

am 282aacb5: am 05407e77: am 733bd437: Merge "Internationalize bytes and percentages." into jb-mr1.1-dev

* commit '282aacb5c372bf8beece536ce3b2510f87be59db':
Internationalize bytes and percentages.

commit | commitdiff | tree

Jeff Sharkey [Fri, 16 Nov 2012 18:37:36 +0000 (10:37 -0800)]

am 8f7d5cac: am 1fde57fe: am 6992d407: Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev

* commit '8f7d5cac7a78a203bb77a3086bf7b380c0c451f0':
Align "Make passwords visible" setting.

commit | commitdiff | tree

Baligh Uddin [Fri, 16 Nov 2012 18:37:13 +0000 (10:37 -0800)]

am b8fc41ff: (-s ours) am 68c7237a: am 3058022c: am add9d21f: Import translations. DO NOT MERGE

* commit 'b8fc41ffeeb97c52c52e352d92f67480439f12cd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 16 Nov 2012 18:37:10 +0000 (10:37 -0800)]

am 0d459d6e: (-s ours) am 58a55157: am ec5c2a46: Import translations. DO NOT MERGE

* commit '0d459d6e745736c59ad98cecdc56f2161df69d1c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 16 Nov 2012 18:37:08 +0000 (10:37 -0800)]

am e11331c8: (-s ours) am 29483a53: Import translations. DO NOT MERGE

* commit 'e11331c8140656fe81605bbb86aadf5fc4cfc7b6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

Vikram Aggarwal [Thu, 15 Nov 2012 20:58:33 +0000 (12:58 -0800)]

am 49a87243: am f15f9d67: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev

* commit '49a872436c660cff19c2cfd50d3de5b8bcb3a7ac':
Remove back button entirely when disabled

commit | commitdiff | tree

Vikram Aggarwal [Thu, 15 Nov 2012 20:55:36 +0000 (12:55 -0800)]

am f15f9d67: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev

* commit 'f15f9d67652dacc7f8d2764245f79b25d2c6c67b':
Remove back button entirely when disabled

commit | commitdiff | tree

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

commit | commitdiff | tree

Amith Yamasani [Thu, 15 Nov 2012 20:25:25 +0000 (12:25 -0800)]

am 4c326c2d: am 940f6f0c: Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev

* commit '4c326c2d2dac4b8f0394d96aae1012d4143ff427':
Fix a race condition when switching between settings panels

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Thu, 15 Nov 2012 19:50:11 +0000 (11:50 -0800)]

am 05407e77: am 733bd437: Merge "Internationalize bytes and percentages." into jb-mr1.1-dev

* commit '05407e77e060e8b62a197065538e44a2b0cf8e38':
Internationalize bytes and percentages.

commit | commitdiff | tree

Jeff Sharkey [Thu, 15 Nov 2012 19:50:10 +0000 (11:50 -0800)]

am 1fde57fe: am 6992d407: Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev

* commit '1fde57fed5431b7d03764beed6cf201c55e70a24':
Align "Make passwords visible" setting.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jeff Sharkey [Thu, 15 Nov 2012 19:44:40 +0000 (11:44 -0800)]

Merge "Internationalize bytes and percentages." into jb-mr1.1-dev

commit | commitdiff | tree

Jeff Sharkey [Thu, 15 Nov 2012 19:44:37 +0000 (11:44 -0800)]

Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev

commit | commitdiff | tree

Baligh Uddin [Thu, 15 Nov 2012 17:07:10 +0000 (09:07 -0800)]

am 68c7237a: am 3058022c: am add9d21f: Import translations. DO NOT MERGE

* commit '68c7237ace163222c7403a9d84d051e54f472a6e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Thu, 15 Nov 2012 17:03:22 +0000 (09:03 -0800)]

am 58a55157: am ec5c2a46: Import translations. DO NOT MERGE

* commit '58a551575915a73ffbb1b20066bf8c39c515aa1d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 15 Nov 2012 17:03:20 +0000 (09:03 -0800)]

am 29483a53: Import translations. DO NOT MERGE

* commit '29483a5334360921f39694175daaaed57d68dd02':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Thu, 15 Nov 2012 16:59:23 +0000 (08:59 -0800)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Jeff Sharkey [Thu, 15 Nov 2012 01:00:12 +0000 (17:00 -0800)]

Align "Make passwords visible" setting.

Bug: 7545894
Change-Id: I46113676c46055bd7468a0aa7289c9475e714232

commit | commitdiff | tree

Jeff Sharkey [Thu, 15 Nov 2012 00:53:12 +0000 (16:53 -0800)]

Internationalize bytes and percentages.

Bug: 7545890
Change-Id: I634fafe9d61a2ebbf7a0cc56d8255457ee9fe1b2

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Wed, 14 Nov 2012 20:46:31 +0000 (12:46 -0800)]

Import translations. DO NOT MERGE

Change-Id: I2b21085868d064aac7cd6aca8cf6de807183faf5
Auto-generated-cl: translation import

commit | commitdiff | tree

The Android Open Source Project [Wed, 14 Nov 2012 20:44:55 +0000 (12:44 -0800)]

am f83027c2: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'f83027c29eeea639c5320ef4c209a8ecf98a092b':

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Open Source Project [Wed, 14 Nov 2012 20:41:28 +0000 (12:41 -0800)]

Reconcile with jb-mr1.1-release - do not merge

Change-Id: Idc625a7e75edb599c0223c45d868e34ea5de9774

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Automerger [Wed, 14 Nov 2012 19:29:00 +0000 (11:29 -0800)]

merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sat, 10 Nov 2012 06:49:17 +0000 (22:49 -0800)]

am 9cd44a18: (-s ours) am 3206fb2b: am 42d97684: am a0fbc220: Import translations. DO NOT MERGE

* commit '9cd44a18c7d208cac0dc3c213cf4d6567cc945e0':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sat, 10 Nov 2012 06:45:13 +0000 (22:45 -0800)]

am 3206fb2b: am 42d97684: am a0fbc220: Import translations. DO NOT MERGE

* commit '3206fb2bb2fff97db47f1eeb3e0e0b7025f7fada':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sat, 10 Nov 2012 06:44:31 +0000 (22:44 -0800)]

am 0ae2c422: (-s ours) am 7468d94e: Import translations. DO NOT MERGE

* commit '0ae2c4225c6b665d015f4a601c619073f4cf4d59':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sat, 10 Nov 2012 00:15:59 +0000 (16:15 -0800)]

am 7468d94e: Import translations. DO NOT MERGE

* commit '7468d94e31301ba3e0accb15cc26cd47438e1642':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Fri, 9 Nov 2012 19:58:53 +0000 (11:58 -0800)]

Import translations. DO NOT MERGE

Change-Id: I7083f0a03dd217ef4713306f9f87e0c984e16909
Auto-generated-cl: translation import

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Open Source Project [Thu, 8 Nov 2012 23:52:01 +0000 (15:52 -0800)]

am 0c9b200b: (-s ours) am fee1840f: am 15d91c6e: Reconcile with jb-mr1-release - do not merge

* commit '0c9b200b943a7bd4bc04296d2ffe3d28a5e57288':

commit | commitdiff | tree

Michael Jurka [Thu, 8 Nov 2012 23:52:00 +0000 (15:52 -0800)]

am a5bb85e4: am 8bb938dc: am ffffbf40: am d9609fc0: Fix jank after adding a widget for lock screen

* commit 'a5bb85e4f80216b84309e616322e3c093c59dc58':
Fix jank after adding a widget for lock screen

commit | commitdiff | tree

Michael Jurka [Thu, 8 Nov 2012 23:51:55 +0000 (15:51 -0800)]

am 1f35075b: am 80eed80e: am caf13b22: am a108d9fc: Final tweaks to visuals of widget picker

* commit '1f35075b5ea3b6d033849ad7ea3aab88c030d747':
Final tweaks to visuals of widget picker

commit | commitdiff | tree

Baligh Uddin [Thu, 8 Nov 2012 23:51:53 +0000 (15:51 -0800)]

am 49be9660: (-s ours) am 90ef462c: am 09256980: am c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '49be9660bf6ab52b7aeda68d5bc6fabd35edb7ae':

commit | commitdiff | tree

Baligh Uddin [Thu, 8 Nov 2012 23:51:52 +0000 (15:51 -0800)]

am 3522253c: (-s ours) am c25bfc07: am 4f1a0932: am 7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '3522253c4c101619d216e77f380bdca61023d0f5':
Import translations. DO NOT MERGE

commit | commitdiff | tree

The Android Open Source Project [Thu, 8 Nov 2012 23:51:51 +0000 (15:51 -0800)]

am 349564e9: (-s ours) am c8c23821: am 1a37da3b: Reconcile with jb-mr1-release - do not merge

* commit '349564e9245b7842b4445349d0a447021e2ba0b0':

commit | commitdiff | tree

The Android Open Source Project [Thu, 8 Nov 2012 23:47:52 +0000 (15:47 -0800)]

am fee1840f: am 15d91c6e: Reconcile with jb-mr1-release - do not merge

* commit 'fee1840f3d6d68c5f3d4e4ab9372305e154c64a9':

commit | commitdiff | tree

Michael Jurka [Thu, 8 Nov 2012 23:47:42 +0000 (15:47 -0800)]

am 8bb938dc: am ffffbf40: am d9609fc0: Fix jank after adding a widget for lock screen

* commit '8bb938dcc9a7d1c9f465439121171793fb405d14':
Fix jank after adding a widget for lock screen

commit | commitdiff | tree

Michael Jurka [Thu, 8 Nov 2012 23:47:41 +0000 (15:47 -0800)]

am 80eed80e: am caf13b22: am a108d9fc: Final tweaks to visuals of widget picker

* commit '80eed80e3b048672ac09c297a4971e79dd480d45':
Final tweaks to visuals of widget picker

commit | commitdiff | tree

Baligh Uddin [Thu, 8 Nov 2012 23:43:47 +0000 (15:43 -0800)]

am 90ef462c: am 09256980: am c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '90ef462ca76a6c800feddc125badb6f483782b6e':

commit | commitdiff | tree

Baligh Uddin [Thu, 8 Nov 2012 23:42:36 +0000 (15:42 -0800)]

am c25bfc07: am 4f1a0932: am 7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'c25bfc07af873793abb19fe95295aa8bf0cd2ebc':
Import translations. DO NOT MERGE

commit | commitdiff | tree

The Android Open Source Project [Thu, 8 Nov 2012 23:42:14 +0000 (15:42 -0800)]

am c8c23821: am 1a37da3b: Reconcile with jb-mr1-release - do not merge

* commit 'c8c238212ded8d4e774ad7cdc06de58626fedce2':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Thu, 8 Nov 2012 14:32:03 +0000 (06:32 -0800)]

am 8c062ff5: (-s ours) am c3876ebb: am f654e3bb: am 9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '8c062ff5c4a167084192e6773a95449781d6f2dc':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Michael Jurka [Thu, 8 Nov 2012 14:32:01 +0000 (06:32 -0800)]

am 06dfc8ae: am 4ee20f36: am 4e773619: am f5336fd1: Allowing rotation while adding lockscreen widgets

* commit '06dfc8aeb604158a177caddd3194e68ecb38373d':
Allowing rotation while adding lockscreen widgets

commit | commitdiff | tree

Michael Jurka [Thu, 8 Nov 2012 14:32:00 +0000 (06:32 -0800)]

am dae2b315: am f31af7d1: am ef2b86b4: am a487bca4: Updated layouts for keyguard widget picker

* commit 'dae2b315fcbd8961ba0396234eb13baa99464f0b':
Updated layouts for keyguard widget picker

commit | commitdiff | tree

Michael Jurka [Thu, 8 Nov 2012 14:31:59 +0000 (06:31 -0800)]

am e2d65f1d: am 686e8287: am 02dd6c42: am c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev

* commit 'e2d65f1d0090be684d6eabfacbbbedeb0685021b':
Updated assets.

commit | commitdiff | tree

Michael Jurka [Thu, 8 Nov 2012 14:31:57 +0000 (06:31 -0800)]

am 5bd9c4d6: am 504bd1ee: am ddf272da: am 5c5eff45: Pass argument to lock screen to show widget after adding it

* commit '5bd9c4d6c7332e2a0dab0bfc97114f5521862bdd':
Pass argument to lock screen to show widget after adding it

commit | commitdiff | tree

Michael Jurka [Thu, 8 Nov 2012 14:31:56 +0000 (06:31 -0800)]

am 09e9bdd6: am bd533781: am 2419d2ed: am 4119788b: Add widget previews to the key guard widget picker

* commit '09e9bdd64d3c720ec9d6d3db75b8dedcd31a6157':
Add widget previews to the key guard widget picker

commit | commitdiff | tree

Baligh Uddin [Thu, 8 Nov 2012 14:31:55 +0000 (06:31 -0800)]

am 470d258e: (-s ours) am cbc0d030: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '470d258efd29264e893891152aa2992dcffc9711':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 8 Nov 2012 14:27:27 +0000 (06:27 -0800)]

am c3876ebb: am f654e3bb: am 9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit 'c3876ebb450bd8fbba14d03bdf278243dc825c2d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Michael Jurka [Thu, 8 Nov 2012 14:27:26 +0000 (06:27 -0800)]

am 4ee20f36: am 4e773619: am f5336fd1: Allowing rotation while adding lockscreen widgets

* commit '4ee20f36fa71fc0ecd0d1cd3c46d271e7096376d':
Allowing rotation while adding lockscreen widgets

commit | commitdiff | tree

Michael Jurka [Thu, 8 Nov 2012 14:27:25 +0000 (06:27 -0800)]

am f31af7d1: am ef2b86b4: am a487bca4: Updated layouts for keyguard widget picker

* commit 'f31af7d14f88ed6cf2c5c6b6067cc9436d98b110':
Updated layouts for keyguard widget picker

commit | commitdiff | tree

Michael Jurka [Thu, 8 Nov 2012 14:27:24 +0000 (06:27 -0800)]

am 686e8287: am 02dd6c42: am c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev

* commit '686e8287a0b3799aa75258676fc7546691e1a4df':
Updated assets.

commit | commitdiff | tree

Michael Jurka [Thu, 8 Nov 2012 14:27:23 +0000 (06:27 -0800)]

am 504bd1ee: am ddf272da: am 5c5eff45: Pass argument to lock screen to show widget after adding it

* commit '504bd1eede2d96260b90a9bdf93d719851605642':
Pass argument to lock screen to show widget after adding it

commit | commitdiff | tree

Michael Jurka [Thu, 8 Nov 2012 14:27:21 +0000 (06:27 -0800)]

am bd533781: am 2419d2ed: am 4119788b: Add widget previews to the key guard widget picker

* commit 'bd5337813f73de3a218ca924163c1a48ef64ff6c':
Add widget previews to the key guard widget picker

commit | commitdiff | tree

Baligh Uddin [Thu, 8 Nov 2012 14:26:53 +0000 (06:26 -0800)]

am cbc0d030: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit 'cbc0d03093710961bd9abaf0e0f076a2da08ff7d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

The Android Open Source Project [Thu, 8 Nov 2012 14:17:44 +0000 (06:17 -0800)]

am 12fde830: (-s ours) am a60f3ae7: am 5a051a7f: Reconcile with jb-mr1-release - do not merge

* commit '12fde8304f98aa4a55764c1a4cb749fd775b27e5':