Commit Graph

9304 Commits

Author SHA1 Message Date
Baligh Uddin
1fd5703d5e am e9f89cfb: am 7ed1879f: Import translations. DO NOT MERGE
* commit 'e9f89cfbf5309453e8efc2826815592660e9e1c2':
  Import translations. DO NOT MERGE
2012-11-16 18:02:20 -08:00
Baligh Uddin
e9f89cfbf5 am 7ed1879f: Import translations. DO NOT MERGE
* commit '7ed1879f283e4c92fe47ab345c5fdf405e95f233':
  Import translations. DO NOT MERGE
2012-11-16 17:59:01 -08:00
Baligh Uddin
7ed1879f28 Import translations. DO NOT MERGE
Change-Id: If48dc63e0112cc63e76b635047b38cde4b33ea06
Auto-generated-cl: translation import
2012-11-16 15:51:59 -08:00
Eric Laurent
4f103c0c1a am ccc1d614: am 15c27bb4: Merge "fix dock audio enable dialog" into jb-mr1.1-dev
* commit 'ccc1d614899459e2bb34ff977760bbb1cb225e95':
  fix dock audio enable dialog
2012-11-16 14:09:47 -08:00
Eric Laurent
ccc1d61489 am 15c27bb4: Merge "fix dock audio enable dialog" into jb-mr1.1-dev
* commit '15c27bb40bc493e898442e8e4ac9b52dd89dae58':
  fix dock audio enable dialog
2012-11-16 14:07:07 -08:00
Eric Laurent
15c27bb40b Merge "fix dock audio enable dialog" into jb-mr1.1-dev 2012-11-16 14:05:00 -08:00
The Android Automerger
eb63a1f228 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-16 11:29:50 -08:00
Amith Yamasani
21b5aacf34 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
2012-11-16 10:48:59 -08:00
Amith Yamasani
0aa79c7394 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
2012-11-16 10:45:44 -08:00
Amith Yamasani
6097726522 Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev 2012-11-16 10:43:04 -08:00
Amith Yamasani
5f05010438 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
2012-11-15 14:44:41 -08:00
Vikram Aggarwal
8761a0536b am 49a87243: am f15f9d67: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev
* commit '49a872436c660cff19c2cfd50d3de5b8bcb3a7ac':
  Remove back button entirely when disabled
2012-11-15 12:58:33 -08:00
Vikram Aggarwal
49a872436c am f15f9d67: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev
* commit 'f15f9d67652dacc7f8d2764245f79b25d2c6c67b':
  Remove back button entirely when disabled
2012-11-15 12:55:36 -08:00
Vikram Aggarwal
f15f9d6765 Merge "Remove back button entirely when disabled" into jb-mr1.1-dev 2012-11-15 12:53:25 -08:00
Amith Yamasani
f6c07cab36 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
2012-11-15 12:25:25 -08:00
Amith Yamasani
4c326c2d2d 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
2012-11-15 12:23:50 -08:00
Amith Yamasani
940f6f0c46 Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev 2012-11-15 12:21:31 -08:00
Jeff Sharkey
282aacb5c3 am 05407e77: am 733bd437: Merge "Internationalize bytes and percentages." into jb-mr1.1-dev
* commit '05407e77e060e8b62a197065538e44a2b0cf8e38':
  Internationalize bytes and percentages.
2012-11-15 11:50:11 -08:00
Jeff Sharkey
8f7d5cac7a am 1fde57fe: am 6992d407: Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev
* commit '1fde57fed5431b7d03764beed6cf201c55e70a24':
  Align "Make passwords visible" setting.
2012-11-15 11:50:10 -08:00
Jeff Sharkey
05407e77e0 am 733bd437: Merge "Internationalize bytes and percentages." into jb-mr1.1-dev
* commit '733bd43798c292b35d06b02fe3722a52481886a8':
  Internationalize bytes and percentages.
2012-11-15 11:47:37 -08:00
Jeff Sharkey
1fde57fed5 am 6992d407: Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev
* commit '6992d407760b1b5ed3744566c1d9bca9ae1a77be':
  Align "Make passwords visible" setting.
2012-11-15 11:47:35 -08:00
Jeff Sharkey
733bd43798 Merge "Internationalize bytes and percentages." into jb-mr1.1-dev 2012-11-15 11:44:44 -08:00
Jeff Sharkey
6992d40776 Merge "Align "Make passwords visible" setting." into jb-mr1.1-dev 2012-11-15 11:44:38 -08:00
Baligh Uddin
b8fc41ffee am 68c7237a: am 3058022c: am add9d21f: Import translations. DO NOT MERGE
* commit '68c7237ace163222c7403a9d84d051e54f472a6e':
  Import translations. DO NOT MERGE
2012-11-15 09:07:10 -08:00
Baligh Uddin
68c7237ace am 3058022c: am add9d21f: Import translations. DO NOT MERGE
* commit '3058022c169b04680cb48f143364ab799e75ee85':
  Import translations. DO NOT MERGE
2012-11-15 09:04:59 -08:00
Baligh Uddin
0d459d6e74 am 58a55157: am ec5c2a46: Import translations. DO NOT MERGE
* commit '58a551575915a73ffbb1b20066bf8c39c515aa1d':
  Import translations. DO NOT MERGE
