Christopher Tate
1b4a9b4107
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
2012-06-19 16:34:01 -07:00
Christopher Tate
5739d4fe02
Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
2012-06-19 16:31:11 -07:00
Christopher Tate
2d6497d2d1
Use string resources instead of literals for backup password confirmations
...
Localizability is good. Bug 6683158
Change-Id: I205e4a09f5137e18d4085fcc041fae86f26ab188
2012-06-19 16:22:55 -07:00
Amith Yamasani
f62df931fa
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
2012-06-19 16:01:50 -07:00
Amith Yamasani
1270eb5e43
Show full summary for network location sercice even for wifi-only devices
...
Bug: 6694051
Change-Id: Ic2446aa640bc2688fd74885eeb55f179c51e7691
2012-06-19 10:53:49 -07:00
Dianne Hackborn
2027328c7b
am 4d8dac07: Merge "Implement issue #6633077 : Improve permissions display for..." into jb-dev
...
* commit '4d8dac0792ec7994f9f4cbf2648cf8f3185876ca':
Implement issue #6633077 : Improve permissions display for...
2012-06-18 10:33:07 -07:00
Dianne Hackborn
fe5a72dae2
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...
2012-06-18 10:33:00 -07:00
Dianne Hackborn
4d8dac0792
Merge "Implement issue #6633077 : Improve permissions display for..." into jb-dev
2012-06-15 17:53:40 -07:00
Dianne Hackborn
f34a8d7517
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
2012-06-15 17:07:14 -07:00
Dianne Hackborn
e458832c76
Implement issue #6633077 : Improve permissions display for...
...
...inherited permissions from shared UIDs
Bug: 6633077
Change-Id: I91917339e83b79a3dfcfcb70a68d571c9a7f7e14
2012-06-15 11:00:17 -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
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
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
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
89d702ac68
resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp
...
Change-Id: I73165a3d77318cbb0271e0d5c64cc49caad8f693
2012-06-12 15:22:22 -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
Jeff Brown
b5858bbdc3
Fix NPE in rotation lock content observer.
...
Bug: 6647846
Change-Id: Idd17edb78f451807eabdd988017b68ce02b9c75f
2012-06-12 12:57:11 -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
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
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
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
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
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
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
Amith Yamasani
3882c2e215
Directly go to account sync screen if there's only one account for that type.
...
Bug: 6629330
Change-Id: Ieb2bad131b1580a6b75d970c9a0ea9980580f66d
2012-06-07 17:03:20 -07:00
Amith Yamasani
6f5fe4d685
am ffa6f6e3: Merge "Add back a SYNC_SETTINGS screen" into jb-dev
...
* commit 'ffa6f6e3e260dad0e7f75f6e8daa892eeed8df92':
Add back a SYNC_SETTINGS screen
2012-06-07 11:08:59 -07:00
Zhenguo Fu
193821e6e8
Add account type check for invisible sync adapters.
...
The invisible sync adapters array is modified to
store the sync adapters instead of their authorities,
so that "Sync now" function will only synchronize
those with the same account type as the current
account.
Change-Id: If9b0b32db9828d8671f57a0d7a2f64712a7ebabf
2012-06-07 14:42:28 +02:00
Amith Yamasani
86708a8a6d
Add back a SYNC_SETTINGS screen
...
Revive the old Accounts&Sync screen as a dialog with the auto-sync
checkbox and a list of accounts. This will be launched when Apps
request a SYNC_SETTINGS page for controlling account and master sync.
Auto-sync data checkbox will also continue to exist in Data Usage.
Minor fixes to account list and account update monitoring.
Bug: 6614013
Bug: 6622995
Bug: 6610247
Change-Id: I35c0919a29c6bc7e5edf64f2734a3ef4f5ae5e7a
2012-06-06 20:55:40 -07:00
Jeff Brown
ff8c12e560
am 6a5e0252: Merge "Implement new rotation policy." into jb-dev
...
* commit '6a5e0252ce383654e304ffd0bca09ced0cadc0a3':
Implement new rotation policy.
2012-06-05 19:18:18 -07:00
Jeff Brown
4eb0bd40d1
am de4f8181: Merge "Revert "Settings: "Rotation lock" retains existing orientation."" into jb-dev
...
* commit 'de4f8181329441dd57d7402d58de8f314d1757a3':
Revert "Settings: "Rotation lock" retains existing orientation."
2012-06-05 19:18:15 -07:00
Jeff Brown
ebd1a3c5de
am 977ff542: Merge "Revert "Rename and flip meaning of auto-rotate to rotation lock."" into jb-dev
...
* commit '977ff5426d4941c3a190cc55388c89edbd7a1e60':
Revert "Rename and flip meaning of auto-rotate to rotation lock."
2012-06-05 19:18:14 -07:00
Jeff Brown
6a5e0252ce
Merge "Implement new rotation policy." into jb-dev
2012-06-05 19:11:42 -07:00
Jeff Brown
de4f818132
Merge "Revert "Settings: "Rotation lock" retains existing orientation."" into jb-dev
2012-06-05 19:11:37 -07:00
Jeff Brown
977ff5426d
Merge "Revert "Rename and flip meaning of auto-rotate to rotation lock."" into jb-dev
2012-06-05 19:11:32 -07:00
Jeff Brown
10fbf52ccb
Implement new rotation policy.
...
Show "auto-rotate screen" option in Display only if the Rotation Lock
feature is not available on the device.
When the "auto-rotate screen" option is disabled in Accessibility or
Display settings, hide the Rotation Lock feature.
Use new RotationPolicy class to adjust rotation settings.
Bug: 6523269
Change-Id: Ifa89ff055e5ad0a00888e10720dd76b0054fe290
2012-06-05 17:53:35 -07:00
Jeff Brown
62a6f626da
Revert "Settings: "Rotation lock" retains existing orientation."
...
Bug: 6523269
This reverts commit 523d5a6e04 .
2012-06-05 17:45:35 -07:00
Jeff Brown
56c58d5aef
Revert "Rename and flip meaning of auto-rotate to rotation lock."
...
Bug: 6523269
This reverts commit b944171092 .
2012-06-05 17:45:07 -07:00
Justin Ho
f766fa6a82
am f4e1681d: Merge "Update headers when accounts are changed." into jb-dev
...
* commit 'f4e1681d77c8b6593937be94d6a9c1fdda642957':
Update headers when accounts are changed.
2012-06-05 15:06:37 -07:00
Amith Yamasani
56821dbeaa
Update headers when accounts are changed.
...
Also pass an account to authenticator settings to avoid Email settings crash.
Bug: 6610990
Change-Id: I42884619728dd97446de65cc77e1729f3e143efa
2012-06-05 14:28:17 -07:00
Amith Yamasani
227edcf61a
am 03295520: Merge "Account types at toplevel of Settings" into jb-dev
...
* commit '03295520359e06013d77387979a182845a2b1f1b':
Account types at toplevel of Settings
2012-06-04 18:05:35 -07:00