PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,552 Commits 1 Branch 0 Tags
146ab4684a636f6fa84c73b1c6886b2646ff0c7e
Commit Graph

17552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Gurun
146ab4684a Merge "Revert "Remove WebView DRP Setting from Developer Settings"" 2014-10-22 00:07:27 +00:00
Selim Gurun
7818de107a Revert "Remove WebView DRP Setting from Developer Settings" 
This reverts commit 90886b8284.

Conflicts:
	src/com/android/settings/DevelopmentSettings.java

Change-Id: Ib41061bfbd74294ad643173c0caaf5f66bba410e
 2014-10-21 16:56:46 -07:00
Alexandra Gherghina
2999ce46c3 am 7574ee6a: am aadc070a: Move up spinner in apps screen 
automerge: 9dbaf77

* commit '9dbaf77696c21b7ab857d7048fbbf442a3d23308':
  Move up spinner in apps screen
 2014-10-21 22:57:20 +00:00
Alexandra Gherghina
9dbaf77696 am 7574ee6a: am aadc070a: Move up spinner in apps screen 
* commit '7574ee6a257b7d24447a9ec9767b8d985baaafcf':
  Move up spinner in apps screen
 2014-10-21 22:19:36 +00:00
Alexandra Gherghina
7574ee6a25 am aadc070a: Move up spinner in apps screen 
* commit 'aadc070a35ca47940e9fa964ba68c5ce817202ef':
  Move up spinner in apps screen
 2014-10-21 22:14:30 +00:00
Alexandra Gherghina
aadc070a35 Move up spinner in apps screen 
Bug: 18006320
Change-Id: Ic23c2c3e02a6c6a20b180065975228d42fd91899
 2014-10-21 18:39:07 +01:00
Alexandra Gherghina
f9c546e79d am 74ebc630: am 8af56164: am 2f90c4cd: Merge "Reset spinner selection" into lmp-mr1-dev 
* commit '74ebc630699030cb9986c28cf7f5416ae4fff979':
  Reset spinner selection
 2014-10-21 17:03:17 +00:00
Geoff Mendal
2089ccb57a am 11253ea4: (-s ours) am d66d7e51: (-s ours) am c69ed5e0: (-s ours) am eda5136b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '11253ea40a598bce5f24a2eaea324090549a1659':
  Import translations. DO NOT MERGE
 2014-10-21 17:03:16 +00:00
Alexandra Gherghina
74ebc63069 am 8af56164: am 2f90c4cd: Merge "Reset spinner selection" into lmp-mr1-dev 
* commit '8af561648450062dcd536eed44b3b774565f3356':
  Reset spinner selection
 2014-10-21 16:58:22 +00:00
Geoff Mendal
11253ea40a am d66d7e51: (-s ours) am c69ed5e0: (-s ours) am eda5136b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'd66d7e519fa3e0f5c847d880946350c52bc91ebc':
  Import translations. DO NOT MERGE
 2014-10-21 16:58:21 +00:00
Alexandra Gherghina
8af5616484 am 2f90c4cd: Merge "Reset spinner selection" into lmp-mr1-dev 
* commit '2f90c4cd52326b712e4f886976f27d6610162a82':
  Reset spinner selection
 2014-10-21 16:55:03 +00:00
Geoff Mendal
d66d7e519f am c69ed5e0: (-s ours) am eda5136b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'c69ed5e09f9f53ebf9462b2bad91f6742e827bca':
  Import translations. DO NOT MERGE
 2014-10-21 16:50:12 +00:00
Alexandra Gherghina
2f90c4cd52 Merge "Reset spinner selection" into lmp-mr1-dev 2014-10-21 16:49:24 +00:00
Geoff Mendal
c69ed5e09f am eda5136b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'eda5136ba2ded67fc82646a63dbd5ab06134adf2':
  Import translations. DO NOT MERGE
 2014-10-21 16:40:56 +00:00
John Spurlock
e519a16545 am 12680faf: am e926cd5c: am 196aaceb: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev 
* commit '12680fafb7bdf67a8cf624e3533321c7df2aa11a':
  Settings: Display 'Calls' category on non-voice devices.
 2014-10-21 16:37:48 +00:00
John Spurlock
12680fafb7 am e926cd5c: am 196aaceb: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev 
* commit 'e926cd5cc4ef8d4ef858bc6c7d68e12f32aabac6':
  Settings: Display 'Calls' category on non-voice devices.
 2014-10-21 16:32:29 +00:00
