PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,018 Commits 1 Branch 0 Tags
2a19a31c9487c6bdc3cb5fa1376e91c1f88735d8
Commit Graph

11018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
2a19a31c94 am 85c37e78: am c0f79432: Merge "Update captioning settings to match final design" into klp-dev 
* commit '85c37e78b5bb21788ce3edb42363e550895cd9fc':
  Update captioning settings to match final design
 2013-08-09 15:54:15 -07:00
Alan Viverette
85c37e78b5 am c0f79432: Merge "Update captioning settings to match final design" into klp-dev 
* commit 'c0f79432cff613e993a86bece93ab1ef674d9054':
  Update captioning settings to match final design
 2013-08-09 15:22:05 -07:00
Alan Viverette
c0f79432cf Merge "Update captioning settings to match final design" into klp-dev 2013-08-09 19:11:25 +00:00
Amith Yamasani
d0a3f8727f am d04e36e6: am 2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev 
* commit 'd04e36e6f2259747dac4c4a1fa0393f72dc078af':
  Fix inconsistent text in Settings>Security>Screen lock
 2013-08-09 06:06:52 -07:00
Amith Yamasani
3fd2bbecc2 am 1eb6105f: am a42cacb3: Merge "Potential fix for Bug: 10241642" into klp-dev 
* commit '1eb6105f25dcecde565f9d56e5c87feed7bd520d':
  Potential fix for Bug: 10241642
 2013-08-09 06:05:56 -07:00
Dianne Hackborn
942c6e5ca3 am cd20ebcc: am c6d658e3: Initial rough stab at a proc stats UI. 
* commit 'cd20ebcc8c0261765fa8e6de57df3f72062c710e':
  Initial rough stab at a proc stats UI.
 2013-08-09 02:37:10 -07:00
Amith Yamasani
d04e36e6f2 am 2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev 
* commit '2f219c51ad2151c9d31912d836276679e0dd747d':
  Fix inconsistent text in Settings>Security>Screen lock
 2013-08-08 17:31:23 -07:00
Amith Yamasani
2f219c51ad Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev 2013-08-09 00:28:49 +00:00
Amith Yamasani
def5e5eb06 Fix inconsistent text in Settings>Security>Screen lock 
Bug: 10157179
Change-Id: Ib508b161d87248679fb9b8f3dae1584f73f18dcb
 2013-08-08 17:27:23 -07:00
Baligh Uddin
fcf69cbb9d am 921a3144: (-s ours) am dcd15ee0: (-s ours) am 7256942b: (-s ours) am d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 
* commit '921a3144a06496acfb06b512e443473141056304':
 2013-08-08 16:58:46 -07:00
The Android Open Source Project
9a2548db22 am 8c1845a6: (-s ours) am 76cbd841: am f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
* commit '8c1845a6d669b03c2827965042f2e47e49f2d6b1':
 2013-08-08 16:58:45 -07:00
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
Amith Yamasani
1eb6105f25 am a42cacb3: Merge "Potential fix for Bug: 10241642" into klp-dev 
* commit 'a42cacb34b8b6a5c9c0fd1b6c1ba63a121658d6f':
  Potential fix for Bug: 10241642
 2013-08-08 16:17:51 -07:00
Amith Yamasani
a42cacb34b Merge "Potential fix for Bug: 10241642" into klp-dev 2013-08-08 23:14:03 +00:00
Amith Yamasani
8287658863 Potential fix for Bug: 10241642 
Check if the fragment is running before handling click.

Change-Id: I78ab3db5c5d0b3e041cff7525239698c361fd5fb
 2013-08-08 16:06:39 -07:00
Dianne Hackborn
cd20ebcc8c am c6d658e3: Initial rough stab at a proc stats UI. 
* commit 'c6d658e37d7c0ab2d264fff4850ea20823669558':
  Initial rough stab at a proc stats UI.
 2013-08-08 16:06:21 -07:00
Baligh Uddin
921a3144a0 am dcd15ee0: (-s ours) am 7256942b: (-s ours) am d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 
* commit 'dcd15ee04bf30f3400c9e5f790ff543bed83734a':
  Import translations. DO NOT MERGE
 2013-08-08 15:56:12 -07:00
The Android Open Source Project
8c1845a6d6 am 76cbd841: am f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
* commit '76cbd841931d0de490f4f63c467d6bbdd0feb057':
  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 15:56:11 -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
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
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