PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,902 Commits 1 Branch 0 Tags
9102c3485ca3e12cc04a7480500b0baab334ac3d
Commit Graph

17902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
4339a470d3 Disable factory reset for secondary users 
Search in Settings makes it possible to find the factory reset screen.
Disable the search index in PrivacySettings so that backup and reset
keywords don't get indexed for secondary users.
Also add additional safeguards for other entry points such as public
intents, so that the backup/reset screen does not show any options.

Bug: 18076086
Change-Id: Ie5135fbf4084038c99947a1a107ab4758f0c15a9
 2014-10-22 13:51:53 -07:00
Sanket Padawe
286e3c4651 am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev 
* commit '266e429657774dc7aa14029629a9e78c942c6104':
  Commit with dialog box but using subinfo records
 2014-10-22 20:45:40 +00:00
Sanket Padawe
59dc8d1db4 SIM settings display name changes 
Resubmitting the change for displaying SIM name in SIM settings.

Change-Id: I22d368c3880eaa54d37c9afcfd63d4e94e41fea8
 2014-10-22 11:36:08 -07:00
John Spurlock
047bbf31e9 am 968a2947: am 5c1f4155: am 2ae90864: Settings: Remove obsolete string: heads_up_enabled_title. 
* commit '968a294720b07c75dde10f371f02808bb5162904':
  Settings: Remove obsolete string: heads_up_enabled_title.
 2014-10-22 18:20:33 +00:00
Paul Jensen
a1640daf62 am d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev 
* commit 'd9b8d1803aac44f382e330ea62bc936e049a1aed':
  Launch browser directly when user selects "Mobile Plan".
 2014-10-22 17:26:58 +00:00
Paul Jensen
d9b8d1803a Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev 2014-10-22 17:17:00 +00:00
John Spurlock
968a294720 am 5c1f4155: am 2ae90864: Settings: Remove obsolete string: heads_up_enabled_title. 
* commit '5c1f41558f47ce79c3b30448d6f5025669704f06':
  Settings: Remove obsolete string: heads_up_enabled_title.
 2014-10-22 17:15:24 +00:00
John Spurlock
5c1f41558f am 2ae90864: Settings: Remove obsolete string: heads_up_enabled_title. 
* commit '2ae908649c5eb4708af1c29cefbf97cfab2cc341':
  Settings: Remove obsolete string: heads_up_enabled_title.
 2014-10-22 16:42:54 +00:00
John Spurlock
2ae908649c Settings: Remove obsolete string: heads_up_enabled_title. 
Instead of bumping the char limit as requested by translation, simply
remove it altogether, it's no longer used.

Bug: 14244562
Change-Id: I20737ec80c748c1a0eb206819ae82348a05c31a9
 2014-10-22 11:36:58 -04:00
Alan Viverette
bfa1932e89 am 2625d8ed: Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev automerge: 6a4d223 
automerge: c734de2

* commit 'c734de2aadc7cad71945b9037978f8871eb3f8f6':
  Adjust caption preset picker items dimens for Material
 2014-10-22 05:52:36 +00:00
Alan Viverette
c734de2aad am 2625d8ed: Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev 
automerge: 6a4d223

* commit '6a4d22389a3f214d73f1d40c5b28966433b656da':
  Adjust caption preset picker items dimens for Material
 2014-10-22 05:19:48 +00:00
Alan Viverette
6a4d22389a am 2625d8ed: Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev 
* commit '2625d8ed8914ccdfd47983f63df800d991ca3f0c':
  Adjust caption preset picker items dimens for Material
 2014-10-22 02:08:12 +00:00
Alan Viverette
2625d8ed89 Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev 2014-10-22 01:25:24 +00:00
Alexandra Gherghina
a160b96005 am b9d05d6c: Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev automerge: 3748b94 
automerge: 3ac497d

* commit '3ac497d8d5ba1f1b9f3e5e4d2b8af8ddc7539025':
  Fix user spinner anchor following system ui changes
 2014-10-22 00:59:20 +00:00
Alexandra Gherghina
3ac497d8d5 am b9d05d6c: Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev 
automerge: 3748b94

* commit '3748b940a3c86377e55d0a505858da2c2fc1cdaa':
  Fix user spinner anchor following system ui changes
 2014-10-22 00:28:07 +00:00
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
Alan Viverette
285fb04711 Adjust caption preset picker items dimens for Material 
BUG: 18027521
Change-Id: Icce397410af495639df0b6852b21c159ec103ed8
 2014-10-21 16:51:54 -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
3748b940a3 am b9d05d6c: Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev 
* commit 'b9d05d6c63c7bdd866b2cfb3e5b549c352d1493f':
  Fix user spinner anchor following system ui changes
 2014-10-21 22:29:39 +00:00
Alexandra Gherghina
b9d05d6c63 Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev 2014-10-21 22:20:07 +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
Sanket Padawe
266e429657 Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev 2014-10-21 21:56:06 +00:00
Sanket Padawe
a501137f26 Commit with dialog box but using subinfo records 
Change-Id: I144aa8899eb050db29a9d78aaf7af4c1f31d9eab
 2014-10-21 14:16:12 -07: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