Commit Graph

11333 Commits

Author SHA1 Message Date
Dianne Hackborn
c6d658e37d Initial rough stab at a proc stats UI.
You see procs, and you see some stats.

Change-Id: I91c86d198fd5e64a41c72901e150466b3c602caf
2013-08-08 15:01:59 -07:00
Baligh Uddin
dcd15ee04b am 7256942b: (-s ours) am d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '7256942bb757bfaa14db128386c0ecb363b26935':
  Import translations. DO NOT MERGE
2013-08-08 14:14:17 -07:00
The Android Open Source Project
76cbd84193 am f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit 'f4316f6d5b9a87cd366af4f0f22ab8713ac1b8ad':
  Import translations. DO NOT MERGE
  Fix issue #10190597: "Any permission restrictions" is displayed after a...
  Reset app preferences now resets all app ops.
  Import translations. DO NOT MERGE
  Fix issue #10190597: "Any permission restrictions" is displayed after a...
  Reset app preferences now resets all app ops.
  Revert "Completely remove app ops activity."
  Completely remove app ops activity.
2013-08-08 14:14:12 -07:00
Baligh Uddin
ff2aed99fc am b4d720f9: (-s ours) am 9a53339d: (-s ours) am e211fd11: (-s ours) Import translations. DO NOT MERGE
* commit 'b4d720f9d739f5618d6acef9bd87837700c908eb':
  Import translations. DO NOT MERGE
2013-08-08 14:14:02 -07:00
Amith Yamasani
82f7c06448 Merge "Developer option to force RTL layout direction" into klp-dev 2013-08-08 20:46:24 +00:00
David Christie
b8fa4d9fe8 Merge "Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off." into klp-dev 2013-08-08 20:19:06 +00:00
Alan Viverette
660223ff43 Update captioning settings to match final design
BUG: 9926077
Change-Id: I058c05643f33aca89327f23bcdee53dd8afb3bbb
2013-08-08 12:51:54 -07:00
Svetoslav
3f257c4dfb Fix a crash in accessibiility settings.
Change-Id: I27920668191742ab032de7b71c8f71cc35432e9f
2013-08-08 12:37:48 -07:00
David Christie
681f799007 Modify Power Widget Gps Icon To Represent Location.
Instead of directly controlling gps on/off, it will
control master location switch on/off.

Change-Id: I12a20fb77c12b5099172167821ff7ed00ba9ea7c
2013-08-08 19:35:31 +00:00
Amith Yamasani
df1eda8ef7 Developer option to force RTL layout direction
Sets a global setting and system property and forces a config change
when developer selects to force RTL screen layout direction.

Bug: 10244047
Change-Id: Id91e52be5e492515ff1eef3cbccfb08e944bfc92
2013-08-08 12:34:56 -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
Robert Greenwalt
994807b1d2 Use the application name instead of package.
bug:10094017
Change-Id: I92341a819d13169c710f0d383f362796ee3ccf61
2013-08-08 10:01:07 -07: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
7256942bb7 am d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit 'd01ca3ce4a5b93dc0dad46ad0674d6b28d89b0ee':
  Import translations. DO NOT MERGE
2013-08-07 10:28:43 -07:00
Baligh Uddin
7494ff47aa Merge "Import translations. DO NOT MERGE" 2013-08-07 17:26:15 +00:00
Baligh Uddin
d01ca3ce4a Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 2013-08-07 17:24:07 +00:00
The Android Open Source Project
f4316f6d5b Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I84e2f72513f3087ff4628a838efcf471e3695934
2013-08-07 09:43:18 -07: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
Baligh Uddin
3bf09a9f84 Import translations. DO NOT MERGE
Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import

Conflicts:
	res/values-nl/strings.xml
	res/values-sw/strings.xml
2013-08-06 20:44:56 -07:00
Dianne Hackborn
703f8e9629 Fix issue #10190597: "Any permission restrictions" is displayed after a...
...newline in "Reset app preferences" dialog

Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
2013-08-06 20:37:43 -07:00
Dianne Hackborn
2965215c6e Reset app preferences now resets all app ops.
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
2013-08-06 20:37:33 -07:00
Baligh Uddin
d4c6b22188 Import translations. DO NOT MERGE
Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import
2013-08-06 20:10:13 -07:00
Dianne Hackborn
79f49fc878 Fix issue #10190597: "Any permission restrictions" is displayed after a...
...newline in "Reset app preferences" dialog

Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
2013-08-06 20:10:05 -07:00
Baligh Uddin
b4d720f9d7 am 9a53339d: (-s ours) am e211fd11: (-s ours) Import translations. DO NOT MERGE
* commit '9a53339dd6ea5c683629a5fff8837e7e59581680':
  Import translations. DO NOT MERGE
2013-08-06 20:05:46 -07:00
Baligh Uddin
9a53339dd6 am e211fd11: (-s ours) Import translations. DO NOT MERGE
* commit 'e211fd11c65c7db4e0225c774519604efa98889c':
  Import translations. DO NOT MERGE
2013-08-06 20:04:13 -07:00
Baligh Uddin
e211fd11c6 Import translations. DO NOT MERGE
Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import
2013-08-06 19:55:54 -07: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
Baligh Uddin
8c9f3fe405 Import translations. DO NOT MERGE
Change-Id: I271a9cdad27f7f5761cc16e14db5b512902d9b97
Auto-generated-cl: translation import
2013-08-05 21:43:40 -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
cc4b7eb15d Reset app preferences now resets all app ops.
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
2013-08-05 11:12:51 -07:00
Dianne Hackborn
8f00b7711c Merge "Fix app ops details not displaying permissions under certain conditions." 2013-08-05 18:11:11 +00:00