Commit Graph

2509 Commits

Author SHA1 Message Date
Eric Fischer
e5d2b8b8ab am f4a4119e: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'f4a4119eeaed1a99c082f253174b8acbca07c4c2':
  Import translations. DO NOT MERGE
2012-06-19 16:26:22 -07:00
Eric Fischer
5ad50ac860 Import translations. DO NOT MERGE
Change-Id: I097248fa64ec4f5d75ca4ddda3a17d49c29647a7
2012-06-19 16:01:49 -07:00
Ying Wang
922eed658a am fae5978e: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'fae5978e4a89aa2b8e6a9e1cf95c910a0609923a':
  Import translations. DO NOT MERGE
2012-06-18 14:53:11 -07:00
Ying Wang
fae5978e4a Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-18 14:51:26 -07:00
Ying Wang
be4ac92791 Import translations. DO NOT MERGE
Change-Id: I8ba16c5a7895850d429ae355bf2c27e384bb248e
2012-06-18 14:40:20 -07:00
Jim Miller
4a3435f86e am 284c9872: Merge "Fix 6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev
* commit '284c9872cea3a5d97e1b1dd0016ac376da695175':
  Fix 6663465: remove flagNoEnterAction in favor of actionNext
2012-06-18 13:22:05 -07:00
Jim Miller
284c9872ce Merge "Fix 6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev 2012-06-18 13:19:42 -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
Ying Wang
7622ce2955 am 9d6d89ef: Import translations. DO NOT MERGE
* commit '9d6d89ef82f07ef54238699619d4875c4f2ae833':
  Import translations. DO NOT MERGE
2012-06-18 10:32:07 -07:00
Jim Miller
feeafe2e79 Fix 6663465: remove flagNoEnterAction in favor of actionNext
This fixes a bug where the return key was showing in some layouts
for choose/confirm password screens in Settings.  Now we just use
"actionNext" which ensures we see consistent behavior across
devices.

Change-Id: I4bf3033654b85f14c55de6f418caaf1ce563c33a
2012-06-15 17:56:49 -07:00
Dianne Hackborn
4d8dac0792 Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev 2012-06-15 17:53:40 -07:00
Ying Wang
9d6d89ef82 Import translations. DO NOT MERGE
Change-Id: I861590828a57951c72001e0c6c6ab2222be320c8
2012-06-15 14:33: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
Eric Fischer
aac5d9f60e am 5ea994c5: Import translations. DO NOT MERGE
* commit '5ea994c552ea72385022c0c81b8b69acbe30a113':
  Import translations. DO NOT MERGE
2012-06-14 14:46:18 -07:00
Eric Fischer
5ea994c552 Import translations. DO NOT MERGE
Change-Id: Ife956408e146ad876b860968dacd8f3095ed84e1
2012-06-14 13:44:39 -07:00
Eric Fischer
5b97798cbd am 612a0c10: Import translations. DO NOT MERGE
* commit '612a0c106bc3991a074f6f15361b357494e70e62':
  Import translations. DO NOT MERGE
2012-06-13 14:32:38 -07:00
Eric Fischer
612a0c106b Import translations. DO NOT MERGE
Change-Id: I8566dbced26846ce55861b5f57f95034d03604c2
2012-06-13 14:17:44 -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
Ying Wang
45e869874a am 292d7e3b: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '292d7e3b8135c93b2f71bb05be81ca71dd03add1':
  Import translations. DO NOT MERGE
2012-06-12 15:26:30 -07:00
Ying Wang
db49ee9872 Import translations. DO NOT MERGE
Change-Id: I3f7c3cd191375024cd5613b3d2b8e0c859c96928
2012-06-12 15:21:39 -07:00
Eric Fischer
ecb9640178 am 00808b02: Import translations. DO NOT MERGE
* commit '00808b0280d78d0930650e39eaf21a38915da5be':
  Import translations. DO NOT MERGE
2012-06-12 12:42:09 -07:00
Eric Fischer
00808b0280 Import translations. DO NOT MERGE
Change-Id: I835b15b3d3081d5d9010ff91eb54b9cd6e6316bb
2012-06-11 13:24:05 -07:00
Jean-Baptiste Queru
3e8035bcaf am c56b0146: Merge "Fixing pin_too_short text"
* commit 'c56b01460e7c83c8a21b02f411572ee69b755892':
  Fixing pin_too_short text
2012-06-11 12:03:59 -07:00
Youness Ghanim
532b11b481 Fixing pin_too_short text
Made lockpassword_pin_too_short in sync with other pin
text lables.

Change-Id: Ia9295f7b36b29a3b4370e04461446a1428fc2ee2
2012-06-11 13:45:20 +02: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
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
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
5186313695 Import translations. DO NOT MERGE
Change-Id: I5c5f75c4980677fef82c64d83f3d7a37ae604cc3
2012-06-07 15:12:24 -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
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
ec71971c34 Import translations. DO NOT MERGE
Change-Id: If466dfc20ff28bfb26b10214503200452c66ccea
2012-06-06 13:21:25 -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
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