PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,036 Commits 1 Branch 0 Tags
ee9ecf0ac6695bc80ba4bc3256989c307f85fd1d
Commit Graph

2896 Commits

Author SHA1 Message Date
Ying Wang
ce670cbe91 Import translations. DO NOT MERGE 
Change-Id: I899bf73fbcdeb84593fafd2b29953577034458e5
 2012-06-18 14:44:02 -07:00
Ying Wang
be4ac92791 Import translations. DO NOT MERGE 
Change-Id: I8ba16c5a7895850d429ae355bf2c27e384bb248e
 2012-06-18 14:40:20 -07:00
Jim Miller
c14422ce96 am 4a3435f8: am 284c9872: Merge "Fix 6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev 
* commit '4a3435f86ee0dda6b824810ce439509cb61a8721':
  Fix 6663465: remove flagNoEnterAction in favor of actionNext
 2012-06-18 13:23:25 -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
29c749b653 am 2027328c: am 4d8dac07: Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev 
* commit '2027328c7bca44ff6a0dc8c2ff64a8af052f4ea2':
  Implement issue #6633077: Improve permissions display for...
 2012-06-18 10:52:33 -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
c4551bed33 Import translations. DO NOT MERGE 
Change-Id: I3311d40c77570583a5c1d26acf89dc9e544300ff
 2012-06-15 14:36:14 -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
8d5509cd34 Import translations. DO NOT MERGE 
Change-Id: Ib3f37708c28402968d799deb4d918204457638d5
 2012-06-14 13:47:54 -07:00
Eric Fischer
5ea994c552 Import translations. DO NOT MERGE 
Change-Id: Ife956408e146ad876b860968dacd8f3095ed84e1
 2012-06-14 13:44:39 -07:00
Jean-Baptiste Queru
60ec22d1bd Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on" 2012-06-13 17:05:38 -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
149e352454 Import translations. DO NOT MERGE 
Change-Id: Ie64ad1c03c6f55e1e55adbf95fb87d39f03c90f8
 2012-06-13 14:20:54 -07:00
Eric Fischer
612a0c106b Import translations. DO NOT MERGE 
Change-Id: I8566dbced26846ce55861b5f57f95034d03604c2
 2012-06-13 14:17:44 -07:00
Jeff Sharkey
df7375cb03 am c35b51f3: am cd4428ce: Storage banner when device in low disk state. 
* commit 'c35b51f3c7746c29672d15e1564b04103c8d32bf':
  Storage banner when device in low disk state.
 2012-06-12 18:57:04 -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
Amith Yamasani
48fa857c92 UI to add a photo to a user's profile. 
Photo will be shown in user management screen and switcher.

Change-Id: Icc0a39487daae13530fc1741780fb42fee0dada4
 2012-06-12 18:18:40 -07:00
Ying Wang
4a5593b82c Import translations. DO NOT MERGE 
Change-Id: If59e97f6923cdfb445c233a5eb0a1c352a9fe93f
 2012-06-12 15:26:38 -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
f6e549dbb3 Merge "Import translations. DO NOT MERGE" 2012-06-11 13:32:39 -07:00
Eric Fischer
668415979b Import translations. DO NOT MERGE 
Change-Id: I3e12fee68296f3fc61306e008f86a09c4d342550
 2012-06-11 13:27:08 -07:00
Eric Fischer
00808b0280 Import translations. DO NOT MERGE 
Change-Id: I835b15b3d3081d5d9010ff91eb54b9cd6e6316bb
 2012-06-11 13:24:05 -07:00
Jean-Baptiste Queru
2a074a10e0 am 3e8035bc: am c56b0146: Merge "Fixing pin_too_short text" 
* commit '3e8035bcaff67d395481e3fb70ca2ad1d21cd3b5':
  Fixing pin_too_short text
 2012-06-11 12:06:30 -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
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
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
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
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