summaryrefslogtreecommitdiffstats
path: root/res/values
Commit message (Collapse)AuthorAgeFilesLines
* am 88f37936: am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation ↵Jean-Baptiste Queru2012-08-241-0/+4
|\ | | | | | | | | | | | | for SD card while MTP/PTP is active" * commit '88f379367f208a75dfe95a081b25c27a54b06a1a': MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
| * am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card ↵Jean-Baptiste Queru2012-08-231-0/+4
| |\ | | | | | | | | | | | | | | | | | | while MTP/PTP is active" * commit '1183f487c8ea8660415fcd30914844e8dc2de2bb': MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
| | * MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is activeLi Gang2012-08-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check the USB connection status and MTP/PTP setting, if USB connected and MTP/PTP enabled, disable the erasing and umount operation. Judge SD card Mounting status and keep summary string. Change-Id: Iff3e0f25b581bc462c88fff59eb93d765baaddd7 Author: Li Gang <gang.g.li@intel.com> Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 47043
* | | Make manage apps UI multi-user aware.Dianne Hackborn2012-08-211-0/+2
| | | | | | | | | | | | | | | | | | The details screens still need some work. Change-Id: I850cc9ba9a8db7787fae629ae3cb6c6772c726f5
* | | display wireless charging statusBrian Muramatsu2012-08-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | - show "Charging (wireless)" when using wireless charger - change "Discharging" to "Not charging" bug: 6879638 Change-Id: I20e78f2bde7a526667510b82a030f5952d9dda75
* | | Setting to turn off power optimizationsIrfan Sheriff2012-08-091-0/+4
| | | | | | | | | | | | | | | Bug: 5885175 Change-Id: I55bfabdffea95d151af6bb4d9da9137124bcb763
* | | am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings ↵Jean-Baptiste Queru2012-08-081-0/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | app." * commit '7526636406087666d005d389ddc0cdacd79499fd': Add support for SE Android to the Settings app.
| * | am 5d72b272: Merge "Add support for SE Android to the Settings app."Jean-Baptiste Queru2012-08-081-0/+7
| |\ \ | | |/ | | | | | | | | | * commit '5d72b2726797374e402943182d8132045ed32d3a': Add support for SE Android to the Settings app.
| | * Add support for SE Android to the Settings app.Stephen Smalley2012-07-201-0/+7
| | | | | | | | | | | | | | | | | | Display SELinux status (disabled, permissive, enforcing) under About phone. Change-Id: I69529fb7a3adfe31eccb16d79740fc4952ff5e68
* | | Merge "Add dev setting to enable global actions bug report button." into ↵Dianne Hackborn2012-08-071-10/+4
|\ \ \ | | | | | | | | | | | | jb-mr1-dev
| * | | Add dev setting to enable global actions bug report button.Dianne Hackborn2012-08-071-10/+4
| | | | | | | | | | | | | | | | Change-Id: I3768f95e1c6fbec9c10186093e5e1d48b0ef6ae4
* | | | Add new dev settings to debug hardware layersRomain Guy2012-08-061-0/+5
|/ / / | | | | | | | | | Change-Id: I2668552d70911a90e173efdf75bc44139ed394c8
* | | Re-enable dreams: SettingsJohn Spurlock2012-08-021-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-arrange settings and captions for dreams. Activation on sleep and activation on dock now independent. Sleep activation defaults to off, dock activation defaults to on (replacing dock mode). Also use dream manager service for testing dream preference, and properly disable preferences if both dream activations are disabled. Change-Id: I76f5ba115c7678826a09077dd393acc55c2bca26 Bug: 6921930
* | | Fix DNS hint in settingsIrfan Sheriff2012-07-291-1/+1
| | | | | | | | | | | | Change-Id: I382dbd60c2956a53a77547744790c33e93ce8404
* | | Merge "Test getAllCellInfo and onCellInfoChanged."Wink Saville2012-07-251-0/+2
|\ \ \
| * | | Test getAllCellInfo and onCellInfoChanged.Wink Saville2012-07-181-0/+2
| | | | | | | | | | | | | | | | Change-Id: I20164d6bb9edb2ecf178b4533a39e885773d7b22
* | | | Make Settings app aware of layout directionFabrice Di Meglio2012-07-241-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | - see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi) Change-Id: I696c0f66a16640af767da3c05b5d300fd2284ecb
* | | | am bebcc976: am 4635ec6b: Strings for upcoming location settings changes.Amith Yamasani2012-07-231-5/+13
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit 'bebcc976853285a668fd2ff5d36561183d0c34f9': Strings for upcoming location settings changes.
| * | am 4635ec6b: Strings for upcoming location settings changes.Amith Yamasani2012-07-231-5/+13
| |\ \ | | | | | | | | | | | | | | | | * commit '4635ec6b8dcf9a9f686a4d25eaffe916f5dcd20e': Strings for upcoming location settings changes.
| | * | Strings for upcoming location settings changes.Amith Yamasani2012-07-231-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | Adding these first to parallelize translations. Change-Id: Ia0fcecd6d714ad58c45e5ddc9ae5f00afce3e810
* | | | am b2a16b92: am ea819b07: Merge "Implement issue #6819955: Add button to ↵Dianne Hackborn2012-07-131-0/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | take bug report." into jb-dev * commit 'b2a16b9202f6daa609d152ffc2fd273088fbb1ac': Implement issue #6819955: Add button to take bug report.
| * | | am ea819b07: Merge "Implement issue #6819955: Add button to take bug ↵Dianne Hackborn2012-07-131-0/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | report." into jb-dev * commit 'ea819b07fa9e17fcd17e0384626ee6a47bc0ecd6': Implement issue #6819955: Add button to take bug report.
| | * | Implement issue #6819955: Add button to take bug report.Dianne Hackborn2012-07-131-0/+10
| | | | | | | | | | | | | | | | Change-Id: Ic615180121d4db52f92aa8264d95d790de5fff9d
* | | | am e8b25302: am b0b45c02: Display FCC id for LTE in Settings.John Wang2012-07-121-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e8b2530260abc74e570ae266b49bade240f14913': Display FCC id for LTE in Settings.
| * | | am b0b45c02: Display FCC id for LTE in Settings.John Wang2012-07-121-0/+2
| |\ \ \ | | |/ / | | | / | | |/ | |/| * commit 'b0b45c02ec73c87f78a8358a7e98747bd96ec103': Display FCC id for LTE in Settings.
| | * Display FCC id for LTE in Settings.John Wang2012-07-111-0/+2
| | | | | | | | | | | | | | | | | | | | | If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID. bug:4965501 Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
* | | 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>
* | | | | resolved conflicts for merge of 8f12b128 to masterJake Hamby2012-06-251-1/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I35552dafc1fc7f128726504ea97b5c3e446ac0df
| * | | | am f59dd9d6: Merge "Add menu item to Settings to go to Cell Broadcast ↵Jake Hamby2012-06-251-0/+5
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | settings." into jb-dev * commit 'f59dd9d67e269a81c684ecd641e514aba8d2330a': Add menu item to Settings to go to Cell Broadcast settings.
| | * | | Add menu item to Settings to go to Cell Broadcast settings.Jake Hamby2012-06-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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
| | * | | Use string resources instead of literals for backup password confirmationsChristopher Tate2012-06-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Localizability is good. Bug 6683158 Change-Id: I205e4a09f5137e18d4085fcc041fae86f26ab188
* | | | | am 2027328c: am 4d8dac07: Merge "Implement issue #6633077: Improve ↵Dianne Hackborn2012-06-181-0/+22
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | permissions display for..." into jb-dev * commit '2027328c7bca44ff6a0dc8c2ff64a8af052f4ea2': Implement issue #6633077: Improve permissions display for...
| * | | | am 4d8dac07: Merge "Implement issue #6633077: Improve permissions display ↵Dianne Hackborn2012-06-181-0/+22
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | for..." into jb-dev * commit '4d8dac0792ec7994f9f4cbf2648cf8f3185876ca': Implement issue #6633077: Improve permissions display for...
| | * | | Implement issue #6633077: Improve permissions display for...Dianne Hackborn2012-06-151-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...inherited permissions from shared UIDs Bug: 6633077 Change-Id: I91917339e83b79a3dfcfcb70a68d571c9a7f7e14
* | | | | am c35b51f3: am cd4428ce: Storage banner when device in low disk state.Jeff Sharkey2012-06-121-1/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c35b51f3c7746c29672d15e1564b04103c8d32bf': Storage banner when device in low disk state.
| * | | | am cd4428ce: Storage banner when device in low disk state.Jeff Sharkey2012-06-121-1/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'cd4428ce2c03fd355a3093fad6553636da9cef9b': Storage banner when device in low disk state.
| | * | | Storage banner when device in low disk state.Jeff Sharkey2012-06-121-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6576409 Change-Id: I25f71935e312bf6efa832d10c22e3edbdc18f4fb
* | | | | UI to add a photo to a user's profile.Amith Yamasani2012-06-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Photo will be shown in user management screen and switcher. Change-Id: Icc0a39487daae13530fc1741780fb42fee0dada4
* | | | | am 3e8035bc: am c56b0146: Merge "Fixing pin_too_short text"Jean-Baptiste Queru2012-06-111-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '3e8035bcaff67d395481e3fb70ca2ad1d21cd3b5': Fixing pin_too_short text
| * | | | am c56b0146: Merge "Fixing pin_too_short text"Jean-Baptiste Queru2012-06-111-1/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | * commit 'c56b01460e7c83c8a21b02f411572ee69b755892': Fixing pin_too_short text
| | * | Fixing pin_too_short textYouness Ghanim2012-06-111-1/+1
| | |/ | | | | | | | | | | | | | | | | | | Made lockpassword_pin_too_short in sync with other pin text lables. Change-Id: Ia9295f7b36b29a3b4370e04461446a1428fc2ee2
| | * Wifi: Update message when scan result is emptyVishal Mahaveer2012-04-091-0/+2
| | | | | | | | | | | | | | | | | | | | | Handle case when Wi-Fi scan result is empty Change-Id: Ib09f030dbc0b71055a7aacf0848b97bd6c33af70 Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
| | * am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings"Jason Chen2012-03-161-1/+1
| | |\ | | | | | | | | | | | | | | | | * commit 'd5f7e6cd6b5a1273ed4e5e34f040dc6087017ed9': [DO NOT MERGE] Revert "Update string in Settings"
| | | * [DO NOT MERGE] Revert "Update string in Settings"Jason Chen2012-03-161-1/+1
| | | | | | | | | | | | | | | | This reverts commit 23d0b5287a527379d7c52a971b7dfa8c1fc769e2.
* | | | am 32f94d01: am 1e7fa779: Add ID to copy translation from to string that is ↵Eric Fischer2012-06-081-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | not translated yet. * commit '32f94d0160b246978b1201aca8920a926d733ba2': Add ID to copy translation from to string that is not translated yet.
generated by cgit v1.1 at 2025-02-04 17:07:21 +0000