PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,997 Commits 1 Branch 0 Tags
1023be95cd8d0c20e2dada747899f5e71b89feab
Commit Graph

10997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
1023be95cd am c7891c6c: (-s ours) am ff2aed99: (-s ours) am b4d720f9: (-s ours) am 9a53339d: (-s ours) am e211fd11: (-s ours) Import translations. DO NOT MERGE 
* commit 'c7891c6c8d309710a4b948ad2084e43bcd7ebe5c':
 2013-08-08 16:58:44 -07:00
Amith Yamasani
6d60f2dee1 am 05e2459f: am 82f7c064: Merge "Developer option to force RTL layout direction" into klp-dev 
* commit '05e2459fb85848b19362554a7ffeb2e9b50da720':
  Developer option to force RTL layout direction
 2013-08-08 16:58:43 -07:00
David Christie
4628dcaaec am aba6eb64: am b8fa4d9f: 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 
* commit 'aba6eb64633e7957afe036a5d7c506b9c059ec3e':
  Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off.
 2013-08-08 16:58:42 -07:00
Svetoslav
fe5d465877 am 0427cb67: am 3f257c4d: Fix a crash in accessibiility settings. 
* commit '0427cb67d1545d38859e6522905b4a78d82bacc7':
  Fix a crash in accessibiility settings.
 2013-08-08 16:58:41 -07:00
Lifu Tang
83617ffcf8 am 098061c2: am 88afb32f: Displays a list of most recent location apps 
* commit '098061c2022164e169ec40e6114b48dd5bfcaff2':
  Displays a list of most recent location apps
 2013-08-08 16:58:40 -07:00
Lifu Tang
0292bfe072 am 7b449db2: am b14698ee: Merge "Finished the location settings" 
* commit '7b449db21ecae05f95355544936bd840a89601c7':
 2013-08-08 16:58:39 -07:00
Jason Monk
e273d0b22f am 49d6f604: am 71decb7b: Merge "Restriction pin changes." 
* commit '49d6f604f1ce05d90c8bdf25330fe8eb3eb924c9':
 2013-08-08 16:58:39 -07:00
Baligh Uddin
623b444932 am dfa45967: (-s ours) am 7494ff47: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'dfa4596778b39d07aa7f27145baedee31d17cd48':
 2013-08-08 16:58:38 -07:00
Baligh Uddin
c7891c6c8d am ff2aed99: (-s ours) am b4d720f9: (-s ours) am 9a53339d: (-s ours) am e211fd11: (-s ours) Import translations. DO NOT MERGE 
* commit 'ff2aed99fcc0656c5d5dd989ddd373834631286c':
  Import translations. DO NOT MERGE
 2013-08-08 15:56:11 -07:00
Amith Yamasani
05e2459fb8 am 82f7c064: Merge "Developer option to force RTL layout direction" into klp-dev 
* commit '82f7c064483732c925dfd12547bd32ffac211cd5':
  Developer option to force RTL layout direction
 2013-08-08 15:52:33 -07:00
David Christie
aba6eb6463 am b8fa4d9f: 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 
* commit 'b8fa4d9fe85c7513a8a5d9b1b6bcf3b8e5473849':
  Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off.
 2013-08-08 15:52:33 -07:00
Svetoslav
0427cb67d1 am 3f257c4d: Fix a crash in accessibiility settings. 
* commit '3f257c4dfba2acc2d61b91baf4f69524a1dc02af':
  Fix a crash in accessibiility settings.
 2013-08-08 15:52:32 -07:00
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
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
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
Baligh Uddin
9a642707bd 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 06:36:58 -07:00
The Android Open Source Project
6dca9a375c 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 06:36:53 -07:00
Baligh Uddin
c8a7ae3be8 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 06:36:42 -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