PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,484 Commits 1 Branch 0 Tags
fb03058dc9827c9f588cc4f42a74201b8ae06e8c
Commit Graph

12484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
cf75af2f46 am 8be6770c: (-s ours) 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 '8be6770c4edb11ea3784a193d37339251b06902b':
 2013-12-05 22:45:19 +00:00
The Android Open Source Project
e3d1af0bc9 am c3835eae: (-s ours) am 8c1845a6: (-s ours) am 76cbd841: am f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
* commit 'c3835eae2336e3d42e28f0a8c712238e4fe12701':
 2013-12-05 22:45:18 +00:00
Baligh Uddin
956ea0eea3 am bf3d3f8f: (-s ours) 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 'bf3d3f8fd015a834aaf54051cef1805f0b4a241f':
 2013-12-05 22:45:17 +00:00
Amith Yamasani
3702e530d0 am 436e4fd4: (-s ours) am 05e2459f: am 82f7c064: Merge "Developer option to force RTL layout direction" into klp-dev 
* commit '436e4fd49f4ec5728bb7e7b65e7b14c80b8f698c':
 2013-12-05 22:45:16 +00:00
David Christie
9757e56b52 am 7fcc1d73: (-s ours) 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 '7fcc1d733fe617ffbb463443058215c510024cae':
 2013-12-05 22:45:15 +00:00
Svetoslav
3e8f71fe44 am 0e001877: (-s ours) am 0427cb67: am 3f257c4d: Fix a crash in accessibiility settings. 
* commit '0e001877d3485d39d6f436c7ec4a6308d343fa93':
 2013-12-05 22:45:14 +00:00
Lifu Tang
d9c1fd7548 am fb2b5cd9: (-s ours) am 098061c2: am 88afb32f: Displays a list of most recent location apps 
* commit 'fb2b5cd951be02e8694d23b9dd9a832cd83bd960':
 2013-12-05 22:45:13 +00:00
Lifu Tang
a83af4719c am cd412600: (-s ours) am 7b449db2: am b14698ee: Merge "Finished the location settings" 
* commit 'cd4126005dd7ef8808171c07df07ebb149170d1e':
 2013-12-05 22:45:12 +00:00
Jason Monk
a383f09c96 am 92d5dd36: (-s ours) am 49d6f604: am 71decb7b: Merge "Restriction pin changes." 
* commit '92d5dd36f4445ee386560582514934135c9f98bd':
 2013-12-05 22:45:11 +00:00
Baligh Uddin
dfb6b35649 am e9529fe6: (-s ours) am dfa45967: (-s ours) am 7494ff47: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'e9529fe6cd7e0c8d3d6faad1b6db9c0d105ea702':
 2013-12-05 22:45:10 +00:00
Maggie Benthall
fef3abf0fe am fa6faf95: am cd3eb97c: Merge "Fix bug when sharing to bluetooth." into klp-dev 
* commit 'fa6faf95bc70fee95093f7c7bd1b6a540a95fe03':
 2013-12-05 21:30:53 +00:00
Przemyslaw Szczepaniak
99c0fd825a am d92af47f: am 0e01f128: Fix for TTS settings crash. 
* commit 'd92af47f9369f50edac2d5c36f78aee4997bbe8d':
 2013-12-05 21:30:31 +00:00
Baligh Uddin
43480718fd am 3b3a8b09: (-s ours) am 0782e629: (-s ours) am 508997ad: (-s ours) am 728da455: (-s ours) am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE 
* commit '3b3a8b097225a5667e4ad69ac3fb9e6e1bf89f9c':
 2013-12-05 21:30:17 +00:00
Baligh Uddin
2c50d95ab4 am 965d7569: (-s ours) am fff94ce8: (-s ours) am 08f1d439: (-s ours) am 05404105: (-s ours) Import translations. DO NOT MERGE 
* commit '965d756920d556d95178d48127ee14abcda85916':
 2013-12-05 21:30:12 +00:00
Baligh Uddin
8568ad2d70 am b142c946: (-s ours) am a45cd5a6: (-s ours) Import translations. DO NOT MERGE 
* commit 'b142c9462f138de363ea1f6c42eaf5884ff2b645':
 2013-12-05 21:30:10 +00:00
The Android Open Source Project
b568548747 Merge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD 2013-12-05 12:38:23 -08:00
Zhihai Xu
779afdfc6c am eb9cecd9: am 6ee5b450: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev 
* commit 'eb9cecd98b280c508b88d03ad788202ac0e35e53':
 2013-12-05 19:43:01 +00:00
Dianne Hackborn
306d51f4e6 am 3c7fdfd9: am a582a051: Proc stats UI improvements. 
* commit '3c7fdfd9e957ddb68fccba524a12fab84b469744':
 2013-12-05 19:40:43 +00:00
Martijn Coenen
67627fabb7 am 0aee1b15: am 53083ab2: Instantiate correct classes for tap&say settings. 
* commit '0aee1b150624f4b36e52e47fa97b8a18350d2df5':
 2013-12-05 19:40:15 +00:00
Geoffrey Borggaard
078b28dde9 am 863b8839: am fc6bc201: Allow navigation to TrustedCredentials User Certs by intent. 
* commit '863b8839c7685554b41f3143472a6f379fd29ad1':
 2013-12-05 19:40:14 +00:00
Dianne Hackborn
bcecc4a7f8 am b690af54: am f3796d0b: Merge "Improve process stats UI." into klp-dev 
* commit 'b690af54dc0c5e82d15226c5a85be713bcd25db2':
 2013-12-05 19:40:13 +00:00
Alan Viverette
418d1df727 am 85c37e78: am c0f79432: Merge "Update captioning settings to match final design" into klp-dev 
* commit '85c37e78b5bb21788ce3edb42363e550895cd9fc':
 2013-12-05 19:40:12 +00:00