2012-11-15 09:03:22 -08:00
Baligh Uddin
e11331c814 am 29483a53: Import translations. DO NOT MERGE
* commit '29483a5334360921f39694175daaaed57d68dd02':
  Import translations. DO NOT MERGE
2012-11-15 09:03:20 -08:00
Baligh Uddin
3058022c16 am add9d21f: Import translations. DO NOT MERGE
* commit 'add9d21f581272a957f8df4c9895d5c03515db13':
  Import translations. DO NOT MERGE
2012-11-15 09:02:00 -08:00
Baligh Uddin
58a5515759 am ec5c2a46: Import translations. DO NOT MERGE
* commit 'ec5c2a4603848cbf2027367b7942014f9fae48c5':
  Import translations. DO NOT MERGE
2012-11-15 09:01:30 -08:00
Jeff Sharkey
8ef71dbcbc Align "Make passwords visible" setting.
Bug: 7545894
Change-Id: I46113676c46055bd7468a0aa7289c9475e714232
2012-11-14 17:00:12 -08:00
Jeff Sharkey
f707491cfb Internationalize bytes and percentages.
Bug: 7545890
Change-Id: I634fafe9d61a2ebbf7a0cc56d8255457ee9fe1b2
2012-11-14 16:56:11 -08:00
Amith Yamasani
5cdc937251 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
2012-11-14 16:23:40 -08:00
Baligh Uddin
ec5c2a4603 Import translations. DO NOT MERGE
Change-Id: I42acdae7131e469b7f01371d33abf9fa7c92cc1d
Auto-generated-cl: translation import
2012-11-14 12:43:52 -08:00
Baligh Uddin
add9d21f58 Import translations. DO NOT MERGE
Change-Id: I4d8e15ea1297b2ec3efd3decd24629e4b6360e76
Auto-generated-cl: translation import
2012-11-14 12:41:58 -08:00
The Android Open Source Project
f83027c29e Reconcile with jb-mr1.1-release - do not merge
Change-Id: Idc625a7e75edb599c0223c45d868e34ea5de9774
2012-11-14 12:41:28 -08:00
Baligh Uddin
29483a5334 Import translations. DO NOT MERGE
Change-Id: I5c6c76ef1e388527b9ad204ca689d17ede0218ea
Auto-generated-cl: translation import
2012-11-14 12:40:01 -08:00
The Android Automerger
644a30ed1b merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-14 11:29:00 -08:00
Eric Laurent
9f4afb0762 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
2012-11-12 14:29:17 -08:00
Baligh Uddin
9cd44a18c7 am 3206fb2b: am 42d97684: am a0fbc220: Import translations. DO NOT MERGE
* commit '3206fb2bb2fff97db47f1eeb3e0e0b7025f7fada':
  Import translations. DO NOT MERGE
2012-11-09 22:45:13 -08:00
Baligh Uddin
3206fb2bb2 am 42d97684: am a0fbc220: Import translations. DO NOT MERGE
* commit '42d976842081d3e40cdc68774573fedd90f21575':
  Import translations. DO NOT MERGE
2012-11-09 22:42:02 -08:00
Baligh Uddin
0ae2c4225c am 7468d94e: Import translations. DO NOT MERGE
* commit '7468d94e31301ba3e0accb15cc26cd47438e1642':
  Import translations. DO NOT MERGE
2012-11-09 16:15:59 -08:00
Baligh Uddin
42d9768420 am a0fbc220: Import translations. DO NOT MERGE
* commit 'a0fbc220bb401f97103a0a22d14a45e33ca7a149':
  Import translations. DO NOT MERGE
2012-11-09 16:15:33 -08:00
Vikram Aggarwal
bf459dafdc Remove back button entirely when disabled
Bug: 7480506 Encryption screen shows back button
Change-Id: Iba2706fd6b61303178b472071f32d65bdf72e50d
2012-11-09 14:40:22 -08:00
Baligh Uddin
a0fbc220bb Import translations. DO NOT MERGE
Change-Id: I520c6d173124c8645fdfa2eb3db251f704c656c3
Auto-generated-cl: translation import
2012-11-09 11:53:40 -08:00
Baligh Uddin
7468d94e31 Import translations. DO NOT MERGE
Change-Id: Ia83d3a7041a3af738961ccf10bc96d540bc1f147
Auto-generated-cl: translation import
2012-11-09 11:51:15 -08:00
The Android Open Source Project
0c9b200b94 am fee1840f: am 15d91c6e: Reconcile with jb-mr1-release - do not merge
* commit 'fee1840f3d6d68c5f3d4e4ab9372305e154c64a9':
2012-11-08 15:47:52 -08:00
Michael Jurka
a5bb85e4f8 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
2012-11-08 15:47:42 -08:00
Michael Jurka
1f35075b5e am 80eed80e: am caf13b22: am a108d9fc: Final tweaks to visuals of widget picker
* commit '80eed80e3b048672ac09c297a4971e79dd480d45':
  Final tweaks to visuals of widget picker
2012-11-08 15:47:41 -08:00
Baligh Uddin
49be9660bf am 90ef462c: am 09256980: am c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '90ef462ca76a6c800feddc125badb6f483782b6e':
2012-11-08 15:43:47 -08:00
Baligh Uddin
3522253c4c am c25bfc07: am 4f1a0932: am 7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'c25bfc07af873793abb19fe95295aa8bf0cd2ebc':
  Import translations. DO NOT MERGE
2012-11-08 15:42:36 -08:00