Commit Graph

3321 Commits

Author SHA1 Message Date
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
Dianne Hackborn
c2543e8f4e am 883329ca: Fix issue #6603152: User-adjustable autobrightness broken?
* commit '883329ca1376054228ff67a923252121b5531265':
  Fix issue #6603152: User-adjustable autobrightness broken?
2012-06-04 15:53:06 -07:00
Dianne Hackborn
883329ca13 Fix issue #6603152: User-adjustable autobrightness broken?
Two issues:
- The new brightness was not being applied when switching out
  of auto-brightness mode.
- We were resetting to the last brightness level when switching
  modes.  This is because at that point we read the current
  brightness setting, but that isn't changed as the user adjusts
  only when the final value is committed.  To fix this, we have
  a new local variable keeping track of the last brightness value
  we have shown and use that when we haven't committed the
  brightness to settings.

Change-Id: I7cc02c9f90128eacec427587a3f6b8f25ede4bd3
2012-06-04 15:32:54 -07:00
Irfan Sheriff
54e599f3ce am 80497db4: am 98894ed4: Merge "Fix crash when accessibility is on" into jb-dev
* commit '80497db44479936391c8cc8e885240407a0ba372':
  Fix crash when accessibility is on
2012-06-04 12:05:37 -07:00
Irfan Sheriff
80497db444 am 98894ed4: Merge "Fix crash when accessibility is on" into jb-dev
* commit '98894ed4106222b79c7ca67d5b3995878e8ae98d':
  Fix crash when accessibility is on
2012-06-04 12:00:35 -07:00
Irfan Sheriff
15a279231f Fix crash when accessibility is on
Bug: 6600699
Change-Id: I9eb8b9871d1368bd7508873951d5719e1f2ba826
2012-06-04 10:22:43 -07:00
Irfan Sheriff
5afc87c6ba am 078f1325: am c26c2f22: Merge "Fetch peers after preferenceScreen is ready" into jb-dev
* commit '078f1325aa10de073112bdc38a2d78267318b5eb':
  Fetch peers after preferenceScreen is ready
2012-05-31 15:11:25 -07:00
Irfan Sheriff
078f1325aa am c26c2f22: Merge "Fetch peers after preferenceScreen is ready" into jb-dev
* commit 'c26c2f22042b676539f664002ec51ce78d276b62':
  Fetch peers after preferenceScreen is ready
2012-05-31 15:08:44 -07:00
Irfan Sheriff
c26c2f2204 Merge "Fetch peers after preferenceScreen is ready" into jb-dev 2012-05-31 15:04:53 -07:00
Irfan Sheriff
a9d76b3bcc Fetch peers after preferenceScreen is ready
Bug: 6450152
Change-Id: Ic95c7fdba5fa7cb54b0c54ed9a423e0e0683ad2f
2012-05-31 12:44:03 -07:00
Irfan Sheriff
f05811949f am 945a36f6: am 5388bc88: Merge "Fix poor network detection setting" into jb-dev
* commit '945a36f621a5406b20602dd4080fcd59f8a9950f':
  Fix poor network detection setting
2012-05-31 12:27:02 -07:00
Irfan Sheriff
945a36f621 am 5388bc88: Merge "Fix poor network detection setting" into jb-dev
* commit '5388bc88bdf045a461c52856e9bc2de9f1664acf':
  Fix poor network detection setting
2012-05-31 12:25:04 -07:00
Irfan Sheriff
5388bc88bd Merge "Fix poor network detection setting" into jb-dev 2012-05-31 12:22:30 -07:00
Irfan Sheriff
f0780a7cad Fix poor network detection setting
We used to base this on watchdog being turned on, but it should
be based on whether device is wifi only

Bug: 6576101
Change-Id: Ib5221287e6713c625d39ef986ceb278825fb4895
2012-05-31 11:15:41 -07:00