PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,132 Commits 1 Branch 0 Tags
e147531fe8c8071e76d7b69e724b47ec2ca560ce
Commit Graph

7132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
e147531fe8 am aac5d9f6: (-s ours) am 5ea994c5: Import translations. DO NOT MERGE 
* commit 'aac5d9f60e71a0bf60b1de3efaa12ae27320629b':
  Import translations. DO NOT MERGE
 2012-06-14 14:49:07 -07:00
Eric Fischer
aac5d9f60e am 5ea994c5: Import translations. DO NOT MERGE 
* commit '5ea994c552ea72385022c0c81b8b69acbe30a113':
  Import translations. DO NOT MERGE
 2012-06-14 14:46:18 -07:00
Eric Fischer
6f395a5bda Merge "Import translations. DO NOT MERGE" 2012-06-14 13:58:24 -07:00
Eric Fischer
8d5509cd34 Import translations. DO NOT MERGE 
Change-Id: Ib3f37708c28402968d799deb4d918204457638d5
 2012-06-14 13:47:54 -07:00
Eric Fischer
5ea994c552 Import translations. DO NOT MERGE 
Change-Id: Ife956408e146ad876b860968dacd8f3095ed84e1
 2012-06-14 13:44:39 -07:00
Jean-Baptiste Queru
b3b10b2625 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
 2012-06-14 10:33:22 -07:00
Amith Yamasani
c6dc91e1fa 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.
 2012-06-14 10:33:05 -07:00
Eric Fischer
825710cd08 am 5b97798c: (-s ours) am 612a0c10: Import translations. DO NOT MERGE 
* commit '5b97798cbd2cad3448a9adec8f4cc249e95e5de7':
  Import translations. DO NOT MERGE
 2012-06-14 10:32:59 -07:00
Danielle Millett
cfe8c4b0cd 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
 2012-06-14 11:59:10 -04:00
Jean-Baptiste Queru
5cca2411fd 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
 2012-06-13 17:39:33 -07:00
Jean-Baptiste Queru
60ec22d1bd Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on" 2012-06-13 17:05:38 -07:00
Amith Yamasani
e5147e4933 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.
 2012-06-13 15:24:12 -07:00
Amith Yamasani
5b7a8204d8 Merge "Show only the language if there's only one locale for the language." into jb-dev 2012-06-13 15:21:29 -07:00
Eric Fischer
5b97798cbd am 612a0c10: Import translations. DO NOT MERGE 
* commit '612a0c106bc3991a074f6f15361b357494e70e62':
  Import translations. DO NOT MERGE
 2012-06-13 14:32:38 -07:00
Eric Fischer
149e352454 Import translations. DO NOT MERGE 
Change-Id: Ie64ad1c03c6f55e1e55adbf95fb87d39f03c90f8
 2012-06-13 14:20:54 -07:00
Eric Fischer
612a0c106b Import translations. DO NOT MERGE 
Change-Id: I8566dbced26846ce55861b5f57f95034d03604c2
 2012-06-13 14:17:44 -07:00
Amith Yamasani
140b6f5234 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
 2012-06-13 12:56:21 -07:00
Jeff Sharkey
df7375cb03 am c35b51f3: am cd4428ce: Storage banner when device in low disk state. 
* commit 'c35b51f3c7746c29672d15e1564b04103c8d32bf':
  Storage banner when device in low disk state.
 2012-06-12 18:57:04 -07:00
Jeff Sharkey
c35b51f3c7 am cd4428ce: Storage banner when device in low disk state. 
* commit 'cd4428ce2c03fd355a3093fad6553636da9cef9b':
  Storage banner when device in low disk state.
 2012-06-12 18:54:49 -07:00
Jeff Sharkey
cd4428ce2c Storage banner when device in low disk state. 
Bug: 6576409
Change-Id: I25f71935e312bf6efa832d10c22e3edbdc18f4fb
 2012-06-12 18:41:51 -07:00
Amith Yamasani
48fa857c92 UI to add a photo to a user's profile. 
Photo will be shown in user management screen and switcher.

Change-Id: Icc0a39487daae13530fc1741780fb42fee0dada4
 2012-06-12 18:18:40 -07:00
Jean-Baptiste Queru
98880c4638 am 99f27dc5: Merge "Swap start/stop of SettingsObserver and InputDeviceListener" into jb-dev-plus-aosp 
* commit '99f27dc554c7937bc1afbcae0c40e364d025ca2d':
  Swap start/stop of SettingsObserver and InputDeviceListener
 2012-06-12 16:00:33 -07:00
Jean-Baptiste Queru
99f27dc554 Merge "Swap start/stop of SettingsObserver and InputDeviceListener" into jb-dev-plus-aosp 2012-06-12 15:58:42 -07:00
Jean-Baptiste Queru
093cf6094c Swap start/stop of SettingsObserver and InputDeviceListener 
Change-Id: Ic6b7bab860f71889a6ec476ccab1e83d2efd0e64
 2012-06-12 15:43:17 -07:00
Jean-Baptiste Queru
4ce87f0c88 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
 2012-06-12 15:32:52 -07:00
