summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Disable TTS "Listen to the example" if not supportedPrzemyslaw Szczepaniak2013-08-053-44/+114
* am ad38b60b: am 0a09b13c: am a6683e0f: Reset app preferences now resets all a...Dianne Hackborn2013-08-032-1/+6
|\
| * am 0a09b13c: am a6683e0f: Reset app preferences now resets all app ops.Dianne Hackborn2013-08-022-1/+6
| |\
| | * am a6683e0f: Reset app preferences now resets all app ops.Dianne Hackborn2013-08-022-1/+6
| | |\
| | | * Reset app preferences now resets all app ops.Dianne Hackborn2013-08-022-1/+6
* | | | Add secure overlay displays in developer options.Jeff Brown2013-08-021-0/+6
* | | | am a43e2701: (-s ours) am 4dce3456: am 034b83e8: Reconcile with AOSP jb-mr2-d...Jean-Baptiste Queru2013-08-020-0/+0
|\| | |
| * | | am 4dce3456: am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not mergeJean-Baptiste Queru2013-08-020-0/+0
| |\| |
| | * | am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not mergeJean-Baptiste Queru2013-08-020-0/+0
| | |\|
| | | * 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
* | | | | 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
* | | | | | am 45d4dce2: (-s ours) am ca1b7458: Completely remove app ops activity.Dianne Hackborn2013-08-020-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am ca1b7458: Completely remove app ops activity.Dianne Hackborn2013-08-021-4/+3
| |\ \ \ \ \
| | * | | | | Completely remove app ops activity.Dianne Hackborn2013-08-021-4/+3
* | | | | | | Merge commit '0b849a70'Baligh Uddin2013-08-021-3/+4
|\| | | | | |
| * | | | | | am 1a32d477: am 136059f1: Merge "Revert "Completely remove app ops activity."...Dave Burke2013-08-021-3/+4
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am 136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2...Dave Burke2013-08-021-3/+4
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | 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
* | | | | | | | 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
* | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-08-0248-1527/+1501
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-08-0148-1527/+1501
* | | | | | | | | | Fix ime settingsSatoshi Kataoka2013-08-021-2/+3
* | | | | | | | | | Allow the users to disable system IMESatoshi Kataoka2013-08-024-54/+119
* | | | | | | | | | Merge commit '99d5938c'Baligh Uddin2013-08-011-2/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | am df195650: am d346fce2: Merge "Completely remove app ops activity." into jb...Sascha Prueter2013-08-011-4/+3
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | am d346fce2: Merge "Completely remove app ops activity." into jb-mr2-devSascha Prueter2013-08-011-4/+3
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | 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
* | | | | | | | | Merge "Add Strings for the new high power location monitoring app op."David Christie2013-08-012-3/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add Strings for the new high power location monitoring app op.David Christie2013-07-302-3/+7
* | | | | | | | | | Add import for recently moved classAmith Yamasani2013-08-011-0/+1
* | | | | | | | | | Merge "Whitelist fragments appropriate for an activity"Amith Yamasani2013-08-0112-1/+153
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Whitelist fragments appropriate for an activityAmith Yamasani2013-07-3012-1/+153
| | |_|_|_|_|/ / / | |/| | | | | | |
* / | | | | | | | Implemented RadioButtonPreferenceLifu Tang2013-07-315-27/+93
|/ / / / / / / /
* | | | | | | | Merge "Moved LocationSettings into location sub-package"Lifu Tang2013-07-305-6/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Moved LocationSettings into location sub-packageLifu Tang2013-07-295-6/+9
* | | | | | | | | am 781458b3: (-s ours) am bdf28a18: (-s ours) am 0cb57011: (-s ours) Import t...Baligh Uddin2013-07-300-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | am bdf28a18: (-s ours) am 0cb57011: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-07-300-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | am 0cb57011: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-07-300-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-07-291-1/+1
* | | | | | | | | am 539552e1: (-s ours) am 3ddbe519: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-07-300-0/+0
|\| | | | | | | |
| * | | | | | | | am 3ddbe519: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-07-300-0/+0
| |\| | | | | | |
| | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-07-291-1/+1
* | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-07-3049-1/+129
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-07-2949-1/+129
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge "Refactor ime settings"Satoshi Kataoka2013-07-304-59/+36
|\ \ \ \ \ \ \ \ \