summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Restriction pin changes.Geoffrey Borggaard2013-08-077-40/+98
| | | | | | | | | Fixed bug in WirelessSettings where it was asking users for a PIN when they weren't restricted. Did this by refactoring the preference level pin checking into the superclass, where it checks for the restricted mode first. Also pin protected changes to certificates for restricted users. Change-Id: I8310fd39f0862159668318fc1360ec6859cc00d5
* Merge "Pin protect more screens."Geoffrey Borggaard2013-08-068-44/+159
|\
| * Pin protect more screens.Geoffrey Borggaard2013-08-068-44/+159
| | | | | | | | | | | | | | | | When these screens are locked down with user restrictions, it should prompt the user for the restrictions pin before allowing access to the settings screen. Change-Id: Iadbb087da2d9470b855ea0bea89f2da1ffb9e854
* | Add captioning preferences screenAlan Viverette2013-08-0628-12/+1939
| | | | | | | | | | BUG: 9926077 Change-Id: Iea141d5d6fd0e4f134c36c51d89830b3c31abd09
* | Merge "Remove Restrictions UI"Amith Yamasani2013-08-063-166/+0
|\ \
| * | Remove Restrictions UIAmith Yamasani2013-08-063-166/+0
| | | | | | | | | | | | | | | Bug: 10200097 Change-Id: Ifaa8aaa9aa5ad17a948bf18f184a131295112a30
* | | State that TTS language is not supported if not in available list.Przemyslaw Szczepaniak2013-08-062-6/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bad TTS implementation of isLanguageAvailable may cause settings to think that given language is available. This change adds additional check, by searching locale in list of available locales returned form TTS CheckVoiceData activity. Bug: 9982002 Change-Id: Ic91cd1218349b8241e3f40f2343df52f3d900544
* | | am 9a4f4656: am a5ac281d: am 40557800: Fix issue #10190597: "Any permission ↵Dianne Hackborn2013-08-051-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | restrictions" is displayed after a... * commit '9a4f4656d752192db96348a488fe4968170eedb5': Fix issue #10190597: "Any permission restrictions" is displayed after a...
| * | am a5ac281d: am 40557800: Fix issue #10190597: "Any permission restrictions" ↵Dianne Hackborn2013-08-051-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | is displayed after a... * commit 'a5ac281db7103aef790a6141cd72fdbc22835552': Fix issue #10190597: "Any permission restrictions" is displayed after a...
| | * \ am 40557800: Fix issue #10190597: "Any permission restrictions" is displayed ↵Dianne Hackborn2013-08-051-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after a... * commit '405578009471ab7908af26a813f7d2ef8c072a5c': Fix issue #10190597: "Any permission restrictions" is displayed after a...
| | | * | Fix issue #10190597: "Any permission restrictions" is displayed after a...Dianne Hackborn2013-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...newline in "Reset app preferences" dialog Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
* | | | | am fc222b8d: am 8f00b771: Merge "Fix app ops details not displaying ↵Dianne Hackborn2013-08-051-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | permissions under certain conditions." * commit 'fc222b8d3aa716fe1596109ea960d57eb3aea1c5': Fix app ops details not displaying permissions under certain conditions.
| * | | | am 8f00b771: Merge "Fix app ops details not displaying permissions under ↵Dianne Hackborn2013-08-051-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | certain conditions." * commit '8f00b7711c48a102a70f9b7e6a563aa14b79f5a5': Fix app ops details not displaying permissions under certain conditions.
| | * \ \ \ Merge "Fix app ops details not displaying permissions under certain conditions."Dianne Hackborn2013-08-051-1/+1
| | |\ \ \ \
| | | * | | | Fix app ops details not displaying permissions under certain conditions.Danny Baumann2013-08-051-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there's a permission that is not granted, the loop is aborted instead of just skipping said permission. Change-Id: Icca567ebdd818f40ad6619f258c77590074d1deb
* | | | | | Merge "Add some missing fragments to the whitelist"Amith Yamasani2013-08-051-0/+2
|\ \ \ \ \ \
| * | | | | | Add some missing fragments to the whitelistAmith Yamasani2013-08-051-0/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 10184429 Change-Id: I4b4da5d5f2f4ec64992012e9d15799d195870a8a
* | | | | | Disable TTS "Listen to the example" if not supportedPrzemyslaw Szczepaniak2013-08-053-44/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If current TTS locale (most of the cases same as device locale) is not supported by the TTS engine, field for setting synthesis speed and "Listen to the example" will be disabled. Added new field, "Default language status" to indicate level of support for currently selected language. It can take one of three messages: %s is fully supported %s requires network connection %s is not supported Where %s is locale display name. Added example string that will provide a fallback for example text if not provided by Settings or TTS engine. Change-Id: Ia2a920a71197a85d3812fc8df9dfed4ebe6b515f Bug: 9982002
* | | | | | am ad38b60b: am 0a09b13c: am a6683e0f: Reset app preferences now resets all ↵Dianne Hackborn2013-08-032-1/+6
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | app ops. * commit 'ad38b60b372314f6266381207bd82144f21b1027': Reset app preferences now resets all app ops.
| * | | | | am 0a09b13c: am a6683e0f: Reset app preferences now resets all app ops.Dianne Hackborn2013-08-022-1/+6
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '0a09b13c81bb0ebe556e46e3859a25805b2cbdcf': Reset app preferences now resets all app ops.
| | * | | | am a6683e0f: Reset app preferences now resets all app ops.Dianne Hackborn2013-08-022-1/+6
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | * commit 'a6683e0f4af75005ab5a1742d30df4bee071f725': Reset app preferences now resets all app ops.
| | | * | | Reset app preferences now resets all app ops.Dianne Hackborn2013-08-022-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
* | | | | | Add secure overlay displays in developer options.Jeff Brown2013-08-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I16fb0429de42443a95e8dfd03382bf8e0c2a6bb7
* | | | | | am a43e2701: (-s ours) am 4dce3456: am 034b83e8: Reconcile with AOSP ↵Jean-Baptiste Queru2013-08-020-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev - do not merge * commit 'a43e27016410910e9d11c09e981e58743ee9439e': Completely remove app ops activity.
| * | | | | am 4dce3456: am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not mergeJean-Baptiste Queru2013-08-020-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '4dce3456c7c858d5cec053cfd8a7f8ff2babec1d': Completely remove app ops activity.
| | * | | | am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not mergeJean-Baptiste Queru2013-08-020-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '034b83e8668a0b26d1eccfc9fa433b8eae3e50a8': Completely remove app ops activity.
| | | * | | Reconcile with AOSP jb-mr2-dev - do not mergeJean-Baptiste Queru2013-08-020-0/+0
| | | |\ \ \
| | | | * | | Completely remove app ops activity.Dianne Hackborn2013-08-021-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
* | | | | | | Merge "Added UI widgets for new location settings page"Lifu Tang2013-08-037-209/+279
|\ \ \ \ \ \ \
| * | | | | | | Added UI widgets for new location settings pageLifu Tang2013-08-027-209/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I87eee999a4dd0189609f58d6f3e4ffe517d63a0e
* | | | | | | | am 45d4dce2: (-s ours) am ca1b7458: Completely remove app ops activity.Dianne Hackborn2013-08-020-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '45d4dce29eea9fd503b15aedf4f63e38bf5fb0d7': Completely remove app ops activity.
| * | | | | | | am ca1b7458: Completely remove app ops activity.Dianne Hackborn2013-08-021-4/+3
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'ca1b7458244191214172009d21eae2d04b6992f9': Completely remove app ops activity.
| | * | | | | | Completely remove app ops activity.Dianne Hackborn2013-08-021-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
* | | | | | | | Merge commit '0b849a70'Baligh Uddin2013-08-021-3/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflict. Conflicts: AndroidManifest.xml
| * | | | | | | am 1a32d477: am 136059f1: Merge "Revert "Completely remove app ops ↵Dave Burke2013-08-021-3/+4
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity."" into jb-mr2-dev * commit '1a32d477934399ca5331863fe17651c1dbf165b8': Revert "Completely remove app ops activity."
| | * | | | | | am 136059f1: Merge "Revert "Completely remove app ops activity."" into ↵Dave Burke2013-08-021-3/+4
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '136059f118b580a3dc8f3023d1d19c8c56020a01': Revert "Completely remove app ops activity."
| | | * | | | | Merge "Revert "Completely remove app ops activity."" into jb-mr2-devDave Burke2013-08-021-3/+4
| | | |\ \ \ \ \
| | | | * | | | | Revert "Completely remove app ops activity."Dave Burke2013-08-021-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1ad26e9c370e3db3ac801bda42b3fa52ab2e2d07. Change-Id: I58b5ea280ed0dbff00f7f6f98fbd41575cdd5222
* | | | | | | | | Merge "Adds a base class for restricted settings"Geoffrey Borggaard2013-08-022-18/+140
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adds a base class for restricted settingsGeoffrey Borggaard2013-08-022-18/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates an easy way to ask for the restriction pin before allowing access to a settings page. Does this to the WiFiSettings. Change-Id: I49734f66e09b6449596412ecf6fc1113bf57ce7f
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-08-0248-1527/+1501
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-08-0148-1527/+1501
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I619da6bcb74ebdb1bbb94878f62966870bf6ca64 Auto-generated-cl: translation import
* | | | | | | | | | | Fix ime settingsSatoshi Kataoka2013-08-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8364845 Change-Id: I1c9b30fa64682b905ef32c10bda0c9f93e8be975
* | | | | | | | | | | Allow the users to disable system IMESatoshi Kataoka2013-08-024-54/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8364845 Change-Id: Icc5173a68fa00b2895c0768ff8f8b9dcf30e6171
* | | | | | | | | | | Merge commit '99d5938c'Baligh Uddin2013-08-011-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | / / / | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflict per ag/326799 Conflicts: AndroidManifest.xml
| * | | | | | | | | am df195650: am d346fce2: Merge "Completely remove app ops activity." into ↵Sascha Prueter2013-08-011-4/+3
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'df195650191ba2d5a6090ff0721242b044b9b010': Completely remove app ops activity.
| | * | | | | | | | am d346fce2: Merge "Completely remove app ops activity." into jb-mr2-devSascha Prueter2013-08-011-4/+3
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd346fce2687237d30677b69e66c76ba6cba8622b': Completely remove app ops activity.
| | | * | | | | | | Merge "Completely remove app ops activity." into jb-mr2-devSascha Prueter2013-08-011-4/+3
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | Completely remove app ops activity.Dianne Hackborn2013-07-011-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
* | | | | | | | | | Merge "Add Strings for the new high power location monitoring app op."David Christie2013-08-012-3/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
generated by cgit v1.1 at 2025-02-10 03:21:51 +0000