Amith Yamasani
391e601ae2 am d04e36e6: am 2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev 
* commit 'd04e36e6f2259747dac4c4a1fa0393f72dc078af':
 2013-12-05 19:37:05 +00:00
Alan Viverette
a330af1327 Merge "Add preference for caption text opacity" 2013-12-05 19:33:52 +00:00
Amith Yamasani
962c7f874a am 1eb6105f: am a42cacb3: Merge "Potential fix for Bug: 10241642" into klp-dev 
* commit '1eb6105f25dcecde565f9d56e5c87feed7bd520d':
 2013-12-05 19:33:28 +00:00
Dianne Hackborn
8c01ad1ec8 am cd20ebcc: am c6d658e3: Initial rough stab at a proc stats UI. 
* commit 'cd20ebcc8c0261765fa8e6de57df3f72062c710e':
 2013-12-05 19:33:06 +00:00
Alan Viverette
205cee4c1c Add preference for caption text opacity 
BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
 2013-12-05 11:27:40 -08:00
Baligh Uddin
8be6770c4e 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-12-05 19:21:36 +00:00
The Android Open Source Project
c3835eae23 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-12-05 19:21:35 +00:00
Baligh Uddin
bf3d3f8fd0 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-12-05 19:21:34 +00:00
Amith Yamasani
436e4fd49f am 05e2459f: am 82f7c064: Merge "Developer option to force RTL layout direction" into klp-dev 
* commit '05e2459fb85848b19362554a7ffeb2e9b50da720':
 2013-12-05 19:21:33 +00:00
David Christie
7fcc1d733f 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':
 2013-12-05 19:21:32 +00:00
Svetoslav
0e001877d3 am 0427cb67: am 3f257c4d: Fix a crash in accessibiility settings. 
* commit '0427cb67d1545d38859e6522905b4a78d82bacc7':
 2013-12-05 19:21:31 +00:00
Lifu Tang
fb2b5cd951 am 098061c2: am 88afb32f: Displays a list of most recent location apps 
* commit '098061c2022164e169ec40e6114b48dd5bfcaff2':
 2013-12-05 19:21:30 +00:00
Lifu Tang
cd4126005d am 7b449db2: am b14698ee: Merge "Finished the location settings" 
* commit '7b449db21ecae05f95355544936bd840a89601c7':
 2013-12-05 19:21:28 +00:00
Jason Monk
92d5dd36f4 am 49d6f604: am 71decb7b: Merge "Restriction pin changes." 
* commit '49d6f604f1ce05d90c8bdf25330fe8eb3eb924c9':
 2013-12-05 19:21:27 +00:00
Baligh Uddin
e9529fe6cd am dfa45967: (-s ours) am 7494ff47: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'dfa4596778b39d07aa7f27145baedee31d17cd48':
 2013-12-05 19:21:26 +00:00
Lance Jin-woong Chang
8c9a5f8d23 am 76cd835e: am e161f873: am 1f5e6639: (-s ours) am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev 
* commit '76cd835e76d42ca60cea7ecdfa0d772a2f95ed6e':
  Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
 2013-12-05 02:45:37 +00:00
Lance Chang
c3dfca8e17 am 31507e29: am 6d039786: am 0ea2229b: (-s ours) am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev 
* commit '31507e290dcd20390c5fc25f1bd01a76772899e3':
  Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
 2013-12-05 02:45:34 +00:00
Geoff Mendal
93e050ae1b am 056a3ff6: (-s ours) am bc3c36da: (-s ours) am 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translations. DO NOT MERGE 
* commit '056a3ff6460d4a893fc9e1bc1ef17596f16c1d68':
  Import translations. DO NOT MERGE
 2013-12-05 02:45:06 +00:00
Lance Jin-woong Chang
76cd835e76 am e161f873: am 1f5e6639: (-s ours) am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev 
* commit 'e161f8733e816ac83e5d6823d5e958372395e94b':
  Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
 2013-12-05 01:43:56 +00:00
Lance Jin-woong Chang
e161f8733e am 1f5e6639: (-s ours) am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev 
* commit '1f5e66392e4fa01d2686a06044a8f0edfda6310f':
  Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
 2013-12-04 17:40:17 -08:00
Lance Chang
31507e290d am 6d039786: am 0ea2229b: (-s ours) am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev 
* commit '6d0397864a1933a869553f500fa09536bbcb3c52':
  Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
 2013-12-05 01:31:51 +00:00
Lance Jin-woong Chang
1f5e66392e am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev 
* commit '5d65a47c395918d3f777d99747eb4f2e901566ee':
  Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
 2013-12-04 17:29:27 -08:00
Lance Chang
6d0397864a am 0ea2229b: (-s ours) am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev 
* commit '0ea2229b4b39146ed41b99ca0542c73e5305d059':
  Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
 2013-12-04 17:28:36 -08:00
Lance Jin-woong Chang
5d65a47c39 Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev 2013-12-05 01:27:46 +00:00
Alan Viverette
3858233f89 Merge "Remove extra fragment in captioning preferences" 2013-12-05 01:19:54 +00:00
Alan Viverette
4098dba253 Remove extra fragment in captioning preferences 
BUG: 11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
 2013-12-04 17:19:24 -08:00
Lance Jin-woong Chang
0637c1f909 Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" 
This reverts commit 5796dad9a4.

Change-Id: Ib9de134bef6328dac6aa5a4b6033c584fb672ab5
 2013-12-05 00:59:51 +00:00
Lance Chang
0ea2229b4b am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev 
* commit '071fbfd3f35c01fb1c4052614902dabe16af691f':
  Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
 2013-12-04 16:49:45 -08:00