summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Merge "Limit length of SSID input string to 32"Irfan Sheriff2012-07-031-0/+1
| | |\ \ \
| | | * | | Limit length of SSID input string to 32Kenneth Westin2012-06-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 7c8363eb: am d80ff0a4: Merge "wifi: update text displayed during hotspot ↵Irfan Sheriff2012-07-031-0/+4
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | on/off" * commit '7c8363eb11b61f712e982b161a2267c2731df6fa': wifi: update text displayed during hotspot on/off
| * | | | am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"Irfan Sheriff2012-07-031-0/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'd80ff0a4d615bd6f037483bf9dc2b10887d9507f': wifi: update text displayed during hotspot on/off
| | * | | Merge "wifi: update text displayed during hotspot on/off"Irfan Sheriff2012-07-031-0/+4
| | |\ \ \
| | | * | | wifi: update text displayed during hotspot on/offVishal Mahaveer2012-05-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the string used during hotspot on/off Change-Id: I89f54f6c02ae26dd39b3cfdcd7587cf59ba81ca1 Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
| | * | | | Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on"Jean-Baptiste Queru2012-06-131-2/+2
| | |\ \ \ \
| | | * | | | Settings: Fixed German translation for turning WLAN/Bluetooth onMarcus Bauer2012-05-271-2/+2
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this patch, the question "WLAN aktivieren?" would show after you turned it on, and while it is loading; this patch merely addresses this issue and changes it to "WLAN wird aktiviert", which is consistent with the message showing up when turning it off. Likewise for turning Bluetooth on. Change-Id: Ic91143836a85751c39839daae720ac03b174bfde
| * | | | | am a1146f83: Import translations. DO NOT MERGEEric Fischer2012-07-022-5/+5
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit 'a1146f83a985ce613145ae1e89b9e7311906a3b7': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEEric Fischer2012-07-022-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic3255b6b87db2a3b98fd3b41e4ab0ef24d67e292 Auto-generated-cl: translation import
| * | | | | am 9ca616e4: Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-2921-93/+47
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '9ca616e42520ff12de921b8c301ef4cf7cb6c95a': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEYing Wang2012-06-2921-93/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic81c64b7405a6de52473a90f61d58242779c8bf5 Auto-generated-cl: translation import
| * | | | | am 3cc385b8: Import translations. DO NOT MERGEEric Fischer2012-06-2827-118/+61
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '3cc385b83ca0f2c5e7a6b8464604ec3eb613f235': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEEric Fischer2012-06-2827-118/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If4dd46dc84b974aabefe57aefb43de4329396c51 Auto-generated-cl: translation import
| * | | | | am c812fe4c: Import translations. DO NOT MERGEYing Wang2012-06-2749-25/+213
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'c812fe4c0e989fcea906a6dda7c88a55076cd50d': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEYing Wang2012-06-2749-25/+213
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5c769ea97c25696684c6818bfb84c95d30689b22
* | | | | | Import translations. DO NOT MERGEEric Fischer2012-07-022-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie0a0c287cdf412aebf43d610b9e309cd32f68b16 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEYing Wang2012-06-2921-93/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I16afd7e6e7465bbd23cb0d2076bc13a9edffcd59 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-2827-118/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib511e1cdf515c855ea235886b6c801a902136ba4 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEYing Wang2012-06-2749-25/+213
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9a59e4f258f041a175e9fd05a60da9c21daabf40
* | | | | | resolved conflicts for merge of 8f12b128 to masterJake Hamby2012-06-252-1/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I35552dafc1fc7f128726504ea97b5c3e446ac0df
| * | | | | am f59dd9d6: Merge "Add menu item to Settings to go to Cell Broadcast ↵Jake Hamby2012-06-252-0/+15
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings." into jb-dev * commit 'f59dd9d67e269a81c684ecd641e514aba8d2330a': Add menu item to Settings to go to Cell Broadcast settings.
| | * | | | Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-devJake Hamby2012-06-252-0/+15
| | |\ \ \ \
| | | * | | | Add menu item to Settings to go to Cell Broadcast settings.Jake Hamby2012-06-252-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | am 40b78280: Import translations. DO NOT MERGEEric Fischer2012-06-2515-57/+36
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '40b78280eb0c93d9ee3918813cfabf93a2919f35': Import translations. DO NOT MERGE
| | * | | | | Import translations. DO NOT MERGEEric Fischer2012-06-2515-57/+36
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: Ic94e1bba24f847df6b65c46539bb2de12e8ab38b
| * | | | | am d7e8025f: Import translations. DO NOT MERGEYing Wang2012-06-2331-232/+118
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'd7e8025fdf91fd0a6dad9df6bc92e7cb9d7566c2': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEYing Wang2012-06-2231-232/+118
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I417b1bbfd809569e110d5534fb2db1dd2c82075e
| * | | | | am 3c46b110: Import translations. DO NOT MERGEEric Fischer2012-06-2139-466/+238
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '3c46b1103995434045b946a14d9909e866a8c8ab': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEEric Fischer2012-06-2139-466/+238
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I77226bb57376204d2b55012c3be037a6f05be228
| * | | | | am f776a738: Import translations. DO NOT MERGEEric Fischer2012-06-218-40/+28
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'f776a738fae4bcf0f81d59579a30efd400fbb295': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEEric Fischer2012-06-208-40/+28
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8d15ef5cb523bdc7f68216a7d465dcb7b9152477
| * | | | | am 679948df: Import translations. DO NOT MERGEYing Wang2012-06-2049-73/+343
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '679948df3cf5c71bfe24ad4d6cd1bd78cb0fb28d': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEYing Wang2012-06-2049-73/+343
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7d2055b0cf38cf4b676a599fd0c952b2fdac99b1
* | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-2515-57/+36
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2f51f7f30deeb640e4303810c1ad5ef277f5fdb4
* | | | | | Import translations. DO NOT MERGEYing Wang2012-06-2231-232/+118
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1d5a9d10d1aef1e6631d216bb180c86734ebbe8
* | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-2139-467/+239
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I324b2d81491c93cf6ff5b91bb3e5ebbc935fa65c
* | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-209-41/+29
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I205f13efebfa6afae7a9c38dec8b16a3c4971f93
* | | | | | Import translations. DO NOT MERGEYing Wang2012-06-2049-74/+344
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3be9db85a08ed44c5559348bdc36468310077326
* | | | | | am 1b4a9b41: am 5739d4fe: Merge "Use string resources instead of literals ↵Christopher Tate2012-06-191-0/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for backup password confirmations" into jb-dev * commit '1b4a9b4107c1d6ba5b2ecf5657865acc24a28686': Use string resources instead of literals for backup password confirmations
| * | | | | am 5739d4fe: Merge "Use string resources instead of literals for backup ↵Christopher Tate2012-06-191-0/+7
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | password confirmations" into jb-dev * commit '5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f': Use string resources instead of literals for backup password confirmations
| | * | | | Merge "Use string resources instead of literals for backup password ↵Christopher Tate2012-06-191-0/+7
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | confirmations" into jb-dev
| | | * | | | Use string resources instead of literals for backup password confirmationsChristopher Tate2012-06-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Localizability is good. Bug 6683158 Change-Id: I205e4a09f5137e18d4085fcc041fae86f26ab188
| * | | | | | am f4a4119e: Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer2012-06-197-49/+25
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f4a4119eeaed1a99c082f253174b8acbca07c4c2': Import translations. DO NOT MERGE
| | * | | | | Import translations. DO NOT MERGEEric Fischer2012-06-197-49/+25
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: I097248fa64ec4f5d75ca4ddda3a17d49c29647a7
| * | | | | am fae5978e: Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-1849-255/+756
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'fae5978e4a89aa2b8e6a9e1cf95c910a0609923a': Import translations. DO NOT MERGE
| | * | | | Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-1849-255/+756
| | |\ \ \ \
| | | * | | | Import translations. DO NOT MERGEYing Wang2012-06-1849-255/+756
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8ba16c5a7895850d429ae355bf2c27e384bb248e
* | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-1949-43/+599
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If94d32af0adb4eb24b5ff10f3555fd2b7cd0fdd2
* | | | | | | Merge "Import translations. DO NOT MERGE"Ying Wang2012-06-1838-376/+231
|\ \ \ \ \ \ \