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

7070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Amith Yamasani
cc993689cf Merge "Directly go to account sync screen if there's only one account for that type." into jb-dev 2012-06-07 19:18:50 -07:00
Eric Fischer
350079f59d am 8daa8bdd: (-s ours) am 51863136: Import translations. DO NOT MERGE 
* commit '8daa8bdd236c9094f7a70ce24f7a326e9e2332ba':
  Import translations. DO NOT MERGE
 2012-06-07 17:18:00 -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
Eric Fischer
8daa8bdd23 am 51863136: Import translations. DO NOT MERGE 
* commit '51863136957a636399b301100600bcfc4a59fb47':
  Import translations. DO NOT MERGE
 2012-06-07 16:31:26 -07:00
Eric Fischer
5936641372 Import translations. DO NOT MERGE 
Change-Id: I7e2f9f4cf85d1217c70388a7b2e9bfc1ab60f53d
 2012-06-07 15:14:15 -07:00
Eric Fischer
5186313695 Import translations. DO NOT MERGE 
Change-Id: I5c5f75c4980677fef82c64d83f3d7a37ae604cc3
 2012-06-07 15:12:24 -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
Amith Yamasani
ffa6f6e3e2 Merge "Add back a SYNC_SETTINGS screen" into jb-dev 2012-06-07 11:06:10 -07:00
The Android Open Source Project
f8473a7b7e am 709543b3: Reconcile with jb-release 
* commit '709543b36657adeb03eb9feab6d0acabfd59d8c7':
  Update headers when accounts are changed.
 2012-06-07 07:56:01 -07:00
The Android Open Source Project
709543b366 Reconcile with jb-release 
Change-Id: Iaeb1880d3f388c423e6fa8993fa375ae7c207ecf
 2012-06-07 07:51:30 -07:00
The Android Automerger
44d9b0f47b merge in jb-release history after reset to jb-dev 2012-06-07 07:04:26 -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
Philip Milne
9b059a10c7 am 0884f403: am ceb1ff2a: Merge "Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"" into jb-dev 
* commit '0884f4030367eaad14cbd8114c88624286cb4cfe':
  Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"
 2012-06-06 17:39:25 -07:00
Philip Milne
0884f40303 am ceb1ff2a: Merge "Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"" into jb-dev 
* commit 'ceb1ff2a5530ce921930b728fb6c4f5c0a8a08bf':
  Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"
 2012-06-06 17:36:51 -07:00
Philip Milne
ceb1ff2a55 Merge "Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"" into jb-dev 2012-06-06 17:34:39 -07:00
Eric Fischer
0c629dfbb5 am 2f050fd7: (-s ours) am ec71971c: Import translations. DO NOT MERGE 
* commit '2f050fd71ae79c0e253e8e16b59e64394af02070':
  Import translations. DO NOT MERGE
 2012-06-06 16:56:00 -07:00
Eric Fischer
2f050fd71a am ec71971c: Import translations. DO NOT MERGE 
* commit 'ec71971c34c61662ed25a8eaaaf8749e47d5bed5':
  Import translations. DO NOT MERGE
 2012-06-06 16:53:53 -07:00
Philip Milne
c00b4f29de Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding" 
Change-Id: I702b0d86c33b49854df5a65b398891183c3212cf
 2012-06-06 14:41:28 -07:00
Eric Fischer
0991f0ff20 Import translations. DO NOT MERGE 
Change-Id: I981ae5d2c0808645fc9262343b9146f2c67fac67
 2012-06-06 13:23:45 -07:00
Eric Fischer
ec71971c34 Import translations. DO NOT MERGE 
Change-Id: If466dfc20ff28bfb26b10214503200452c66ccea
 2012-06-06 13:21:25 -07:00
The Android Automerger
41dfcbd34b merge in jb-release history after reset to jb-dev 2012-06-06 07:04:27 -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