summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Zen: Move zen mode preference to switch bar.John Spurlock2015-04-046-136/+202
| | | | | | | | | | - Add summary line support to SwitchBar. - Remove obsolete strings. - Wire up switchbar to zen mode w/ dialog prompt. - Remove obsolete callback pref helper. Bug: 20064962 Change-Id: Ifede00b5d43d441ccd94db96bd2796bc57d1a990
* Merge "Settings: Move downtime to new automation sub-settings page."John Spurlock2015-04-036-364/+477
|\
| * Settings: Move downtime to new automation sub-settings page.John Spurlock2015-04-036-364/+477
| | | | | | | | | | Bug: 20064962 Change-Id: I6238439bbd679c143fc986743a65ed64057f2755
* | Merge "Support for nested bundles in setApplicationRestrictions"Fyodor Kupolov2015-04-032-17/+4
|\ \
| * | Support for nested bundles in setApplicationRestrictionsFyodor Kupolov2015-04-032-17/+4
| | | | | | | | | | | | | | | | | | | | | | | | Replaced RestrictionUtils.restrictionsToBundle with RestrictionsManager. convertRestrictionsToBundle. Bug: 19540606 Change-Id: I32b264e04d5d177ea5b4c39a8ace5ee0ce907970
* | | Merge "Settings - add support for Launch by Default"Fabrice Di Meglio2015-04-0310-163/+487
|\ \ \
| * | | Settings - add support for Launch by DefaultFabrice Di Meglio2015-04-0310-163/+487
| | | | | | | | | | | | | | | | | | | | | | | | - implement UX spec Change-Id: I7ee8962f83983273d809e0ef6fc81b0eb2df15dd
* | | | Merge "Make Settings app not use cleartext network traffic."Alex Klyubin2015-04-032-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make Settings app not use cleartext network traffic.Alex Klyubin2015-04-022-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL switches the only two places which use cleartext HTTP in this app to HTTPS. It also declares in the AndroidManifest.xml that this app does not use cleartext network traffic, thus asking the platform and tools to block any such traffic from this app on best effort basis. NOTE: The only test that uses cleartext HTTP traffic is in VpnTests. This test makes cleartext HTTP requests to a third-party service which does not appear to support HTTPS. Thus, this CL temporarily relaxes the cleartext traffic policy during this test to keep it working. The correct longer-term fix for this test is to use a service that offers HTTPS. Bug: 19215516 Change-Id: Idf1ff8c66d43d77ef2114b2f1b676927844150e5
* | | Merge "Settings: Move priority configuration to its own sub-settings page."John Spurlock2015-04-036-187/+329
|\ \ \ | |_|/ |/| |
| * | Settings: Move priority configuration to its own sub-settings page.John Spurlock2015-04-036-187/+329
| | | | | | | | | | | | | | | Bug: 20064962 Change-Id: Idd03e0e5077e13cc08ff9997ab9ad56ddcdb5c50
* | | Merge "Show current screen lock as summary"Jason Monk2015-04-031-0/+28
|\ \ \ | |/ / |/| |
| * | Show current screen lock as summaryJason Monk2015-03-301-0/+28
| | | | | | | | | | | | | | | Bug: 19819290 Change-Id: Iefdacd6b86f96e6f3577351e7f92b86217b1b7ad
* | | Settings: Support new alarms-only zen value.John Spurlock2015-04-021-1/+3
| |/ |/| | | | | | | Bug: 19260237 Change-Id: I57941c0e4df8026cdc36076551770a813800edc8
* | Merge "Add default emergency app setting"Adrian Roos2015-04-021-0/+137
|\ \
| * | Add default emergency app settingAdrian Roos2015-04-021-0/+137
| | | | | | | | | | | | | | | Bug: 19841649 Change-Id: I1763ee16e1e10c957261fe663f4c87269adcdef7
* | | Merge "provide better instructions for adding settings views."Chris Wren2015-04-023-0/+24
|\ \ \
| * | | provide better instructions for adding settings views.Chris Wren2015-04-023-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | And provide a ready default constant. Change-Id: I76c9ee50af5d97f9f83be7b0eb862f73fc9bfa7b
* | | | Merge "Prepare to make Fingerprint API public."Jim Miller2015-04-024-12/+12
|\ \ \ \
| * | | | Prepare to make Fingerprint API public.Jim Miller2015-04-014-12/+12
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - moved fingerprint support files into hardware area - moved jni into services/core Bug 16487912 Change-Id: Id111ee89771fc208a9365fd06c57b3dbf85b5356
* | | | Merge changes from topic 'mwd-merge-040115'Etan Cohen2015-04-022-6/+20
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Merge commit '279cb4a' into merge Merge commit '898e486' into merge Merge commit 'fc75374' into merge Merge commit '2241607' into merge Merge commit 'fe47522' into merge
| * | | Merge commit '2241607' into mergeEtan Cohen2015-03-311-5/+19
| |\ \ \
| | * \ \ Update Wi-Fi Calling settingsPavel Zhamaitsiak2015-03-231-5/+19
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: ee5f27d * commit 'ee5f27dbeeef90381de905d05b3b67bc1837df20': Update Wi-Fi Calling settings
| | | * | | Update Wi-Fi Calling settingsPavel Zhamaitsiak2015-03-231-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update strings - Move WFC mode summary strings to framework/base - Update screens to reflect latest UX requirements Change-Id: Ibcb1a0b6eec2342dfbaa30f90fe728976ad80a0d
| * | | | | Merge commit 'fe47522' into mergeEtan Cohen2015-03-311-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | Fix "Rename device" BT settings to avoid accepting blank spaces.Sanket Padawe2015-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16157293 Change-Id: I0eddafd9fad89b76ab1d00005ca4a4f2725eb83e
* | | | | Move reset network settings into framework.Stuart Scott2015-03-301-92/+17
| |_|_|/ |/| | | | | | | | | | | | | | | bug: 16161518 Change-Id: I7d62201758e97bf08117183429a7acfa13b74994
* | | | Merge "Add permissions screen to advanced apps"Jason Monk2015-03-303-1/+322
|\ \ \ \
| * | | | Add permissions screen to advanced appsJason Monk2015-03-303-1/+322
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a screen that shows a list of permissions and how many apps have been granted them, link to PackageInstaller for control of the permissions. Depends on I68cdbe53177f742daf396f4eb53761fd5cda2636 Change-Id: I183848ea89ea41a17eaf663441dc4ef963be99bf
* | | | log wifi actions from settingsChris Wren2015-03-302-1/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To start: enable disable forget connect add Depends-On: I60163e44602b8e23b643b9103c324fa0e0d2c4c4 Change-Id: I52f40298db63f410ced2dbf5ba05d3ad098a85a2
* | | Merge "Forget Wifi SSID"Stuart Scott2015-03-271-0/+1
|\ \ \
| * | | Forget Wifi SSIDStuart Scott2015-03-261-0/+1
| | | | | | | | | | | | | | | | Change-Id: I6d4bf3117d92567f89a8eedf41a430ee5342b6c6
* | | | Merge "Made scanning settings searchable"Lifu Tang2015-03-272-2/+12
|\ \ \ \
| * | | | Made scanning settings searchableLifu Tang2015-03-272-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19965598 Change-Id: I2868bc2185d56861f5a0927bb8d49d978e99f33b
* | | | | log visibility of viewsChris Wren2015-03-27116-53/+837
|/ / / / | | | | | | | | | | | | | | | | Depends-On: I5b1dccb5d103ece3112acf38889bae16273b092f Change-Id: I116aed2bb805f723a5bf2ec9eb94257de0b4a7b5
* | | | Merge "Fix managed profile bugs in manage apps list"Jason Monk2015-03-261-11/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Fix managed profile bugs in manage apps listJason Monk2015-03-261-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Uses the same package manager flags as secondary users for managed profiles, so that owner apps don't show up. - Fixes bug in getting AppEntries that caused app info for profile apps to get the owner one instead (which was unbadged and very broken). Bug: 19817357 Change-Id: I659ab1081c68a231330f5b16486abc5a0a5b2029
* | | | Merge "Dont access PhoneFactory, as it could have been inited in another JVM."Stuart Scott2015-03-251-7/+5
|\ \ \ \
| * | | | Dont access PhoneFactory, as it could have been inited in another JVM.Stuart Scott2015-03-231-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | bug:19858201 Change-Id: I1684c473407b530d23a8965df3ff9a5353803397
* | | | | am f6432118: am 4a682e56: am c28e80b8: am 53eec9fa: Fix sim notifications.Stuart Scott2015-03-251-51/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f64321184cbe64ab010ffd2fde9bbd543bec9299': Fix sim notifications.
| * \ \ \ \ am c28e80b8: am 53eec9fa: Fix sim notifications.Stuart Scott2015-03-251-51/+34
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c28e80b8fb1a4fd6d326bbb79547f3597cf0412f': Fix sim notifications.
| | * | | | | Fix sim notifications.Stuart Scott2015-03-251-51/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:19705366 Change-Id: I1d1f2dc5cf1d4580ab503c88853b089db0362242
* | | | | | | Merge "Merge remote-tracking branch ↵Prerepa Viswanadham2015-03-255-48/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'goog/mirror-m-wireless-internal-release' into master_merge Fix build in DevelopmentSettings.java"
| * \ \ \ \ \ \ Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into ↵Prerepa Viswanadham2015-03-245-48/+51
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master_merge Fix build in DevelopmentSettings.java Change-Id: I8d89fd46482fae8e708398f749e480b8a06f5f03
| | * | | | | | Merge "Restore password visibility on screen rotation in Hotspot/Wifi ↵Sanket Padawe2015-03-203-9/+21
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | setup." into m-wireless-dev
| | | * | | | | | Restore password visibility on screen rotation in Hotspot/Wifi setup.Sanket Padawe2015-03-203-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16237425 Change-Id: I2bf0aaaa657d60f007858c6635d2a17326562c66
| | * | | | | | | Disable Wi-Fi Calling when getting "registration error" intent.Pavel Zhamaitsiak2015-03-181-2/+5
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e861691 * commit 'e8616913b43d9356b5556dd0f2cab72d8ab4e875': Disable Wi-Fi Calling when getting "registration error" intent.
| | | * | | | | | Disable Wi-Fi Calling when getting "registration error" intent.Pavel Zhamaitsiak2015-03-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19698057 Change-Id: I403417e08f84014fb9bd9f213fd2b8644e2a6541
| | * | | | | | | Remove WFC Roaming settingPavel Zhamaitsiak2015-03-181-34/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 1e034fe * commit '1e034fe79a164a12385b077e2aad9ebfaab5e389': Remove WFC Roaming setting
| | | * | | | | | Remove WFC Roaming settingPavel Zhamaitsiak2015-03-121-34/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 19682545 Change-Id: I0adc7a20c411dd1fea3e2b79bcd5e159537a65c0
generated by cgit v1.1 at 2025-02-03 12:42:01 +0000