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

7203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
The Android Automerger
be8699deaf merge in jb-release history after reset to jb-dev 2012-06-12 11:24:53 -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
The Android Open Source Project
51ba25a8fa am d954de0a: Reconcile with jb-release 
* commit 'd954de0a4efe44149fc4304cf44a2704ddc5edac':
  Removing head turn and putting blink back
  Add back a SYNC_SETTINGS screen
 2012-06-11 09:25:47 -07:00
The Android Open Source Project
d954de0a4e Reconcile with jb-release 
Change-Id: I1fcdba335497346381c4b4a7d421698d0f44ba4b
 2012-06-11 09:22:45 -07:00
The Android Automerger
e8b6d5bf0e merge in jb-release history after reset to jb-dev 2012-06-11 07:04:18 -07:00
Youness Ghanim
532b11b481 Fixing pin_too_short text 
Made lockpassword_pin_too_short in sync with other pin
text lables.

Change-Id: Ia9295f7b36b29a3b4370e04461446a1428fc2ee2
 2012-06-11 13:45:20 +02:00
Danielle Millett
d7b5290ed1 Removing head turn and putting blink back 
Changing the strings and workflow in settings to be blink again
instead of the new head turn.  This basically undoes the following
two cls: I67c8acd4 and Ifc7b6e18.

Change-Id: I8694b1d82efac9d2f97c29128da6698b6ac2a4ce
 2012-06-08 15:52:10 -07:00
Amith Yamasani
7f6e66e596 am f595a2b8: am 450c4c86: Merge "Exit to Settings when removing the only account for a type." into jb-dev 
* commit 'f595a2b884794f4bfcb8c2d458eb2a4f73615514':
  Exit to Settings when removing the only account for a type.
 2012-06-08 15:35:45 -07:00
Eric Fischer
ac0195b58d am ab45c75a: (-s ours) am dba0f9f1: Import translations. DO NOT MERGE 
* commit 'ab45c75a3a91fae900e17204baf54e16532abf9f':
  Import translations. DO NOT MERGE
 2012-06-08 15:35:44 -07:00
Eric Fischer
4e1e07c3f7 am 32f94d01: am 1e7fa779: Add ID to copy translation from to string that is not translated yet. 
* commit '32f94d0160b246978b1201aca8920a926d733ba2':
  Add ID to copy translation from to string that is not translated yet.
 2012-06-08 15:35:44 -07:00
Amith Yamasani
f595a2b884 am 450c4c86: Merge "Exit to Settings when removing the only account for a type." into jb-dev 
* commit '450c4c86ca6583abc27520174d0f51b8f171f4a3':
  Exit to Settings when removing the only account for a type.
 2012-06-08 15:30:58 -07:00
Eric Fischer
ab45c75a3a am dba0f9f1: Import translations. DO NOT MERGE 
* commit 'dba0f9f196ad0498f8068b3696ace312af4b2680':
  Import translations. DO NOT MERGE
 2012-06-08 15:30:51 -07:00
Eric Fischer
32f94d0160 am 1e7fa779: Add ID to copy translation from to string that is not translated yet. 
* commit '1e7fa779f95a37cc9f47537afdd05763d253f2ce':
  Add ID to copy translation from to string that is not translated yet.
 2012-06-08 15:30:50 -07:00
Amith Yamasani
450c4c86ca Merge "Exit to Settings when removing the only account for a type." into jb-dev 2012-06-08 15:27:32 -07:00
Amith Yamasani
c8a9317649 Exit to Settings when removing the only account for a type. 
Skip over the ManageAccounts screen which shows the list of accounts
for a particular type, if there are no accounts there.

Bug: 6630827

Also fix text alignment in top-level of settings.

Change-Id: Icd446babc131e7052fc9e95514214fffe6e6e113
 2012-06-08 15:21:05 -07:00
Eric Fischer
dba0f9f196 Import translations. DO NOT MERGE 
Change-Id: I8964ab48dade7424b2957d1f7ec7f2d8b9fb0ae0
 2012-06-08 15:10:38 -07:00
