OSDN Git Service
Ying Wang [Wed, 20 Jun 2012 20:57:24 +0000 (13:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3be9db85a08ed44c5559348bdc36468310077326
The Android Open Source Project [Wed, 20 Jun 2012 15:31:45 +0000 (08:31 -0700)]
The Android Open Source Project [Wed, 20 Jun 2012 15:26:04 +0000 (08:26 -0700)]
Reconcile with jb-release
Change-Id: I84c9b6e4663448275a78cab4ea14f4952b440c8f
The Android Automerger [Wed, 20 Jun 2012 14:04:02 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Christopher Tate [Tue, 19 Jun 2012 23:36:24 +0000 (16:36 -0700)]
am
1b4a9b41: am
5739d4fe: Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
* commit '
1b4a9b4107c1d6ba5b2ecf5657865acc24a28686':
Use string resources instead of literals for backup password confirmations
Christopher Tate [Tue, 19 Jun 2012 23:34:01 +0000 (16:34 -0700)]
am
5739d4fe: Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
* commit '
5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f':
Use string resources instead of literals for backup password confirmations
Christopher Tate [Tue, 19 Jun 2012 23:31:11 +0000 (16:31 -0700)]
Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
Eric Fischer [Tue, 19 Jun 2012 23:28:33 +0000 (16:28 -0700)]
am
e5d2b8b8: (-s ours) am
f4a4119e: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
e5d2b8b8ab0d9968c976f584917481f46995f65c':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 19 Jun 2012 23:26:22 +0000 (16:26 -0700)]
am
f4a4119e: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
f4a4119eeaed1a99c082f253174b8acbca07c4c2':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 19 Jun 2012 23:23:45 +0000 (16:23 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Tue, 19 Jun 2012 23:23:23 +0000 (16:23 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Christopher Tate [Tue, 19 Jun 2012 22:44:15 +0000 (15:44 -0700)]
Use string resources instead of literals for backup password confirmations
Localizability is good. Bug
6683158
Change-Id: I205e4a09f5137e18d4085fcc041fae86f26ab188
Eric Fischer [Tue, 19 Jun 2012 23:04:37 +0000 (16:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: If94d32af0adb4eb24b5ff10f3555fd2b7cd0fdd2
Amith Yamasani [Tue, 19 Jun 2012 23:03:33 +0000 (16:03 -0700)]
am
f62df931: am
8e1981cc: Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev
* commit '
f62df931faefaece80059af39742f123e8d7f4e9':
Show full summary for network location sercice even for wifi-only devices
Amith Yamasani [Tue, 19 Jun 2012 23:01:50 +0000 (16:01 -0700)]
am
8e1981cc: Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev
* commit '
8e1981ccd314bf3e41601314e78cc9626a4299af':
Show full summary for network location sercice even for wifi-only devices
Eric Fischer [Tue, 19 Jun 2012 23:01:49 +0000 (16:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I097248fa64ec4f5d75ca4ddda3a17d49c29647a7
Amith Yamasani [Tue, 19 Jun 2012 22:59:48 +0000 (15:59 -0700)]
Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev
Amith Yamasani [Tue, 19 Jun 2012 17:53:49 +0000 (10:53 -0700)]
Show full summary for network location sercice even for wifi-only devices
Bug:
6694051
Change-Id: Ic2446aa640bc2688fd74885eeb55f179c51e7691
The Android Open Source Project [Tue, 19 Jun 2012 14:20:39 +0000 (07:20 -0700)]
The Android Open Source Project [Tue, 19 Jun 2012 14:16:03 +0000 (07:16 -0700)]
Reconcile with jb-release
Change-Id: I2b3e50f3304a3e5bd0e23e70b30db6e10d546f1c
The Android Automerger [Tue, 19 Jun 2012 14:05:23 +0000 (07:05 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Tue, 19 Jun 2012 13:16:13 +0000 (06:16 -0700)]
The Android Open Source Project [Tue, 19 Jun 2012 13:13:55 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: Ia9498cdf747581bb837e57129b89c4f1e6e15a6f
Ying Wang [Mon, 18 Jun 2012 21:55:09 +0000 (14:55 -0700)]
am
922eed65: (-s ours) am
fae5978e: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
922eed658a954c35cb3bef6f8986f7ac4f9451c5':
Import translations. DO NOT MERGE
Ying Wang [Mon, 18 Jun 2012 21:53:11 +0000 (14:53 -0700)]
am
fae5978e: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
fae5978e4a89aa2b8e6a9e1cf95c910a0609923a':
Import translations. DO NOT MERGE
Ying Wang [Mon, 18 Jun 2012 21:51:26 +0000 (14:51 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Mon, 18 Jun 2012 21:51:13 +0000 (14:51 -0700)]
Merge "Import translations. DO NOT MERGE"
Ying Wang [Mon, 18 Jun 2012 21:44:02 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I899bf73fbcdeb84593fafd2b29953577034458e5
Ying Wang [Mon, 18 Jun 2012 21:40:20 +0000 (14:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8ba16c5a7895850d429ae355bf2c27e384bb248e
Jim Miller [Mon, 18 Jun 2012 20:23:25 +0000 (13:23 -0700)]
am
4a3435f8: am
284c9872: Merge "Fix
6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev
* commit '
4a3435f86ee0dda6b824810ce439509cb61a8721':
Fix
6663465: remove flagNoEnterAction in favor of actionNext
Jim Miller [Mon, 18 Jun 2012 20:22:05 +0000 (13:22 -0700)]
am
284c9872: Merge "Fix
6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev
* commit '
284c9872cea3a5d97e1b1dd0016ac376da695175':
Fix
6663465: remove flagNoEnterAction in favor of actionNext
Jim Miller [Mon, 18 Jun 2012 20:19:42 +0000 (13:19 -0700)]
Merge "Fix
6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev
Dianne Hackborn [Mon, 18 Jun 2012 17:52:33 +0000 (10:52 -0700)]
am
2027328c: am
4d8dac07: Merge "Implement issue #
6633077: Improve permissions display for..." into jb-dev
* commit '
2027328c7bca44ff6a0dc8c2ff64a8af052f4ea2':
Implement issue #
6633077: Improve permissions display for...
Dianne Hackborn [Mon, 18 Jun 2012 17:52:33 +0000 (10:52 -0700)]
am
fe5a72da: am
ed99a81e: Merge "Fix issue #
6664140: Time to lock should work even Stay awake..." into jb-dev
* commit '
fe5a72dae2e7abc985b90641945e754492a20b67':
Fix issue #
6664140: Time to lock should work even Stay awake...
Ying Wang [Mon, 18 Jun 2012 17:52:32 +0000 (10:52 -0700)]
am
7622ce29: (-s ours) am
9d6d89ef: Import translations. DO NOT MERGE
* commit '
7622ce295543b9275fd18da1e2b66f8dff448d33':
Import translations. DO NOT MERGE
Dianne Hackborn [Mon, 18 Jun 2012 17:33:07 +0000 (10:33 -0700)]
am
4d8dac07: Merge "Implement issue #
6633077: Improve permissions display for..." into jb-dev
* commit '
4d8dac0792ec7994f9f4cbf2648cf8f3185876ca':
Implement issue #
6633077: Improve permissions display for...
Dianne Hackborn [Mon, 18 Jun 2012 17:33:00 +0000 (10:33 -0700)]
am
ed99a81e: Merge "Fix issue #
6664140: Time to lock should work even Stay awake..." into jb-dev
* commit '
ed99a81e1595c25d7070866ee0c2aa1d94103955':
Fix issue #
6664140: Time to lock should work even Stay awake...
Ying Wang [Mon, 18 Jun 2012 17:32:07 +0000 (10:32 -0700)]
am
9d6d89ef: Import translations. DO NOT MERGE
* commit '
9d6d89ef82f07ef54238699619d4875c4f2ae833':
Import translations. DO NOT MERGE
The Android Automerger [Sat, 16 Jun 2012 14:04:45 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Jim Miller [Sat, 16 Jun 2012 00:56:49 +0000 (17:56 -0700)]
Fix
6663465: remove flagNoEnterAction in favor of actionNext
This fixes a bug where the return key was showing in some layouts
for choose/confirm password screens in Settings. Now we just use
"actionNext" which ensures we see consistent behavior across
devices.
Change-Id: I4bf3033654b85f14c55de6f418caaf1ce563c33a
Dianne Hackborn [Sat, 16 Jun 2012 00:53:40 +0000 (17:53 -0700)]
Merge "Implement issue #
6633077: Improve permissions display for..." into jb-dev
Dianne Hackborn [Sat, 16 Jun 2012 00:23:55 +0000 (17:23 -0700)]
Merge "Fix issue #
6664140: Time to lock should work even Stay awake..." into jb-dev
Dianne Hackborn [Sat, 16 Jun 2012 00:07:14 +0000 (17:07 -0700)]
Fix issue #
6664140: Time to lock should work even Stay awake...
...in Developer options is on
Disable the stay awake while on option in settings if a lock limit
is being enforced.
Bug:
6664140
Change-Id: I8da1b8c734ceef10662d33392609c35e645315c3
Nick Pelly [Fri, 15 Jun 2012 23:56:06 +0000 (16:56 -0700)]
Merge "Include WIFI scan time in per-application power usage summary."
Nick Pelly [Mon, 11 Jun 2012 19:38:11 +0000 (12:38 -0700)]
Include WIFI scan time in per-application power usage summary.
Also, improve logging to more easily show power break-down for
each UID.
Bug:
6642581
Change-Id: Ib36f4bf9c8c579797225cf887e5b2d323cca61b0
Ying Wang [Fri, 15 Jun 2012 21:36:14 +0000 (14:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3311d40c77570583a5c1d26acf89dc9e544300ff
Ying Wang [Fri, 15 Jun 2012 21:33:14 +0000 (14:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I861590828a57951c72001e0c6c6ab2222be320c8
Dianne Hackborn [Fri, 15 Jun 2012 18:00:17 +0000 (11:00 -0700)]
Implement issue #
6633077: Improve permissions display for...
...inherited permissions from shared UIDs
Bug:
6633077
Change-Id: I91917339e83b79a3dfcfcb70a68d571c9a7f7e14
Eric Fischer [Thu, 14 Jun 2012 21:49:07 +0000 (14:49 -0700)]
am
aac5d9f6: (-s ours) am
5ea994c5: Import translations. DO NOT MERGE
* commit '
aac5d9f60e71a0bf60b1de3efaa12ae27320629b':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 14 Jun 2012 21:46:18 +0000 (14:46 -0700)]
am
5ea994c5: Import translations. DO NOT MERGE
* commit '
5ea994c552ea72385022c0c81b8b69acbe30a113':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 14 Jun 2012 20:58:24 +0000 (13:58 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 14 Jun 2012 20:47:54 +0000 (13:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib3f37708c28402968d799deb4d918204457638d5
Eric Fischer [Thu, 14 Jun 2012 20:44:39 +0000 (13:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife956408e146ad876b860968dacd8f3095ed84e1
Jean-Baptiste Queru [Thu, 14 Jun 2012 17:33:22 +0000 (10:33 -0700)]
am
5cca2411: am
60ec22d1: (-s ours) Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on"
* commit '
5cca2411fd83f59417be7792800d2f69bdc23a63':
Settings: Fixed German translation for turning WLAN/Bluetooth on
Amith Yamasani [Thu, 14 Jun 2012 17:33:05 +0000 (10:33 -0700)]
am
e5147e49: am
5b7a8204: Merge "Show only the language if there\'s only one locale for the language." into jb-dev
* commit '
e5147e4933e61c762f63b115e41c5aa8a2e37bd4':
Show only the language if there's only one locale for the language.
Eric Fischer [Thu, 14 Jun 2012 17:32:59 +0000 (10:32 -0700)]
am
5b97798c: (-s ours) am
612a0c10: Import translations. DO NOT MERGE
* commit '
5b97798cbd2cad3448a9adec8f4cc249e95e5de7':
Import translations. DO NOT MERGE
Danielle Millett [Thu, 14 Jun 2012 15:59:10 +0000 (11:59 -0400)]
Fix
6654057: Fixing crash if device is rotated during confirm password
In onActivityResult, mBiometricWeakLiveliness can be null if the device was rotated
during confirm password. To fix this, the line accessing mBiometricWeakLiveliness can
safely be removed. It's unnecessary because when onActivityResult finishes, onResume is
always called when it displays the security settings again. Since onResume sets the
checkmark value based on the stored value in lockPatternUtils, the check mark will always
show the correct value when settings is displayed.
Change-Id: Idba9ae1d829911a9581bb6678c4d1f3b44784c63
The Android Automerger [Thu, 14 Jun 2012 14:04:26 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Jean-Baptiste Queru [Thu, 14 Jun 2012 00:39:33 +0000 (17:39 -0700)]
am
60ec22d1: (-s ours) Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on"
* commit '
60ec22d1bdaa6124311a720717e3c522f839441e':
Settings: Fixed German translation for turning WLAN/Bluetooth on
Jean-Baptiste Queru [Thu, 14 Jun 2012 00:05:38 +0000 (17:05 -0700)]
Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on"
Amith Yamasani [Wed, 13 Jun 2012 22:24:12 +0000 (15:24 -0700)]
am
5b7a8204: Merge "Show only the language if there\'s only one locale for the language." into jb-dev
* commit '
5b7a8204d875c901782ff482b68fde8da7a0081f':
Show only the language if there's only one locale for the language.
Amith Yamasani [Wed, 13 Jun 2012 22:21:29 +0000 (15:21 -0700)]
Merge "Show only the language if there's only one locale for the language." into jb-dev
Eric Fischer [Wed, 13 Jun 2012 21:32:38 +0000 (14:32 -0700)]
am
612a0c10: Import translations. DO NOT MERGE
* commit '
612a0c106bc3991a074f6f15361b357494e70e62':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 13 Jun 2012 21:20:54 +0000 (14:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie64ad1c03c6f55e1e55adbf95fb87d39f03c90f8
Eric Fischer [Wed, 13 Jun 2012 21:17:44 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8566dbced26846ce55861b5f57f95034d03604c2
Amith Yamasani [Wed, 13 Jun 2012 03:06:55 +0000 (20:06 -0700)]
Show only the language if there's only one locale for the language.
If the system has only one instance of that language, then only show the language
without the country name.
Bug:
6522572
Change-Id: I1e99182b1c669b200090f6c360bb902376b63ab0
The Android Automerger [Wed, 13 Jun 2012 15:46:49 +0000 (08:46 -0700)]
merge in jb-release history after reset to jb-dev
Jeff Sharkey [Wed, 13 Jun 2012 01:57:04 +0000 (18:57 -0700)]
am
c35b51f3: am
cd4428ce: Storage banner when device in low disk state.
* commit '
c35b51f3c7746c29672d15e1564b04103c8d32bf':
Storage banner when device in low disk state.
Jeff Sharkey [Wed, 13 Jun 2012 01:54:49 +0000 (18:54 -0700)]
am
cd4428ce: Storage banner when device in low disk state.
* commit '
cd4428ce2c03fd355a3093fad6553636da9cef9b':
Storage banner when device in low disk state.
Jeff Sharkey [Wed, 13 Jun 2012 00:13:12 +0000 (17:13 -0700)]
Storage banner when device in low disk state.
Bug:
6576409
Change-Id: I25f71935e312bf6efa832d10c22e3edbdc18f4fb
Amith Yamasani [Wed, 18 Apr 2012 00:12:01 +0000 (17:12 -0700)]
UI to add a photo to a user's profile.
Photo will be shown in user management screen and switcher.
Change-Id: Icc0a39487daae13530fc1741780fb42fee0dada4
Jean-Baptiste Queru [Tue, 12 Jun 2012 23:00:33 +0000 (16:00 -0700)]
am
99f27dc5: Merge "Swap start/stop of SettingsObserver and InputDeviceListener" into jb-dev-plus-aosp
* commit '
99f27dc554c7937bc1afbcae0c40e364d025ca2d':
Swap start/stop of SettingsObserver and InputDeviceListener
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:58:42 +0000 (15:58 -0700)]
Merge "Swap start/stop of SettingsObserver and InputDeviceListener" into jb-dev-plus-aosp
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:43:17 +0000 (15:43 -0700)]
Swap start/stop of SettingsObserver and InputDeviceListener
Change-Id: Ic6b7bab860f71889a6ec476ccab1e83d2efd0e64
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:32:52 +0000 (15:32 -0700)]
am
a6589134: Merge "resolved conflicts for merge of
051f46d7 to jb-dev-plus-aosp" into jb-dev-plus-aosp
* commit '
a65891347556b4d14f6dad829017513b984d20c1':
Unregister ContentObserver in InputMethodAndLanguageSettings class
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:30:36 +0000 (15:30 -0700)]
Merge "resolved conflicts for merge of
051f46d7 to jb-dev-plus-aosp" into jb-dev-plus-aosp
Ying Wang [Tue, 12 Jun 2012 22:28:40 +0000 (15:28 -0700)]
am
45e86987: (-s ours) am
292d7e3b: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
45e869874aaf90091be2f2fac5fcf9c73c36baee':
Import translations. DO NOT MERGE
Ying Wang [Tue, 12 Jun 2012 22:28:32 +0000 (15:28 -0700)]
Merge "Import translations. DO NOT MERGE"
Ying Wang [Tue, 12 Jun 2012 22:26:38 +0000 (15:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: If59e97f6923cdfb445c233a5eb0a1c352a9fe93f
Ying Wang [Tue, 12 Jun 2012 22:26:30 +0000 (15:26 -0700)]
am
292d7e3b: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
292d7e3b8135c93b2f71bb05be81ca71dd03add1':
Import translations. DO NOT MERGE
Ying Wang [Tue, 12 Jun 2012 22:24:15 +0000 (15:24 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:22:22 +0000 (15:22 -0700)]
resolved conflicts for merge of
051f46d7 to jb-dev-plus-aosp
Change-Id: I73165a3d77318cbb0271e0d5c64cc49caad8f693
Ying Wang [Tue, 12 Jun 2012 22:21:39 +0000 (15:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f7c3cd191375024cd5613b3d2b8e0c859c96928
Russell Brenner [Tue, 12 Jun 2012 21:53:05 +0000 (14:53 -0700)]
am
8b16c219: am
3f9ec9f1: Merge "Disable notification alerts in Settings for SUW" into jb-dev
* commit '
8b16c219f08521996a393c46a386185bb96903c6':
Disable notification alerts in Settings for SUW
Jeff Brown [Tue, 12 Jun 2012 21:52:43 +0000 (14:52 -0700)]
am
77a6080a: am
b5858bbd: Fix NPE in rotation lock content observer.
* commit '
77a6080aebc9754bff2307edc1998bd54657fbb5':
Fix NPE in rotation lock content observer.
Russell Brenner [Tue, 12 Jun 2012 20:56:38 +0000 (13:56 -0700)]
am
3f9ec9f1: Merge "Disable notification alerts in Settings for SUW" into jb-dev
* commit '
3f9ec9f1c2744664ae637b9fbce99c115c60a429':
Disable notification alerts in Settings for SUW
Russell Brenner [Tue, 12 Jun 2012 20:53:31 +0000 (13:53 -0700)]
Merge "Disable notification alerts in Settings for SUW" into jb-dev
Jean-Baptiste Queru [Tue, 12 Jun 2012 20:50:36 +0000 (13:50 -0700)]
Merge "Unregister ContentObserver in InputMethodAndLanguageSettings class"
Jeff Brown [Tue, 12 Jun 2012 20:16:04 +0000 (13:16 -0700)]
am
b5858bbd: Fix NPE in rotation lock content observer.
* commit '
b5858bbdc363e21bf87ac5643822ec9e57956c52':
Fix NPE in rotation lock content observer.
Eric Fischer [Tue, 12 Jun 2012 20:15:05 +0000 (13:15 -0700)]
am
ecb96401: (-s ours) am
00808b02: Import translations. DO NOT MERGE
* commit '
ecb96401786c784eef8016625db80a7e2d3714f0':
Import translations. DO NOT MERGE
Jeff Brown [Tue, 12 Jun 2012 19:57:11 +0000 (12:57 -0700)]
Fix NPE in rotation lock content observer.
Bug:
6647846
Change-Id: Idd17edb78f451807eabdd988017b68ce02b9c75f
Eric Fischer [Tue, 12 Jun 2012 19:42:09 +0000 (12:42 -0700)]
am
00808b02: Import translations. DO NOT MERGE
* commit '
00808b0280d78d0930650e39eaf21a38915da5be':
Import translations. DO NOT MERGE
The Android Automerger [Tue, 12 Jun 2012 18:24:53 +0000 (11:24 -0700)]
merge in jb-release history after reset to jb-dev
Shuhrat Dehkanov [Sat, 19 May 2012 14:13:33 +0000 (23:13 +0900)]
Unregister ContentObserver in InputMethodAndLanguageSettings class
A content observer (SettingsObserver) is registered when
InputMethodAndLanguageSettings is created, but it is never unregistered.
Added resume() and pause() methods to SettingsObserver inner class
to register/unregister the content observer when InputMethodAndLanguageSettings
is resumed/paused.
Change-Id: I6d4cc2625a5fd8435967d930f46e8fe86eda4714
Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com>
Russell Brenner [Thu, 7 Jun 2012 22:37:04 +0000 (15:37 -0700)]
Disable notification alerts in Settings for SUW
When activated by Setup Wizard, disable notification alerts and other
status bar flags as also done by Setup Wizard and GSF.
Bug:
6645469
Change-Id: I43ef5c2a5fa3f53434a1aaa968de50d91b0d78ce
Eric Fischer [Mon, 11 Jun 2012 20:32:39 +0000 (13:32 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Mon, 11 Jun 2012 20:27:08 +0000 (13:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3e12fee68296f3fc61306e008f86a09c4d342550
Eric Fischer [Mon, 11 Jun 2012 20:24:05 +0000 (13:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I835b15b3d3081d5d9010ff91eb54b9cd6e6316bb
Jean-Baptiste Queru [Mon, 11 Jun 2012 19:06:30 +0000 (12:06 -0700)]
am
3e8035bc: am
c56b0146: Merge "Fixing pin_too_short text"
* commit '
3e8035bcaff67d395481e3fb70ca2ad1d21cd3b5':
Fixing pin_too_short text
Jean-Baptiste Queru [Mon, 11 Jun 2012 19:03:59 +0000 (12:03 -0700)]
am
c56b0146: Merge "Fixing pin_too_short text"
* commit '
c56b01460e7c83c8a21b02f411572ee69b755892':
Fixing pin_too_short text
OSDN Git Service