John Spurlock
e926cd5cc4 am 196aaceb: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev 
* commit '196aacebf9ac9dd4ffedc3012f59285be499e470':
  Settings: Display 'Calls' category on non-voice devices.
 2014-10-21 16:19:46 +00:00
John Spurlock
196aacebf9 Merge "Settings: Display 'Calls' category on non-voice devices." into lmp-mr1-dev 2014-10-21 16:11:12 +00:00
Geoff Mendal
a89b2721ef Merge "Import translations. DO NOT MERGE" 2014-10-21 00:12:05 +00:00
Geoff Mendal
beb94136c9 Import translations. DO NOT MERGE 
Change-Id: I79fe11cf58d0f4e4d7a4de65db5ef8de75742faa
Auto-generated-cl: translation import
 2014-10-20 17:09:23 -07:00
Geoff Mendal
944d050766 am d2898e92: (-s ours) am 46de83aa: (-s ours) am cd617f6c: (-s ours) am 6acdd044: (-s ours) am 795c8378: (-s ours) Import translations. DO NOT MERGE 
* commit 'd2898e925b7bea1f98502fa25fd5dcd11d16822d':
  Import translations. DO NOT MERGE
 2014-10-21 00:04:18 +00:00
Geoff Mendal
274392c787 am ea4dbcda: (-s ours) am 6e08ea26: (-s ours) am 50d4d2d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'ea4dbcda93f086ad3a904b3f2cf3f1994241a5b5':
  Import translations. DO NOT MERGE
 2014-10-20 23:59:25 +00:00
Geoff Mendal
eda5136ba2 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-20 23:57:55 +00:00
Geoff Mendal
d2898e925b am 46de83aa: (-s ours) am cd617f6c: (-s ours) am 6acdd044: (-s ours) am 795c8378: (-s ours) Import translations. DO NOT MERGE 
* commit '46de83aa1c9f34e76706ba4250c69f2933a5d3c0':
  Import translations. DO NOT MERGE
 2014-10-20 23:57:34 +00:00
Geoff Mendal
5d475bfdda am 69b9ca29: (-s ours) am c25c92cc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '69b9ca2914925d288609b2aaed3311923711a32b':
  Import translations. DO NOT MERGE
 2014-10-20 23:55:00 +00:00
Geoff Mendal
ea4dbcda93 am 6e08ea26: (-s ours) am 50d4d2d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '6e08ea265b497a3c3d29a1e37ae5fc826879c901':
  Import translations. DO NOT MERGE
 2014-10-20 23:53:41 +00:00
Geoff Mendal
d335d4f395 Import translations. DO NOT MERGE 
Change-Id: Ib689764b81b797eb3dee6a1bd786ef911926adbd
Auto-generated-cl: translation import
 2014-10-20 16:52:16 -07:00
Geoff Mendal
46de83aa1c am cd617f6c: (-s ours) am 6acdd044: (-s ours) am 795c8378: (-s ours) Import translations. DO NOT MERGE 
* commit 'cd617f6cbef7e3449648b26bf37d44422b719937':
  Import translations. DO NOT MERGE
 2014-10-20 23:51:32 +00:00
Geoff Mendal
69b9ca2914 am c25c92cc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'c25c92cccda2f8b1bb02c99f2cf596a703e6c2ce':
  Import translations. DO NOT MERGE
 2014-10-20 23:49:08 +00:00
Geoff Mendal
cd617f6cbe am 6acdd044: (-s ours) am 795c8378: (-s ours) Import translations. DO NOT MERGE 
* commit '6acdd044d7b3f77ff1f47e9addc2acdbc16e5b8d':
  Import translations. DO NOT MERGE
 2014-10-20 23:47:51 +00:00
Geoff Mendal
6e08ea265b am 50d4d2d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '50d4d2d39a041fcb2ee0c56d9425650e2f8557bd':
  Import translations. DO NOT MERGE
 2014-10-20 23:47:40 +00:00
Geoff Mendal
c25c92cccd Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-20 23:45:44 +00:00
Geoff Mendal
ac9623c69a Import translations. DO NOT MERGE 
Change-Id: Iffd7117e48c6f0fb2120b254bc455b22c8941ae8
Auto-generated-cl: translation import
 2014-10-20 16:44:24 -07:00
