OSDN Git Service
Jake Hamby [Thu, 29 Nov 2012 22:28:50 +0000 (14:28 -0800)]
am
c5190506: am
0206284a: Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev
* commit '
c51905067793a3f18c94df79eb15472cbb58322f':
Fix Bluetooth enable dialog to match Android style guide.
Dianne Hackborn [Thu, 29 Nov 2012 22:26:34 +0000 (14:26 -0800)]
am
ac4bfa60: am
af604801: Merge "Be quiet!" into jb-mr1.1-dev
* commit '
ac4bfa607d8a1e3c78de25dec740637cd5906a8d':
Be quiet!
Adam Cohen [Thu, 29 Nov 2012 22:26:25 +0000 (14:26 -0800)]
am
e38d6277: am
9067d57a: Merge "Making sure keyguard and homescreen only display eligible widgets (issue
7550090)" into jb-mr1.1-dev
* commit '
e38d6277c8355cca7239deed6a6df75f852b164d':
Making sure keyguard and homescreen only display eligible widgets (issue
7550090)
Jake Hamby [Thu, 29 Nov 2012 22:15:39 +0000 (14:15 -0800)]
am
0206284a: Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev
* commit '
0206284a661b3370a175bb8c28c005aa6b45d9d3':
Fix Bluetooth enable dialog to match Android style guide.
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
Dianne Hackborn [Thu, 29 Nov 2012 02:20:21 +0000 (18:20 -0800)]
am
af604801: Merge "Be quiet!" into jb-mr1.1-dev
* commit '
af6048010773606acf3a88df6954e1f7f3597a9f':
Be quiet!
Adam Cohen [Thu, 29 Nov 2012 02:18:26 +0000 (18:18 -0800)]
am
9067d57a: Merge "Making sure keyguard and homescreen only display eligible widgets (issue
7550090)" into jb-mr1.1-dev
* commit '
9067d57a88e7bc43b7d1d0217b4b740f972bde47':
Making sure keyguard and homescreen only display eligible widgets (issue
7550090)
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
Jeff Sharkey [Wed, 28 Nov 2012 21:04:58 +0000 (13:04 -0800)]
am
59ee3889: Merge "Settings: fix storage measurement for device without emulated sdcard"
* commit '
59ee3889088eb40ab6d8b0f4f9f11f51a89c0f76':
Settings: fix storage measurement for device without emulated sdcard
Jeff Sharkey [Wed, 28 Nov 2012 18:23:30 +0000 (10:23 -0800)]
Merge "Settings: fix storage measurement for device without emulated sdcard"
The Android Open Source Project [Wed, 28 Nov 2012 17:47:52 +0000 (09:47 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I81ef334240c928353194c517a94bf5e052b54322
John Spurlock [Wed, 28 Nov 2012 14:33:53 +0000 (06:33 -0800)]
am
28c116f0: am
fc4be385: Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev
* commit '
28c116f0c22c8a31a4053fa72a73eaa0f4cbf30e':
Update a few dream setting strings to ease translation.
John Spurlock [Wed, 28 Nov 2012 14:31:50 +0000 (06:31 -0800)]
am
fc4be385: Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev
* commit '
fc4be3856f6e1cd47da742a2a30b322979a9ebd0':
Update a few dream setting strings to ease translation.
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
The Android Automerger [Tue, 27 Nov 2012 23:34:56 +0000 (15:34 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Baligh Uddin [Tue, 27 Nov 2012 22:26:47 +0000 (14:26 -0800)]
am
abd5b596: am
3236571f: am
42db418f: Import translations. DO NOT MERGE
* commit '
abd5b596febe7c1920ce8f46e0e3355dd44a0b99':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 27 Nov 2012 22:26:46 +0000 (14:26 -0800)]
am
234ac63b: am
1e9f8d6f: Import translations. DO NOT MERGE
* commit '
234ac63beae7ea8d6612ab31ad7afc907d9d1c7b':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 27 Nov 2012 22:24:20 +0000 (14:24 -0800)]
am
3236571f: am
42db418f: Import translations. DO NOT MERGE
* commit '
3236571f4551bf20c4651ed9bc46380cd3ff8d67':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 27 Nov 2012 22:24:19 +0000 (14:24 -0800)]
am
1e9f8d6f: Import translations. DO NOT MERGE
* commit '
1e9f8d6f5401105a3e78c28689f0be5a6b5f4072':
Import translations. DO NOT MERGE
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:43 +0000 (14:22 -0800)]
am
20fbdbf1: Import translations. DO NOT MERGE
* commit '
20fbdbf1ec15ee7ec27ad288802a6474f54db8c2':
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
Baligh Uddin [Tue, 27 Nov 2012 22:20:22 +0000 (14:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icfe4b7b706f7ca8889a519688c222e35ecc5fb4e
Auto-generated-cl: translation import
The Android Open Source Project [Tue, 27 Nov 2012 16:24:23 +0000 (08:24 -0800)]
am
19f09fb1: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge
* commit '
19f09fb127cd193023fe518f4fe3ae890c1b52d4':
The Android Open Source Project [Tue, 27 Nov 2012 16:21:40 +0000 (08:21 -0800)]
Merge jb-mr1-dev into aosp/master - do not merge
Change-Id: I07ffd44995f02108e9a981fd590e7e29ff813e7f
The Android Open Source Project [Tue, 27 Nov 2012 15:43:37 +0000 (07:43 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: If815fb1e8d064c7abb53ef05b81bb1495cfb7b2c
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
The Android Automerger [Mon, 26 Nov 2012 20:23:08 +0000 (12:23 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Mon, 26 Nov 2012 19:29:21 +0000 (11:29 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Baligh Uddin [Mon, 26 Nov 2012 17:40:09 +0000 (09:40 -0800)]
am
b1fdf6fd: am
75e09c30: am
40129973: (-s ours) Import translations. DO NOT MERGE
* commit '
b1fdf6fd74036a9f83adfaae93ee6b3e89481d35':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Nov 2012 17:38:44 +0000 (09:38 -0800)]
am
75e09c30: am
40129973: (-s ours) Import translations. DO NOT MERGE
* commit '
75e09c30a1b1eededc615d6dca319aab8ce40d2e':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Nov 2012 17:37:38 +0000 (09:37 -0800)]
am
089773ba: am
16a4c2b2: Import translations. DO NOT MERGE
* commit '
089773bacbc41032f85c02259d5bdb5f89502cce':
Import translations. DO NOT MERGE
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 [Mon, 26 Nov 2012 17:35:10 +0000 (09:35 -0800)]
am
16a4c2b2: Import translations. DO NOT MERGE
* commit '
16a4c2b2d38e2da6b26fc72029f9de0a1e282295':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Nov 2012 17:31:28 +0000 (09:31 -0800)]
am
e1dade77: Import translations. DO NOT MERGE
* commit '
e1dade77d86201cfc513b400b70f7dc5a7bc127b':
Import translations. DO NOT MERGE
Pawit Pornkitprasan [Fri, 23 Nov 2012 09:42:11 +0000 (16:42 +0700)]
Settings: fix storage measurement for device without emulated sdcard
StorageMeasurement: misc files should only be measured for internal
storage only if it is the emulated storage, otherwise misc count
for the primary storage will be erroneously duplicated on the
internal storage count.
StorageVolumePreferenceCategory:
- Always create mMountTogglePreference to avoid null pointer
exception for code that relies on it existing
- Check if the keys exist before calculating totalValues to
avoid null pointer exception on storage where media is not
calculated
- For available/readonly, set title, not summary (summary is
supposed to be the amount available)
Change-Id: Ib217f79ee562dffc514696fff038e58ed0dba7d9
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 [Fri, 23 Nov 2012 07:17:46 +0000 (23:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iab1d6346ddbe0fdfa02ad21f86ff7aea66e0ea0e
Auto-generated-cl: translation import
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
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
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
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
The Android Automerger [Tue, 20 Nov 2012 00:13:33 +0000 (16:13 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
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
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
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: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
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
Eric Laurent [Fri, 16 Nov 2012 22:05:00 +0000 (14:05 -0800)]
Merge "fix dock audio enable dialog" into jb-mr1.1-dev
The Android Automerger [Fri, 16 Nov 2012 19:29:50 +0000 (11:29 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
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
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
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: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
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
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: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
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
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: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.
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.
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.
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.
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:07:10 +0000 (09:07 -0800)]
am
68c7237a: am
3058022c: am
add9d21f: Import translations. DO NOT MERGE
* commit '
68c7237ace163222c7403a9d84d051e54f472a6e':
Import translations. DO NOT MERGE
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
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
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
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
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
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
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
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
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
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 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
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
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
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
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
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':
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
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
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':
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
OSDN Git Service
