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
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
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
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
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
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
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
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
Andrew Flynn
758ce006e5
am ab88256f
: am ab049a19
: Increase dimens for power control widget for sw600dp
...
* commit 'ab88256fd2f2c36c4595a5e36d6cc07383ce5935':
Increase dimens for power control widget for sw600dp
2012-06-05 15:04:49 -07:00
Andrew Flynn
ab88256fd2
am ab049a19
: Increase dimens for power control widget for sw600dp
...
* commit 'ab049a196bf6a5ced45467810e38c6e33a1b4a82':
Increase dimens for power control widget for sw600dp
2012-06-05 15:02:27 -07:00
Andrew Flynn
ab049a196b
Increase dimens for power control widget for sw600dp
...
Bug: 6527125
Change-Id: If4c3dad24e8fc70ca76bb551cfd9e32be96a6337
2012-06-05 14:58:24 -07:00
Eric Fischer
8e58449072
am 6f10eb7d
: Import translations. DO NOT MERGE
...
* commit '6f10eb7db50514bd5530a633ea1ebed571c84582':
Import translations. DO NOT MERGE
2012-06-05 12:13:40 -07:00
Eric Fischer
16b91d3f2f
Import translations. DO NOT MERGE
...
Change-Id: I329715293717b472445f15e9c780c19d04bf1bb7
2012-06-05 12:05:37 -07:00
Eric Fischer
6f10eb7db5
Import translations. DO NOT MERGE
...
Change-Id: I81581e50f658f628a5d6354c9c8372cc1a98d566
2012-06-05 12:03:44 -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
Kenneth Westin
e3f7f68dfa
Limit length of SSID input string to 32
...
Limits the UI text box of the SSID field to 32 characters (which is
standard) from previously being unlimited in the UI but constrained
in the driver implementation.
See IEEE 802.11-1999 7.3.2.1 Service Set Identity (SSID) element.
Change-Id: I17573ee338ed744a2bc0258ee2c0f382c1a5c931
2012-06-05 12:40:05 +02:00
Eric Fischer
5f366fd3aa
am 90504516
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '9050451649b920a490117462ec71e87a0aa3ee63':
Import translations. DO NOT MERGE
2012-06-04 18:25:39 -07:00
Eric Fischer
9050451649
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-04 18:21:44 -07:00
Eric Fischer
d19c7360fb
Import translations. DO NOT MERGE
...
Change-Id: I5c7237b08abf4857048c808cb3927bd138f7e30d
2012-06-04 18:21:17 -07:00
Eric Fischer
99929802f5
Import translations. DO NOT MERGE
...
Change-Id: I3347ec085b2a09f654b17c0609522d47a14627b2
2012-06-04 18:19:13 -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
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
Eric Fischer
635d8610d7
am 13b2f06d
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '13b2f06d2e5a74a52bc00b21f91d720407f5a98d':
Import translations. DO NOT MERGE
2012-06-02 08:34:51 -07:00
Brian Colonna
44cc9bf82d
am 90092277
: am af197847
: Merge "Bug 5457035: Changed strings in FUL anti-spoofing setup" into jb-dev
...
* commit '900922773a70b73d93a55da52f0b974ac89677a1':
Bug 5457035: Changed strings in FUL anti-spoofing setup
2012-06-02 08:19:44 -07:00
Brian Colonna
900922773a
am af197847
: Merge "Bug 5457035: Changed strings in FUL anti-spoofing setup" into jb-dev
...
* commit 'af197847164bd0229e7ef51114cd17fc43b35a15':
Bug 5457035: Changed strings in FUL anti-spoofing setup
2012-06-01 19:02:04 -07:00
Eric Fischer
13b2f06d2e
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-01 18:10:52 -07:00
Brian Colonna
af19784716
Merge "Bug 5457035: Changed strings in FUL anti-spoofing setup" into jb-dev
2012-06-01 14:45:56 -07:00
Brian Colonna
e06fb708f0
Bug 5457035: Changed strings in FUL anti-spoofing setup
...
Added latest string changes requested for Face Unlock
liveness/head-turn anti-spoofing option.
Change-Id: Ic703bda6b449756bdf05d7de843e9aab6b939446
2012-06-01 16:37:06 -04:00
Eric Fischer
b90bef63e4
Import translations. DO NOT MERGE
...
Change-Id: If23b7efd7868dedab4db9b0384ca7a2760bb6a7b
2012-06-01 12:30:44 -07:00
Eric Fischer
360f219816
Import translations. DO NOT MERGE
...
Change-Id: Id95cfc21f742d95cdb4b8ca7530c4410faaaba63
2012-06-01 12:28:50 -07:00