Geoff Mendal
50d4d2d39a Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-20 23:42:30 +00:00
Geoff Mendal
6acdd044d7 am 795c8378: (-s ours) Import translations. DO NOT MERGE 
* commit '795c83780752d0301985d53e2e230c2088af825b':
  Import translations. DO NOT MERGE
 2014-10-20 23:41:26 +00:00
Geoff Mendal
0019c6af93 Import translations. DO NOT MERGE 
Change-Id: I4bcf84faf0b26292a74ed9c833a2e9e48ad795b8
Auto-generated-cl: translation import
 2014-10-20 16:40:41 -07:00
Geoff Mendal
795c837807 Import translations. DO NOT MERGE 
Change-Id: I80fabd3e1f2306d6b9be8973c70aaf5438e58c51
Auto-generated-cl: translation import
 2014-10-20 16:33:09 -07:00
Sanket Padawe
5e5e55c9f0 am 8299d519: am 4bcd973d: am fbde7619: am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 
* commit '8299d519de97ca081ea8ab0cdd3256aae48c8f43':
  Changing settings UI changes related to strings to be displayed
 2014-10-20 21:09:07 +00:00
Sanket Padawe
8299d519de am 4bcd973d: am fbde7619: am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 
* commit '4bcd973db125d775b88d28e5a3c77ba739cf3d9d':
  Changing settings UI changes related to strings to be displayed
 2014-10-20 21:01:53 +00:00
Sanket Padawe
4bcd973db1 am fbde7619: am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 
* commit 'fbde761930f23efd4102c983b430c35a615b71d9':
  Changing settings UI changes related to strings to be displayed
 2014-10-20 20:56:27 +00:00
Sanket Padawe
fbde761930 am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 
* commit 'bdedbb851699016a70eafdb82b038240646358c8':
  Changing settings UI changes related to strings to be displayed
 2014-10-20 20:51:07 +00:00
Sanket Padawe
bdedbb8516 Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 2014-10-20 20:42:57 +00:00
Sanket Padawe
9d276ca597 Changing settings UI changes related to strings to be displayed 
Change-Id: I4e722d7cac3914ce93ad28c806787851949028bd
 2014-10-20 12:33:50 -07:00
John Spurlock
9a940cbf04 Settings: Display 'Calls' category on non-voice devices. 
Since the category applies to any call, include config for
this interruption even on non-voice-capable devices.

Bug: 17666139
Change-Id: I3732246179c527220f8c6bee539ba7bc1e80de18
 2014-10-20 14:22:38 -04:00
Baligh Uddin
36ae926a84 am 08c5e8e2: (-s ours) am 5e9e0f0b: (-s ours) am 1768f1aa: (-s ours) am 96a0370a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGE 
* commit '08c5e8e29f3d03bf2e57ef0f63a33eaf2f06996b':
  Import translations. DO NOT MERGE
 2014-10-19 20:21:21 +00:00
Baligh Uddin
08c5e8e29f am 5e9e0f0b: (-s ours) am 1768f1aa: (-s ours) am 96a0370a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGE 
* commit '5e9e0f0b74298d0992be36a371090f6879e0da92':
  Import translations. DO NOT MERGE
 2014-10-19 20:16:23 +00:00
Baligh Uddin
5e9e0f0b74 am 1768f1aa: (-s ours) am 96a0370a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGE 
* commit '1768f1aa6398ef2261f85df3b5581568844f39bc':
  Import translations. DO NOT MERGE
 2014-10-19 20:09:04 +00:00
Baligh Uddin
1768f1aa63 am 96a0370a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGE 
* commit '96a0370a2b893fb8acb1c1bd6873cecf05da7942':
  Import translations. DO NOT MERGE
 2014-10-19 20:02:59 +00:00
Baligh Uddin
96a0370a2b am 25149b38: (-s ours) Import translations. DO NOT MERGE 
* commit '25149b389501afc817f1248d704def0b4c5b5c04':
  Import translations. DO NOT MERGE
 2014-10-19 19:57:23 +00:00
Baligh Uddin
25149b3895 Import translations. DO NOT MERGE 
Change-Id: I3435cc63d25394c2b14089857e36de92c9a2b673
Auto-generated-cl: translation import
 2014-10-19 10:10:53 -07:00