summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
Commit message (Collapse)AuthorAgeFilesLines
* Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-devVinit Deshpande2015-08-011-3/+6
|\
| * wifi: Check for the sizeof ssid to start SoftAPSunil Dutt2015-07-311-3/+6
| | | | | | | | | | | | | | | | Disable the option to start SoftAP if ssid byte length is over 32 bytes. Bug: 22074821 Change-Id: I696dca1aac8673bff168481fde4b013450bac72c
* | Fix fingerprint enrolling bug.Jim Miller2015-07-311-3/+5
| | | | | | | | | | | | | | | | | | This fixes a bug where rotating the device would call post_enroll() too early, thus invalidating the current session. Fixes bug 22708390 Change-Id: Ib4a334b50c16630b4fe4b451f6019d41225b2011
* | Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-devMaurice Lam2015-07-311-0/+1
|\ \
| * | [Fingerprint] Disable back in setup enrolling screenMaurice Lam2015-07-301-0/+1
| |/ | | | | | | | | | | | | | | | | Disable the back button because the back stack behavior is confusing. Instead of going back to the screen the user previously saw, pressing back in enrolling screen goes back to FindSensor. Bug: 22848016 Change-Id: I71852eb1974f1542fb519bf8bbfdce12de62e66b
* | Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-devMaurice Lam2015-07-311-0/+7
|\ \
| * | [Fingerprint] Advertise wake & unlock during SUWMaurice Lam2015-07-301-0/+7
| |/ | | | | | | | | | | | | | | Adds a string to advertise to the user that wake & unlock is available on all fingerprint devices. Bug: 22644642 Change-Id: I9e44174c6ab088a06f95ae5c377c8ccec13a4257
* | Merge "Add dialog to confirm last fingerprint removal" into mnc-devJorim Jaggi2015-07-301-6/+52
|\ \
| * | Add dialog to confirm last fingerprint removalJorim Jaggi2015-07-301-6/+52
| | | | | | | | | | | | | | | Bug: 22847296 Change-Id: Ib4984d8db0c9abc00442026360bd5617515225aa
* | | Merge "Refresh after clearing, tweak warn threshold." into mnc-devJeff Sharkey2015-07-303-12/+27
|\ \ \ | |_|/ |/| |
| * | Refresh after clearing, tweak warn threshold.Jeff Sharkey2015-07-303-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refresh UI after clearing cache. Hide user header on single-user devices to match UX spec. Refine adopted storage warning threshold based on experiments with various devices. For example, a typical internal storage device runs the benchmark in about 600ms. Very fast SD cards take about 1700ms, moderate speed SD cards take about 3800ms, and slow SD cards take about 6800ms. Bug: 22345902, 22487370 Change-Id: I6066f3b78dbb32277ae94b79e325500724f83c7e
* | | Merge "Bug: 22718745 Intents to 'draw over other apps' should go direct to ↵Billy Lau2015-07-309-6/+23
|\ \ \ | | | | | | | | | | | | the package's page instead of the top level one" into mnc-dev
| * | | Bug: 22718745 Intents to 'draw over other apps' should go direct to the ↵Billy Lau2015-07-299-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | package's page instead of the top level one Settings: Added two activities to handle app-specific Intent when app invoke permission management UI. SettingsActivity: Added two fragment classes to handle app-specific Intent when app invoke permission management UI. AndroidManifest.xml: We handle both Intent to top level settings and app-specific management UI for app ops protected permissions. AppStateAppOpsBridge: Added a new field to PermissionState to keep track of permission declared vs one that is actually granted during install time. AppState{Overlay/Usage/WriteSettings}Bridge: Updated the fields affected by changes in PermissionState. {DrawOverlay/UsageAccess/WriteSettings}Details: Disabled the toggling of permission if the app did not declare for the asked permission. Change-Id: Ibf63e4d9a4fbf7899a93d2176abb1204c4f75557
* | | | Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-devMaurice Lam2015-07-291-1/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | [ZenMode] Align text to viewStart in remove dialogMaurice Lam2015-07-281-1/+7
| | | | | | | | | | | | | | | | | | | | Bug: 22274462 Change-Id: I696c4b33c111a61b51e1581fd4a2830fc1844f40
* | | | Merge "fix InactiveApps instrumentation" into mnc-devChris Wren2015-07-291-2/+2
|\ \ \ \
| * | | | fix InactiveApps instrumentationChris Wren2015-07-281-2/+2
| |/ / / | | | | | | | | | | | | | | | | Bug: 21114836 Change-Id: I84357981158d057c2d302822801fb54ad82a901c
* | | | Merge "Use pattern visibility setting on confirm pattern screen." into mnc-devJulia Reynolds2015-07-291-12/+4
|\ \ \ \
| * | | | Use pattern visibility setting on confirm pattern screen.Julia Reynolds2015-07-281-12/+4
| |/ / / | | | | | | | | | | | | | | | | Bug: 22683055 Change-Id: Icc4c0c20175e09a0079f7a6bab93d3de6862f1a3
* | | | Merge "Fix tap & pay strings." into mnc-devMartijn Coenen2015-07-291-10/+3
|\ \ \ \
| * | | | Fix tap & pay strings.Martijn Coenen2015-07-281-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22534220 Bug: 22762332 Change-Id: Ifd98a6cf0490b6dd59cc6a0957db45509d6fd1d7
* | | | | Merge "Hide apps in the battery menu that have ↵Zach Johnson2015-07-282-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
| * | | | | Hide apps in the battery menu that have ↵Zach Johnson2015-07-242-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED Once they are enabled for the first time, they'll show up indefinitely. b/22667081 Change-Id: Ia28de99d7d638d54c15fac2e08edeb70a9657e23
* | | | | Merge "Prevent crash in app memory updater." into mnc-devJulia Reynolds2015-07-281-0/+3
|\ \ \ \ \
| * | | | | Prevent crash in app memory updater.Julia Reynolds2015-07-281-0/+3
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Bug: 22768769 Change-Id: I1eec14f5ffb46390aa6060babf86fc88ad76a16d
* | | | | Merge "Hide usage graph on app usage details pages." into mnc-devJulia Reynolds2015-07-281-1/+13
|\ \ \ \ \
| * | | | | Hide usage graph on app usage details pages.Julia Reynolds2015-07-281-1/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make the back button work properly on these pages. Bug: 22691655 Change-Id: Icb4d7730cfe5a89ffada0489a69e646cddff5560
* | | | | Merge "Don't use screenshot if structure is disabled (2/2)" into mnc-devJorim Jaggi2015-07-281-0/+17
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Don't use screenshot if structure is disabled (2/2)Jorim Jaggi2015-07-281-0/+17
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 22674955 Change-Id: I78208a4c746e3a501fe264918607ef94f64a8034
* | | | Merge "Fix blank confirm device credential activity" into mnc-devJorim Jaggi2015-07-281-1/+4
|\ \ \ \
| * | | | Fix blank confirm device credential activityJorim Jaggi2015-07-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to play the enter animation only once, so it is guaranteed that we get onEnterAnimationComplete. Bug: 22677671 Change-Id: Ia01bb33d6a90abb7dc26c9c12168e2c5ffab1b1d
* | | | | Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-devJorim Jaggi2015-07-271-34/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Move PIN/Pattern appear animation to RenderThread (2/2)Jorim Jaggi2015-07-211-34/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22205322 Change-Id: Idd16de04701c330b7559bb403316f691a9a717e9
* | | | | Merge "Battery summary - tint uid 0 icon" into mnc-devJason Monk2015-07-271-1/+2
|\ \ \ \ \
| * | | | | Battery summary - tint uid 0 iconJason Monk2015-07-271-1/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Bug: 22657823 Change-Id: If360420ada70777520ccc682022f7f4e2e50a70b
* | | | | Merge "Update battery optimization strings" into mnc-devJason Monk2015-07-271-3/+5
|\ \ \ \ \
| * | | | | Update battery optimization stringsJason Monk2015-07-271-3/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 22687961 Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa
* | | | | Merge "Fix issues in AP dialog arising after clicking on AP preferences." ↵Sanket Padawe2015-07-274-26/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | Fix issues in AP dialog arising after clicking on AP preferences.Sanket Padawe2015-07-244-26/+35
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | +Added a new flag to keep track if user wanted to modify AP by hard pressing on AP. Bug: 22485686 Change-Id: Ia60a564a5344393f5e5340a3493ae7c660ead3d7
* | | | | Handle app uninstall via Storage & USB.Julia Reynolds2015-07-271-0/+3
| |/ / / |/| | | | | | | | | | | | | | | Bug: 22702406 Change-Id: Ie02fd53be93cad1af043be2c573bd650fc1c0df2
* | | | Update FRP warning to specAdrian Roos2015-07-241-13/+22
| | | | | | | | | | | | | | | | | | | | Bug: 22672924 Change-Id: Ie275d5099553539707f86bf0e8cec5d5022ad227
* | | | Merge "[Fingerprint] Show skip button during SUW" into mnc-devMaurice Lam2015-07-244-4/+16
|\ \ \ \
| * | | | [Fingerprint] Show skip button during SUWMaurice Lam2015-07-224-4/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show a skip button during enrolling in case the user entered the flow accidentally. The skip button will send the result code RESULT_SKIP, which is equal to RESULT_FIRST_USER + 1, back to the starting activity. Bug: 22666389 Change-Id: I230b04e5150214c31536ac282d56b7b490c85ac1
* | | | Merge "Reset permissions and app links when clearing app preferences - ↵Svetoslav Ganov2015-07-231-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | settings" into mnc-dev
| * | | | Reset permissions and app links when clearing app preferences - settingsSvet Ganov2015-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:22359132 Change-Id: I55044a3fd1f8959a2a48cfd02276a24b2f619eb0
* | | | | Merge "Fix battery detail issues with "Android OS"" into mnc-devJason Monk2015-07-232-3/+7
|\ \ \ \ \
| * | | | | Fix battery detail issues with "Android OS"Jason Monk2015-07-222-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22638215 Change-Id: Ia5bab7eb3bfb964e7f914e8c8f392f4fea66eb29
* | | | | | Merge "Don't show disabled apps in ignore optimizations" into mnc-devJason Monk2015-07-231-2/+7
|\ \ \ \ \ \
| * | | | | | Don't show disabled apps in ignore optimizationsJason Monk2015-07-211-2/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22612760 Change-Id: Iddb3ad9cb9403d9e51bfcda82db3d10ee34ca47d
* | | | | | Prevent monkey from changing adoptable storage settingsGuang Zhu2015-07-232-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22423188 Change-Id: I36c798574c933b0339fad46af81b87a93ccea07b