Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,954 Commits 1 Branch 0 Tags
4aa42e2ea1789baea784e642e78db526b6ae24ab
Commit Graph

2529 Commits

Author SHA1 Message Date
Eric Fischer
c70bec4454 am 3cc385b8: Import translations. DO NOT MERGE 
* commit '3cc385b83ca0f2c5e7a6b8464604ec3eb613f235':
  Import translations. DO NOT MERGE
 2012-06-28 14:27:32 -07:00
Eric Fischer
3cc385b83c Import translations. DO NOT MERGE 
Change-Id: If4dd46dc84b974aabefe57aefb43de4329396c51
Auto-generated-cl: translation import
 2012-06-28 12:51:19 -07:00
Ying Wang
ebf032dff9 am c812fe4c: Import translations. DO NOT MERGE 
* commit 'c812fe4c0e989fcea906a6dda7c88a55076cd50d':
  Import translations. DO NOT MERGE
 2012-06-27 17:21:34 -07:00
Ying Wang
c812fe4c0e Import translations. DO NOT MERGE 
Change-Id: I5c769ea97c25696684c6818bfb84c95d30689b22
 2012-06-27 16:19:29 -07:00
Jake Hamby
8f12b1287f am f59dd9d6: Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev 
* commit 'f59dd9d67e269a81c684ecd641e514aba8d2330a':
  Add menu item to Settings to go to Cell Broadcast settings.
 2012-06-25 16:21:18 -07:00
Jake Hamby
f59dd9d67e Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev 2012-06-25 16:19:23 -07:00
Eric Fischer
b12cc8107d am 40b78280: Import translations. DO NOT MERGE 
* commit '40b78280eb0c93d9ee3918813cfabf93a2919f35':
  Import translations. DO NOT MERGE
 2012-06-25 13:34:20 -07:00
Jake Hamby
ef57ed71bf Add menu item to Settings to go to Cell Broadcast settings. 
Add menu item to Settings when "config_cellBroadcastAppLinks"
config option is set to true to jump to the Cell Broadcast app
settings activity. This enables the Cell Broadcast launcher
icon to be removed, while still allowing access to the app
(by adding a similar menu item to the MMS app) and its settings
activity (this settings link).

The menu item will not be added if the CellBroadcastReceiver
package is disabled or not installed.

Bug: 6709985
Change-Id: If3a3016ceea70704790964c0b712c31cb38f7b62
 2012-06-25 13:20:45 -07:00
Eric Fischer
40b78280eb Import translations. DO NOT MERGE 
Change-Id: Ic94e1bba24f847df6b65c46539bb2de12e8ab38b
 2012-06-25 13:00:04 -07:00
Ying Wang
7a1a575b74 am d7e8025f: Import translations. DO NOT MERGE 
* commit 'd7e8025fdf91fd0a6dad9df6bc92e7cb9d7566c2':
  Import translations. DO NOT MERGE
 2012-06-23 05:36:47 -07:00
Ying Wang
d7e8025fdf Import translations. DO NOT MERGE 
Change-Id: I417b1bbfd809569e110d5534fb2db1dd2c82075e
 2012-06-22 15:07:41 -07:00
Eric Fischer
3a96b10211 am 3c46b110: Import translations. DO NOT MERGE 
* commit '3c46b1103995434045b946a14d9909e866a8c8ab':
  Import translations. DO NOT MERGE
 2012-06-21 15:52:25 -07:00
Eric Fischer
3c46b11039 Import translations. DO NOT MERGE 
Change-Id: I77226bb57376204d2b55012c3be037a6f05be228
 2012-06-21 15:04:08 -07:00
Eric Fischer
4bc59c7006 am f776a738: Import translations. DO NOT MERGE 
* commit 'f776a738fae4bcf0f81d59579a30efd400fbb295':
  Import translations. DO NOT MERGE
 2012-06-21 11:52:14 -07:00
Eric Fischer
f776a738fa Import translations. DO NOT MERGE 
Change-Id: I8d15ef5cb523bdc7f68216a7d465dcb7b9152477
 2012-06-20 21:12:09 -07:00
Ying Wang
a104564d9d am 679948df: Import translations. DO NOT MERGE 
* commit '679948df3cf5c71bfe24ad4d6cd1bd78cb0fb28d':
  Import translations. DO NOT MERGE
 2012-06-20 14:49:14 -07:00
Ying Wang
679948df3c Import translations. DO NOT MERGE 
Change-Id: I7d2055b0cf38cf4b676a599fd0c952b2fdac99b1
 2012-06-20 13:54:32 -07:00
Christopher Tate
1b4a9b4107 am 5739d4fe: Merge "Use string resources instead of literals for backup password confirmations" into jb-dev 
* commit '5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f':
  Use string resources instead of literals for backup password confirmations
 2012-06-19 16:34:01 -07:00
Christopher Tate
5739d4fe02 Merge "Use string resources instead of literals for backup password confirmations" into jb-dev 2012-06-19 16:31:11 -07:00
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
Christopher Tate
2d6497d2d1 Use string resources instead of literals for backup password confirmations 
Localizability is good.  Bug 6683158

Change-Id: I205e4a09f5137e18d4085fcc041fae86f26ab188
 2012-06-19 16:22:55 -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