summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-devPauloftheWest2014-10-0311-395/+349
|\ | | | | | | | | * commit '4046cf9cb46762a517b69c6cb78faa5903d6a3d5': [DS] DSDS support for Settings
| * Merge "[DS] DSDS support for Settings" into lmp-sprout-devPauloftheWest2014-10-0311-395/+349
| |\
| | * [DS] DSDS support for SettingsPauloftheWest2014-10-0311-395/+349
| | | | | | | | | | | | | | | | | | | | | | | | + Rebase and modify as APIs rename. + Fix bugs on set sub's name as title. + Enabled Sim Settings. Change-Id: Ic731c7882be95b86b6b8dcdd3f208a6125681f3e
* | | am 35314f27: am 5cdd3f4f: Update accessibility plus secure lock warning ↵Svetoslav2014-10-031-2/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | messages. * commit '35314f2771a9443acf334bf90ac88f582ded43ee': Update accessibility plus secure lock warning messages.
| * | am 5cdd3f4f: Update accessibility plus secure lock warning messages.Svetoslav2014-10-031-2/+3
| |\ \ | | | | | | | | | | | | | | | | * commit '5cdd3f4f6fcee6af89742dc0427df4bba4214cc8': Update accessibility plus secure lock warning messages.
| | * | Update accessibility plus secure lock warning messages.Svetoslav2014-10-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | bug:17671790 Change-Id: I694586452963a8f0e4c86b5c9c807ca9bb2ec15d
* | | | am 40fdd482: am c05b739c: Merge "Settings: Update media & alarm stream ↵John Spurlock2014-10-037-405/+45
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | icons." into lmp-dev * commit '40fdd482048bbf47878137f8552b6cade6832147': Settings: Update media & alarm stream icons.
| * | | am c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-devJohn Spurlock2014-10-037-405/+45
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'c05b739c691684350b63ca2e232319ee4fcaa76d': Settings: Update media & alarm stream icons.
| | * | Merge "Settings: Update media & alarm stream icons." into lmp-devJohn Spurlock2014-10-037-405/+45
| | |\ \
| | | * | Settings: Update media & alarm stream icons.John Spurlock2014-10-027-405/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update icon pointers and remove obsolete preference class. Bug: 17762712 Change-Id: Ia4b96c5b38f2a73a7a339b2ab3abfcd433f4403d
* | | | | am 32ce9484: am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.PauloftheWest2014-10-038-52/+308
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '32ce9484b7e8b039bb7d5b9f31ddaa9834fc1f5d': Updated Wi-Fi hotspot dialog to the Material Spec.
| * | | | am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.PauloftheWest2014-10-038-52/+308
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | * commit '6e26427e521a79a11c1a9e1b64995494290eaf7c': Updated Wi-Fi hotspot dialog to the Material Spec.
| | * | Updated Wi-Fi hotspot dialog to the Material Spec.PauloftheWest2014-10-028-52/+308
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + If there is scrolling then force the scrollbars to always appear. + Align contents of the dialog with the title. + Change "Network SSID" to "Network name". + Added wifi_* styles to other style xml files so that Wi-Fi hotspot dialogs are visible on tablets. + Move layout_width/height from res/layout/{wifi_dialog.xml, wifi_dialog_row.xml} from style into the xml file. Bug: 17684359 Change-Id: I42fb69132d6ba0fb8d9853de6f5524f29e6b70b6
* | | Merge "Use the StorageManager constant for the PatternVisible key." into ↵Elliott Hughes2014-10-021-2/+2
|\ \ \ | | | | | | | | | | | | lmp-mr1-dev
| * | | Use the StorageManager constant for the PatternVisible key.Elliott Hughes2014-10-021-2/+2
| | | | | | | | | | | | | | | | | | | | Bug: 17659622 Change-Id: Ibd44f5c619f61764ef4e4a3447f241e2f73339b5
* | | | am dbd052ed: Enable Sim SettingsWink Saville2014-10-022-5/+5
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit 'dbd052ed5ee71b2fc552e0a2954f8c283acc6f70': Enable Sim Settings
| * | Enable Sim SettingsWink Saville2014-10-022-5/+5
| | | | | | | | | | | | | | | | | | | | | Changes from Paul and MTK will be coming soon but this allow us to do some initial testing. Change-Id: Ic52bc3656bc7066c8bbb7435eaf14e9b8e66a257
* | | am c744c448: am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode ↵PauloftheWest2014-10-011-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | bug." into lmp-dev * commit 'c744c448e472a065c1fc96fd6a26e2d1e9fa5c6a': Fixed a Setting Bluetooth Airplane mode bug.
| * | am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-devPauloftheWest2014-10-011-2/+2
| |\ \ | | |/ | | | | | | | | | * commit '59d33dbd25d8ca968e03bdeefedea9b0fe2e01f3': Fixed a Setting Bluetooth Airplane mode bug.
| | * Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-devPauloftheWest2014-10-011-2/+2
| | |\
| | | * Fixed a Setting Bluetooth Airplane mode bug.PauloftheWest2014-10-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + This patch moves the switch listeners from setup/teardown of the SwitchBar to pause/resume of Bluetooth Settings. This prevents Bluetooth from receiving connect messages while Airplane mode is turning off Bluetooth (which is what caused Bluetooth to re-enable.) Bug: 17465951 Change-Id: I4d32fcf5bb3a2241ed03e2295c86390e15743954
* | | | am 91f4e5a8: am 7a4d229d: Merge "Ensure recycled APN preferences are updated ↵Alan Viverette2014-10-011-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | to show radio button" into lmp-dev * commit '91f4e5a8aff6266bcb9fb717f8bfc8a4323fc9cf': Ensure recycled APN preferences are updated to show radio button
| * | | am 7a4d229d: Merge "Ensure recycled APN preferences are updated to show ↵Alan Viverette2014-10-011-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | radio button" into lmp-dev * commit '7a4d229d2dd958fe033c739785eae6728caa5184': Ensure recycled APN preferences are updated to show radio button
| | * | Merge "Ensure recycled APN preferences are updated to show radio button" ↵Alan Viverette2014-10-011-0/+1
| | |\ \ | | | | | | | | | | | | | | | into lmp-dev
| | | * | Ensure recycled APN preferences are updated to show radio buttonAlan Viverette2014-10-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | BUG: 17516352 Change-Id: I5da19b7c6d5a3ec03fe24f7bdfda656d6d616342
* | | | | am 299c6e12: (-s ours) am 9d4dc326: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-10-010-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-dev * commit '299c6e127d5105890a963208a64309af42051b56': Import translations. DO NOT MERGE
| * | | | am 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-10-010-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '9d4dc326d1988ef2760e9d0d31239e43801587e2': Import translations. DO NOT MERGE
| | * | | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-10-0123-107/+107
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBaligh Uddin2014-09-3023-107/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b6fcec9576d2305d0eb872b9d3d404f4b0556a1 Auto-generated-cl: translation import
* | | | | | am 0905bb07: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2014-10-010-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-sprout-dev * commit '0905bb07fc7059afc567d03dbca7696604aee0e2': Import translations. DO NOT MERGE
| * | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-devBaligh Uddin2014-10-0167-401/+470
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-09-3067-401/+470
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I79c53aaccbdec874aa56c457c61e8f5858a42c45 Auto-generated-cl: translation import
* | | | | | | am c1c9888d: am 905f9e2f: Merge "Remove WebView DRP Setting from Developer ↵Hui Shu2014-10-013-107/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings" into lmp-dev * commit 'c1c9888db4171a9db81345f428342ec838b5da99': Remove WebView DRP Setting from Developer Settings
| * | | | | | am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into ↵Hui Shu2014-10-013-107/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '905f9e2f90c886a8405e0cca8286cd3dd7f430e9': Remove WebView DRP Setting from Developer Settings
| | * | | | | Merge "Remove WebView DRP Setting from Developer Settings" into lmp-devHui Shu2014-10-013-107/+0
| | |\ \ \ \ \
| | | * | | | | Remove WebView DRP Setting from Developer SettingsHui Shu2014-09-303-107/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 17730990 Change-Id: I776844ee617916037b861ec7385365bb5873d4a0
* | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devBaligh Uddin2014-10-0167-401/+470
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-09-3067-401/+470
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I484b3919be4abf29231049a2e96867b0a8453538 Auto-generated-cl: translation import
* | | | | | | | | am 45f8ffa1: am b0c216d3: Merge "Disambiguate categories in Settings > ↵Zoltan Szatmary-Ban2014-10-011-1/+5
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trusted Credentials" into lmp-dev * commit '45f8ffa1da2f5dc937ab47c5f6e097f1a2d06750': Disambiguate categories in Settings > Trusted Credentials
| * | | | | | | | am b0c216d3: Merge "Disambiguate categories in Settings > Trusted ↵Zoltan Szatmary-Ban2014-10-011-1/+5
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Credentials" into lmp-dev * commit 'b0c216d3b95b3aa3a0a38ebde92ec19956598e9d': Disambiguate categories in Settings > Trusted Credentials
| | * | | | | | | Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-devZoltan Szatmary-Ban2014-10-011-1/+5
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Disambiguate categories in Settings > Trusted CredentialsZoltan Szatmary-Ban2014-09-301-1/+5
| | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use fixed category names (e.g. 'Personal' and 'Work') on Trusted Credentials screen instead of names of profiles that may be the same (or similar) for both. Bug: 17629895 Change-Id: I25b39310f7b9f445d2724be046a16cc82f5d1a9a
* | | | | | | | am 5fdb8fa4: am f7b56708: Merge "[WifiSetup] Update background texture" into ↵Maurice Lam2014-10-016-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '5fdb8fa41d44fe31148f00b6c909f511f11fde52': [WifiSetup] Update background texture
| * | | | | | | am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-devMaurice Lam2014-10-016-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f7b567081ef5f4daafdf0b229793323751e0d764': [WifiSetup] Update background texture
| | * | | | | | Merge "[WifiSetup] Update background texture" into lmp-devMaurice Lam2014-10-016-0/+0
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | [WifiSetup] Update background textureMaurice Lam2014-09-306-0/+0
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17611097 Change-Id: I75264ecac3b689426500e063a18d687866638a85
* | | | | | | am 42eff3b7: am 52448442: Use default encryption password if an ↵Svetoslav2014-10-014-0/+51
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accessibility service is enabled. * commit '42eff3b7e695c28c4074f7fd71606fa0ecfe199c': Use default encryption password if an accessibility service is enabled.
| * | | | | | am 52448442: Use default encryption password if an accessibility service is ↵Svetoslav2014-10-014-0/+51
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled. * commit '524484426855f814ff1f3189fd5221dd630dbf8c': Use default encryption password if an accessibility service is enabled.
| | * | | | | Use default encryption password if an accessibility service is enabled.Svetoslav2014-09-304-0/+51
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If accessibility is on and the user selectes a secure lock we use weaker encryption to enable running accessibility layer at the time the user authenticates. This change adds a warning message to the enable accessibility service dialog if there is a secure lock and also adds a warning as a summary for the secure lock in the lock chooser activity. Both warning mention the weaker encryption to be used. bug:17671790 Change-Id: Ib5cc9d3a78f751e18362bb9238fd2804c3b600f8
* | | | | | am 976aba99: am fc14e272: Merge "Update Settings App icons" into lmp-devFabrice Di Meglio2014-10-015-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '976aba99c8b06676b9e097de74287bb70138c848': Update Settings App icons
generated by cgit v1.1 at 2025-04-01 10:53:46 +0000