Jean-Baptiste Queru
a658913475 Merge "resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp" into jb-dev-plus-aosp 2012-06-12 15:30:36 -07:00
Ying Wang
b120c17170 am 45e86987: (-s ours) am 292d7e3b: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '45e869874aaf90091be2f2fac5fcf9c73c36baee':
  Import translations. DO NOT MERGE
 2012-06-12 15:28:40 -07:00
Ying Wang
f7ab9852bc Merge "Import translations. DO NOT MERGE" 2012-06-12 15:28:32 -07:00
Ying Wang
4a5593b82c Import translations. DO NOT MERGE 
Change-Id: If59e97f6923cdfb445c233a5eb0a1c352a9fe93f
 2012-06-12 15:26:38 -07:00
Ying Wang
45e869874a am 292d7e3b: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '292d7e3b8135c93b2f71bb05be81ca71dd03add1':
  Import translations. DO NOT MERGE
 2012-06-12 15:26:30 -07:00
Ying Wang
292d7e3b81 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-12 15:24:15 -07:00
Jean-Baptiste Queru
89d702ac68 resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp 
Change-Id: I73165a3d77318cbb0271e0d5c64cc49caad8f693
 2012-06-12 15:22:22 -07:00
Ying Wang
db49ee9872 Import translations. DO NOT MERGE 
Change-Id: I3f7c3cd191375024cd5613b3d2b8e0c859c96928
 2012-06-12 15:21:39 -07:00
Russell Brenner
b0a40698cb am 8b16c219: am 3f9ec9f1: Merge "Disable notification alerts in Settings for SUW" into jb-dev 
* commit '8b16c219f08521996a393c46a386185bb96903c6':
  Disable notification alerts in Settings for SUW
 2012-06-12 14:53:05 -07:00
Jeff Brown
60763a445b am 77a6080a: am b5858bbd: Fix NPE in rotation lock content observer. 
* commit '77a6080aebc9754bff2307edc1998bd54657fbb5':
  Fix NPE in rotation lock content observer.
 2012-06-12 14:52:43 -07:00
Russell Brenner
8b16c219f0 am 3f9ec9f1: Merge "Disable notification alerts in Settings for SUW" into jb-dev 
* commit '3f9ec9f1c2744664ae637b9fbce99c115c60a429':
  Disable notification alerts in Settings for SUW
 2012-06-12 13:56:38 -07:00
Russell Brenner
3f9ec9f1c2 Merge "Disable notification alerts in Settings for SUW" into jb-dev 2012-06-12 13:53:31 -07:00
Jean-Baptiste Queru
051f46d798 Merge "Unregister ContentObserver in InputMethodAndLanguageSettings class" 2012-06-12 13:50:36 -07:00
Jeff Brown
77a6080aeb am b5858bbd: Fix NPE in rotation lock content observer. 
* commit 'b5858bbdc363e21bf87ac5643822ec9e57956c52':
  Fix NPE in rotation lock content observer.
 2012-06-12 13:16:04 -07:00
Eric Fischer
3792e7ec98 am ecb96401: (-s ours) am 00808b02: Import translations. DO NOT MERGE 
* commit 'ecb96401786c784eef8016625db80a7e2d3714f0':
  Import translations. DO NOT MERGE
 2012-06-12 13:15:05 -07:00
Jeff Brown
b5858bbdc3 Fix NPE in rotation lock content observer. 
Bug: 6647846
Change-Id: Idd17edb78f451807eabdd988017b68ce02b9c75f
 2012-06-12 12:57:11 -07:00
Eric Fischer
ecb9640178 am 00808b02: Import translations. DO NOT MERGE 
* commit '00808b0280d78d0930650e39eaf21a38915da5be':
  Import translations. DO NOT MERGE
 2012-06-12 12:42:09 -07:00
Shuhrat Dehkanov
9bcc607049 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>
 2012-06-13 03:20:38 +09:00
Russell Brenner
58d6ffc5f5 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
 2012-06-11 17:50:44 -07:00
Eric Fischer
f6e549dbb3 Merge "Import translations. DO NOT MERGE" 2012-06-11 13:32:39 -07:00
Eric Fischer
668415979b Import translations. DO NOT MERGE 
Change-Id: I3e12fee68296f3fc61306e008f86a09c4d342550
 2012-06-11 13:27:08 -07:00
Eric Fischer
00808b0280 Import translations. DO NOT MERGE 
Change-Id: I835b15b3d3081d5d9010ff91eb54b9cd6e6316bb
 2012-06-11 13:24:05 -07:00
Jean-Baptiste Queru
2a074a10e0 am 3e8035bc: am c56b0146: Merge "Fixing pin_too_short text" 
* commit '3e8035bcaff67d395481e3fb70ca2ad1d21cd3b5':
  Fixing pin_too_short text
 2012-06-11 12:06:30 -07:00
Jean-Baptiste Queru
3e8035bcaf am c56b0146: Merge "Fixing pin_too_short text" 
* commit 'c56b01460e7c83c8a21b02f411572ee69b755892':
  Fixing pin_too_short text
 2012-06-11 12:03:59 -07:00
Jean-Baptiste Queru
c56b01460e Merge "Fixing pin_too_short text" 2012-06-11 11:22:45 -07:00