Commit Graph

3536 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
b2c24e3dac am 6f5fe4d6: am ffa6f6e3: Merge "Add back a SYNC_SETTINGS screen" into jb-dev
* commit '6f5fe4d685b796328ec40066aa610c9a4ca72f5e':
  Add back a SYNC_SETTINGS screen
2012-06-07 11:11:18 -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
67aa924aae am ff8c12e5: am 6a5e0252: Merge "Implement new rotation policy." into jb-dev
* commit 'ff8c12e5604660a39a6a656fbb4a17ad798b1937':
  Implement new rotation policy.
2012-06-05 19:24:50 -07:00
Jeff Brown
189f88b022 am 4eb0bd40: am de4f8181: Merge "Revert "Settings: "Rotation lock" retains existing orientation."" into jb-dev
* commit '4eb0bd40d1426b361e6254230d61e81d86d220ca':
  Revert "Settings: "Rotation lock" retains existing orientation."
2012-06-05 19:24:48 -07:00
Jeff Brown
a95fd26fe3 am ebd1a3c5: am 977ff542: Merge "Revert "Rename and flip meaning of auto-rotate to rotation lock."" into jb-dev
* commit 'ebd1a3c5deca5953f4a7b31f325ab7888f88d620':
  Revert "Rename and flip meaning of auto-rotate to rotation lock."
2012-06-05 19:24:47 -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
5aae4667d4 am f766fa6a: am f4e1681d: Merge "Update headers when accounts are changed." into jb-dev
* commit 'f766fa6a820e5b0699faa419986fca3234517db5':
  Update headers when accounts are changed.
2012-06-05 15:08:51 -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
495c46b4ce am 227edcf6: am 03295520: Merge "Account types at toplevel of Settings" into jb-dev
* commit '227edcf61abaf91001d9061537d66e0aad64a4ee':
  Account types at toplevel of Settings
2012-06-05 09:21:32 -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
Amith Yamasani
0329552035 Merge "Account types at toplevel of Settings" into jb-dev 2012-06-04 18:02:34 -07:00
Amith Yamasani
d1ab82807a Account types at toplevel of Settings
Reorganized Account settings to show account types at the top-level
of Settings. Only account types that have accounts added are visible
here. There is an Add account button to add a new account.

Master sync toggle has moved to Data Usage screen in the overflow menu.
It shows additional detail of the function of the auto-sync toggle when
it is toggled by the user.

Account type screen (ManageAccountsSettings) shows list of accounts of
that type and any available authenticator settings. It additionally
verifies any Intents can be resolved before showing the corresponding
entry. This screen now shows last synced time for each account.

You can now sync all accounts of a type by selecting Sync now in the
Account type screen.

Account Sync screen that shows the list of syncable items has minor
tweaks:
 - "Last synced...", "Sync is OFF"
 - Doesn't show the authenticator settings here anymore.

Bug: 6579937

Change-Id: I8139a4c992b525a3e1efc24d2d223c3f5caddc76
2012-06-04 17:01:22 -07:00
Dianne Hackborn
21c5536fff am c2543e8f: am 883329ca: Fix issue #6603152: User-adjustable autobrightness broken?
* commit 'c2543e8f4e6c80ec506a72f96108b672b9fb4049':
  Fix issue #6603152: User-adjustable autobrightness broken?
2012-06-04 15:59:06 -07:00