Commit Graph

10961 Commits

Author SHA1 Message Date
Lifu Tang
098061c202 am 88afb32f: Displays a list of most recent location apps
* commit '88afb32fc6422139dcf8340aa88f3de9112a1485':
  Displays a list of most recent location apps
2013-08-08 15:51:21 -07:00
Lifu Tang
7b449db21e am b14698ee: Merge "Finished the location settings"
* commit 'b14698ee6063960d48a691add890a5072f89ea2e':
  Finished the location settings
2013-08-08 15:51:20 -07:00
Jason Monk
49d6f604f1 am 71decb7b: Merge "Restriction pin changes."
* commit '71decb7b072d69613083285cee6014d37b2e6ef8':
  Restriction pin changes.
2013-08-08 15:51:20 -07:00
Baligh Uddin
dfa4596778 am 7494ff47: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '7494ff47aa1e756285810a73a2488af65f2d4cda':
  Import translations. DO NOT MERGE
2013-08-08 15:51:19 -07:00
Lifu Tang
88afb32fc6 Displays a list of most recent location apps
Change-Id: I8e34ca8c30f308744022f17fac2444a496abd9e6
(cherry picked from commit 16ab0eca74751c331c1c74612548a27735a450b7)
2013-08-08 18:38:11 +00:00
Lifu Tang
b14698ee60 Merge "Finished the location settings" 2013-08-08 00:55:39 +00:00
Lifu Tang
e631423290 Finished the location settings
Change-Id: I333fcc74ad387ef6edaa558656d3eaa91feb8fe9
2013-08-07 17:45:24 -07:00
Jason Monk
71decb7b07 Merge "Restriction pin changes." 2013-08-07 19:10:42 +00:00
Geoffrey Borggaard
6e1102d9fa Restriction pin changes.
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
2013-08-07 14:57:43 -04:00
Baligh Uddin
7494ff47aa Merge "Import translations. DO NOT MERGE" 2013-08-07 17:26:15 +00:00
Satoshi Kataoka
cabde98bcd Change the refresh timing in input method settings
Bug: 8364845
Change-Id: I564a4b0d80cec5be670e2ca89e09d45944671082
2013-08-07 18:24:10 +09:00
Satoshi Kataoka
5aef342aad Use isAsciiCapable when disabling system ime
Bug: 8364845
Change-Id: I2bb02b0c57b65ac3496b92d379e6d4ff21f338b1
2013-08-07 17:10:22 +09:00
Martijn Coenen
7f34fab684 Merge "NFC payment settings." 2013-08-07 02:28:40 +00:00
Martijn Coenen
26515da087 NFC payment settings.
First version, pending final UX.

Change-Id: I357e900c3f2012b35814ae197c49a8c9b97b7148
2013-08-06 19:16:54 -07:00
Lorenzo Colitti
b75f10305d Merge "Display all link IP addresses, on different lines" 2013-08-07 00:32:44 +00:00
Amith Yamasani
56f51a8927 Single pane for 10" Settings
Change-Id: I960e4be3cfb19ffec4100f8766742d6fb17dda4a
2013-08-06 16:23:37 -07:00
Geoffrey Borggaard
8a181dd0d1 Merge "Pin protect more screens." 2013-08-06 22:03:44 +00:00
Geoffrey Borggaard
fe21d9aaa8 Pin protect more screens.
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
2013-08-06 17:24:37 -04:00
Alan Viverette
cc0e782871 Add captioning preferences screen
BUG: 9926077
Change-Id: Iea141d5d6fd0e4f134c36c51d89830b3c31abd09
2013-08-06 13:53:58 -07:00
Amith Yamasani
279a8dfc40 Merge "Remove Restrictions UI" 2013-08-06 18:21:28 +00:00
Amith Yamasani
0aa1dc70c5 Remove Restrictions UI
Bug: 10200097
Change-Id: Ifaa8aaa9aa5ad17a948bf18f184a131295112a30
2013-08-06 10:46:51 -07:00
Przemyslaw Szczepaniak
6ada2d5547 State that TTS language is not supported if not in available list.
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
2013-08-06 13:55:52 +01:00
Baligh Uddin
c08b7692c8 Import translations. DO NOT MERGE
Change-Id: I930e4bf6efae6d8552ccf739970539ff8820079f
Auto-generated-cl: translation import
2013-08-05 21:46:55 -07:00
Dianne Hackborn
5459b722ca am 9a4f4656: am a5ac281d: am 40557800: Fix issue #10190597: "Any permission restrictions" is displayed after a...
* commit '9a4f4656d752192db96348a488fe4968170eedb5':
  Fix issue #10190597: "Any permission restrictions" is displayed after a...
2013-08-05 16:52:32 -07:00
Dianne Hackborn
9a4f4656d7 am a5ac281d: am 40557800: Fix issue #10190597: "Any permission restrictions" is displayed after a...
* commit 'a5ac281db7103aef790a6141cd72fdbc22835552':
  Fix issue #10190597: "Any permission restrictions" is displayed after a...
2013-08-05 16:49:02 -07:00
Dianne Hackborn
a5ac281db7 am 40557800: Fix issue #10190597: "Any permission restrictions" is displayed after a...
* commit '405578009471ab7908af26a813f7d2ef8c072a5c':
  Fix issue #10190597: "Any permission restrictions" is displayed after a...
