summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2014-08-24145-2854/+3521
| | | | | Change-Id: Ib13840b4fe07abc8aba474a3b0abf4b06fdb4405 Auto-generated-cl: translation import
* Merge "Don't index the ChooseLockGeneric screen" into lmp-devAmith Yamasani2014-08-236-10/+11
|\
| * Don't index the ChooseLockGeneric screenAmith Yamasani2014-08-226-10/+11
| | | | | | | | | | | | | | | | | | | | | | This avoids indexing face unlock, which may not always exist or might be disabled by policy. Instead, add some of the relevant keywords up one level in Security settings. Bug: 17185326 Change-Id: I4fbae1c0384a97383707104a6fe283075edbf341
* | Merge "Restore legacy VPN stats dialog." into lmp-devJeff Davidson2014-08-231-0/+9
|\ \
| * | Restore legacy VPN stats dialog.Jeff Davidson2014-08-221-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was originally removed in ag/522961, but restoring to keep legacy VPN behavior the same from within VpnSettings. This dialog is only accesible from VpnSettings and so should only ever be shown for legacy VPNs. Bug: 17164793 Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b
* | | Merge "Show trust agent entries as disabled rather than removing them." into ↵Jim Miller2014-08-222-3/+14
|\ \ \ | | | | | | | | | | | | lmp-dev
| * | | Show trust agent entries as disabled rather than removing them.Jim Miller2014-08-212-3/+14
| |/ / | | | | | | | | | | | | | | | Fixes bug 17108810 Change-Id: I646f5c299cd680d5c3a4978610f3852eba4b116b
* | | Merge "Settings psuedolocalization fixes." into lmp-devElliott Hughes2014-08-223-21/+1
|\ \ \ | |_|/ |/| |
| * | Settings psuedolocalization fixes.Elliott Hughes2014-08-223-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need -c zz_ZZ any more, and LocalePicker now checks the global developer options settings itself. Also remove some dead code now zz_ZY and zz_ZZ are gone. Bug: 17190407 Change-Id: I27f9f5bc8b27457004e7e4996ec76b76a17523eb
* | | Merge "Switch user on clicking on a user in User Settings" into lmp-devAmith Yamasani2014-08-221-0/+2
|\ \ \
| * | | Switch user on clicking on a user in User SettingsAmith Yamasani2014-08-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This slipped out of the code somehow. Bug: 15761405 Change-Id: I89c47221f999d5ef23aa7910d31a95bfa730353c
* | | | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-08-2272-211/+464
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2014-08-1872-211/+464
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I01598edaa725d9a59747e892ba470ee1e876f8eb Auto-generated-cl: translation import
* | | | | Final tweaks to work profile stringsJessica Hummel2014-08-221-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icd8f3ac2e8e3fb7f0368cdf40bcd42b4f275258b bug:15744182
* | | | | Merge "Update strings for removing work profile" into lmp-devAlexandra Gherghina2014-08-222-10/+21
|\ \ \ \ \
| * | | | | Update strings for removing work profileAlexandra Gherghina2014-08-222-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17139301 Change-Id: I524946ab7856b10ed68a2e90c7f488d20731b169
* | | | | | Merge "Modify Spinner so that the arrow is closer to the text" into lmp-devAlexandra Gherghina2014-08-224-4/+5
|\ \ \ \ \ \
| * | | | | | Modify Spinner so that the arrow is closer to the textAlexandra Gherghina2014-08-214-4/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17137945 Change-Id: I0769b030669a7a57e0be1c03f987bcd1e0f774ca
* | | | | | Merge "[WifiSetup] Tablet portrait layout" into lmp-devMaurice Lam2014-08-226-13/+128
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | [WifiSetup] Tablet portrait layoutMaurice Lam2014-08-206-13/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17134016 Change-Id: I376797ceeeb467af52f6e0a2e45ad6e2523c7b26
* | | | | | Merge "Fix layout of Apn Settings screen" into lmp-devAmith Yamasani2014-08-211-5/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix layout of Apn Settings screenAmith Yamasani2014-08-211-5/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Bug: 14081992 Change-Id: I64c458e1585d469434efafd942876f64508723a1
* | | | | Merge "Disable non-permitted accessibility services and IMEs" into lmp-devKenny Guy2014-08-214-6/+47
|\ \ \ \ \
| * | | | | Disable non-permitted accessibility services and IMEsKenny Guy2014-08-214-6/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14469005 Change-Id: I4986f035318854c27ecb92bbe2f0c977d53b6361
* | | | | | Merge "Change CARRIER_SETUP hook in WirelessSettings to use aeroshell for ↵Diego Pontoriero2014-08-211-3/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | determining carrier app instead of MCC/MNC." into lmp-dev
| * | | | | | Change CARRIER_SETUP hook in WirelessSettings to use aeroshellDiego Pontoriero2014-08-201-3/+7
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for determining carrier app instead of MCC/MNC. Related WirelessSettings change: http://ag/374330 Related Aeroshell change to SetupWizard: http://ag/520857 Bug: 16457806 Change-Id: I60277b27e9e205041eb3969a110a57da0fb62023
* | | | | | Merge "Fixed a crash when sharing video through Bluetooth." into lmp-devPauloftheWest2014-08-211-3/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fixed a crash when sharing video through Bluetooth.PauloftheWest2014-08-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Fixed an issue where Settings would crash when the user tries to share a youtube video through Bluetooth and rotates the screen. Bug: 17023413 Change-Id: Ied284da736cf9bfc7424982a516c8305c700dd0b
* | | | | | Merge "rename ScanResult.status -> autoJoinStatus" into lmp-devvandwalle2014-08-211-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | rename ScanResult.status -> autoJoinStatusvandwalle2014-08-201-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | This CL is dependent on Id9411c8097337b37ac1ce1a6ac8b28b4bda31ff3 Change-Id: Iec1a1e4718530f149051bd5de5235f0e0e4a438d
* | | | | Merge "Make string for work profile consistent with provisioning and ↵Jessica Hummel2014-08-211-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | framework strings." into lmp-dev
| * | | | Make string for work profile consistent with provisioning and framework strings.Jessica Hummel2014-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id52937400a2664d25b40649767df5b6723886871 bug:16468412
* | | | | Remove "Choose Keyboards" settingsTadashi G. Takaoka2014-08-213-17/+0
| |_|/ / |/| | | | | | | | | | | | | | | Bug: 17109233 Change-Id: Ia3860b12238d9d2233dc270e37a055a9a411b037
* | | | Merge "Suppress WiFi Assistant card until future platform updates." into lmp-devJeff Davidson2014-08-201-27/+10
|\ \ \ \
| * | | | Suppress WiFi Assistant card until future platform updates.Jeff Davidson2014-08-181-27/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the previous behavior of an increasing timeout. When the user dismisses the WiFi Assistant card, either by opting out or successfully configuring the assistant, the card is suppressed until the next major platform upgrade (assuming the assistant is not enabled at the time of the upgrade). Bug: 16902858 Change-Id: I5373a7a743f21777b7b75a620b5a4e9004e57466
* | | | | Merge "Less intrusive VPN dialog." into lmp-devJeff Davidson2014-08-203-11/+7
|\ \ \ \ \
| * | | | | Less intrusive VPN dialog.Jeff Davidson2014-08-153-11/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new AppOps to Settings and remove references to obsolete ManageDialog. VPN UX now lives in Quick Settings. Bug: 12878887 Bug: 16578022 Change-Id: I102a14c05db26ee3aef030cda971e5165f078a91
* | | | | Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-devPauloftheWest2014-08-201-1/+1
|\ \ \ \ \
| * | | | | Added a default Bluetooth icon for Bluetooth Preferences.PauloftheWest2014-08-201-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 17139683 Change-Id: I7b68950685732a85319a0dca7bd77234d345dbb7
* | | | | Merge "Fixed a Bluetooth Scanning issue." into lmp-devPauloftheWest2014-08-191-1/+10
|\ \ \ \ \
| * | | | | Fixed a Bluetooth Scanning issue.PauloftheWest2014-08-181-1/+10
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + When refreshing Bluetooth devices, sometimes it took awhile for some devices to come back up. This is a fix. Bug: 17049458 Change-Id: Id6233b38585e003e0432707663af4d06b0ce98c2
* | | | | Merge "Update string for profile owner addition warning" into lmp-devAmith Yamasani2014-08-201-2/+2
|\ \ \ \ \
| * | | | | Update string for profile owner addition warningAmith Yamasani2014-08-201-2/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Bug: 16207721 Change-Id: I561e0fc992f19339ab794dd7dffb9d650da141a0
* | | | | Merge "Fixed a Settings dialog crash." into lmp-devPauloftheWest2014-08-191-2/+4
|\ \ \ \ \
| * | | | | Fixed a Settings dialog crash.PauloftheWest2014-08-201-2/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Fixed a bug where Settings would crash when trying to open paired bluetooth device settings after device orientation change. Bug: 16972564 Change-Id: I0e93551ae7d8f21711d85093756fc33b62f59b24
* | | | | Merge "Settings: Remove needless dialogTitle attribute." into lmp-devJohn Spurlock2014-08-161-4/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Settings: Remove needless dialogTitle attribute.John Spurlock2014-08-201-4/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DropDownPreference has no dialog, and therefore no title. Remove to avoid confusion for future copy-pasters. Bug:16241745 Change-Id: I1130ed5d90b9b769294b64f02ddbf8f00fabe6b0
* | | | Merge "Added a developer option to save attribute data." into lmp-devJon Miranda2014-08-203-1/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Added a developer option to save attribute data.Jon Miranda2014-08-183-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After the checkbox for 'Enable view attribute inspection' is checked, newly constructed Views will save their attribute data. Change-Id: Ia6d150d0d9991a2341236a9d35055b811038c849
* | | | Declare CAST_SETTINGS activity.Jeff Brown2014-08-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently this is the same as the WIFI_DISPLAY_SETTINGS activity although we may eventually split them apart. Change-Id: I4c4482792abc3d3d22fb50ee9657b536374a618f
generated by cgit v1.1 at 2024-08-04 01:34:12 +0000