Eric Fischer
1e7fa779f9 Add ID to copy translation from to string that is not translated yet. 
Change-Id: If2fcdeb8ea6fb10a5abb04f3f5e654c03332bd2e
 2012-06-08 15:06:30 -07:00
Danielle Millett
238be5dcdd am 59c2ca56: am acd37771: Merge "Removing head turn and putting blink back" into jb-dev 
* commit '59c2ca56cc0112d89f663337bbec1578a3bb543f':
  Removing head turn and putting blink back
 2012-06-08 14:21:49 -07:00
Danielle Millett
59c2ca56cc am acd37771: Merge "Removing head turn and putting blink back" into jb-dev 
* commit 'acd377718479fe0d4f093c2f2f5326e59e31ff63':
  Removing head turn and putting blink back
 2012-06-08 14:20:01 -07:00
Danielle Millett
acd3777184 Merge "Removing head turn and putting blink back" into jb-dev 2012-06-08 14:18:05 -07:00
Danielle Millett
4a3e40d68e Removing head turn and putting blink back 
Changing the strings and workflow in settings to be blink again
instead of the new head turn.  This basically undoes the following
two cls: I67c8acd4 and Ifc7b6e18.

Change-Id: I8694b1d82efac9d2f97c29128da6698b6ac2a4ce
 2012-06-08 16:49:29 -04:00
Jean-Baptiste Queru
d0784d962e am ce1a3acf: am 5a0b3230: Merge "Add account type check for invisible sync adapters." 
* commit 'ce1a3acf15ada0b44f428a7feedf5d25e9086278':
  Add account type check for invisible sync adapters.
 2012-06-08 08:24:23 -07:00
The Android Automerger
235ec865d1 merge in jb-release history after reset to jb-dev 2012-06-08 08:22:22 -07:00
Jean-Baptiste Queru
ce1a3acf15 am 5a0b3230: Merge "Add account type check for invisible sync adapters." 
* commit '5a0b3230e2a70c5837b35753fdd2ffd7536946f4':
  Add account type check for invisible sync adapters.
 2012-06-08 08:21:39 -07:00
Jean-Baptiste Queru
5a0b3230e2 Merge "Add account type check for invisible sync adapters." 2012-06-08 08:02:36 -07:00
Amith Yamasani
7af2f1171e am 6b65f138: am b3a049f5: Merge "Save the auto-sync dialog state for orientation changes" into jb-dev 
* commit '6b65f13862c8f40abcb450127c1ef997a68f1b2c':
  Save the auto-sync dialog state for orientation changes
 2012-06-08 00:07:17 -07:00
Amith Yamasani
6b65f13862 am b3a049f5: Merge "Save the auto-sync dialog state for orientation changes" into jb-dev 
* commit 'b3a049f5392da8500befaf2595f5170cf04cc432':
  Save the auto-sync dialog state for orientation changes
 2012-06-08 00:05:25 -07:00
Amith Yamasani
b3a049f539 Merge "Save the auto-sync dialog state for orientation changes" into jb-dev 2012-06-08 00:04:11 -07:00
Amith Yamasani
665235f6ef Save the auto-sync dialog state for orientation changes 
Bug: 6630421
Change-Id: I11447173483da499e23c5ce41c566fa988385e6b
 2012-06-07 19:58:34 -07:00
Amith Yamasani
ec5237a8d3 am b2f02a91: am cc993689: Merge "Directly go to account sync screen if there\'s only one account for that type." into jb-dev 
* commit 'b2f02a916e5a8fa6e4e42c52eda5dfeb05ba4cc3':
  Directly go to account sync screen if there's only one account for that type.
 2012-06-07 19:23:09 -07:00
Amith Yamasani
b2f02a916e am cc993689: Merge "Directly go to account sync screen if there\'s only one account for that type." into jb-dev 
* commit 'cc993689cfc507621aae8abfac6b851e37a5e484':
  Directly go to account sync screen if there's only one account for that type.
 2012-06-07 19:20:54 -07:00