2013-08-05 16:45:48 -07:00
Dianne Hackborn
4055780094 Fix issue #10190597: "Any permission restrictions" is displayed after a...
...newline in "Reset app preferences" dialog

Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
2013-08-05 16:23:58 -07:00
Dianne Hackborn
d98d2abda6 am fc222b8d: am 8f00b771: Merge "Fix app ops details not displaying permissions under certain conditions."
* commit 'fc222b8d3aa716fe1596109ea960d57eb3aea1c5':
  Fix app ops details not displaying permissions under certain conditions.
2013-08-05 11:20:06 -07:00
Dianne Hackborn
fc222b8d3a am 8f00b771: Merge "Fix app ops details not displaying permissions under certain conditions."
* commit '8f00b7711c48a102a70f9b7e6a563aa14b79f5a5':
  Fix app ops details not displaying permissions under certain conditions.
2013-08-05 11:15:43 -07:00
Dianne Hackborn
8f00b7711c Merge "Fix app ops details not displaying permissions under certain conditions." 2013-08-05 18:11:11 +00:00
Amith Yamasani
6ed6e8124a Merge "Add some missing fragments to the whitelist" 2013-08-05 18:04:23 +00:00
Amith Yamasani
ee226f9885 Add some missing fragments to the whitelist
Bug: 10184429
Change-Id: I4b4da5d5f2f4ec64992012e9d15799d195870a8a
2013-08-05 11:02:16 -07:00
Danny Baumann
67e72d9e8a Fix app ops details not displaying permissions under certain conditions.
If there's a permission that is not granted, the loop is aborted instead
of just skipping said permission.

Change-Id: Icca567ebdd818f40ad6619f258c77590074d1deb
2013-08-05 14:30:33 +02:00
Przemyslaw Szczepaniak
4c85c1d6f4 Disable TTS "Listen to the example" if not supported
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
2013-08-05 10:55:07 +01:00
Dianne Hackborn
2500f7a3f5 am ad38b60b: am 0a09b13c: am a6683e0f: Reset app preferences now resets all app ops.
* commit 'ad38b60b372314f6266381207bd82144f21b1027':
  Reset app preferences now resets all app ops.
2013-08-03 00:10:16 -07:00
Dianne Hackborn
ad38b60b37 am 0a09b13c: am a6683e0f: Reset app preferences now resets all app ops.
* commit '0a09b13c81bb0ebe556e46e3859a25805b2cbdcf':
  Reset app preferences now resets all app ops.
2013-08-02 19:32:14 -07:00
Dianne Hackborn
0a09b13c81 am a6683e0f: Reset app preferences now resets all app ops.
* commit 'a6683e0f4af75005ab5a1742d30df4bee071f725':
  Reset app preferences now resets all app ops.
2013-08-02 19:30:09 -07:00
Dianne Hackborn
a6683e0f4a Reset app preferences now resets all app ops.
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
2013-08-02 19:20:48 -07:00
Jeff Brown
84dea9e038 Add secure overlay displays in developer options.
Change-Id: I16fb0429de42443a95e8dfd03382bf8e0c2a6bb7
2013-08-02 19:07:05 -07:00
Jean-Baptiste Queru
14c8056525 am a43e2701: (-s ours) am 4dce3456: am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge
* commit 'a43e27016410910e9d11c09e981e58743ee9439e':
  Completely remove app ops activity.
2013-08-02 17:58:47 -07:00
Jean-Baptiste Queru
a43e270164 am 4dce3456: am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge
* commit '4dce3456c7c858d5cec053cfd8a7f8ff2babec1d':
  Completely remove app ops activity.
2013-08-02 17:44:48 -07:00
Jean-Baptiste Queru
4dce3456c7 am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge
* commit '034b83e8668a0b26d1eccfc9fa433b8eae3e50a8':
  Completely remove app ops activity.
2013-08-02 17:39:03 -07:00
Lifu Tang
1cad5b21e4 Merge "Added UI widgets for new location settings page" 2013-08-03 00:04:24 +00:00
Lifu Tang
d5fbbc4e49 Added UI widgets for new location settings page
Change-Id: I87eee999a4dd0189609f58d6f3e4ffe517d63a0e
2013-08-02 16:57:07 -07:00
Dianne Hackborn
b1f8607379 am 45d4dce2: (-s ours) am ca1b7458: Completely remove app ops activity.
* commit '45d4dce29eea9fd503b15aedf4f63e38bf5fb0d7':
  Completely remove app ops activity.
2013-08-02 15:03:21 -07:00
Baligh Uddin
dbf91c105a Merge commit '0b849a70'
Resolve conflict.

Conflicts:
	AndroidManifest.xml
2013-08-02 14:51:33 -07:00
Jean-Baptiste Queru
034b83e866 Reconcile with AOSP jb-mr2-dev - do not merge 2013-08-02 14:48:27 -07:00
Dianne Hackborn
67c0500290 Completely remove app ops activity.
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
2013-08-02 14:45:05 -07:00
Dianne Hackborn
45d4dce29e am ca1b7458: Completely remove app ops activity.
* commit 'ca1b7458244191214172009d21eae2d04b6992f9':
  Completely remove app ops activity.
2013-08-02 14:41:18 -07:00
Dianne Hackborn
ca1b745824 Completely remove app ops activity.
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
2013-08-02 14:35:10 -07:00