PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,015 Commits 1 Branch 0 Tags
c7e62cf149e98fe9da6f17e1dc43a7bb9ba256dc
Commit Graph

16015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
1303f19b5f Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-22 23:57:03 +00:00
Geoff Mendal
04fc60c4d3 am 8e2fb4c9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '8e2fb4c9c46dc15250c24083a312aeebbbf10d22':
  Import translations. DO NOT MERGE
 2014-10-22 23:55:52 +00:00
Geoff Mendal
82454b4721 Import translations. DO NOT MERGE 
Change-Id: I895931be5f341683d3bed7a087b3b1c4dc5a0359
Auto-generated-cl: translation import
 2014-10-22 16:29:28 -07:00
Geoff Mendal
bd265c947b Import translations. DO NOT MERGE 
Change-Id: I5df28d6eefcb0e0e3e2fc49baa1a751fa830319b
Auto-generated-cl: translation import
 2014-10-22 16:23:27 -07:00
Geoff Mendal
8e2fb4c9c4 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-22 23:22:02 +00:00
Geoff Mendal
d5032606cc Import translations. DO NOT MERGE 
Change-Id: I7a571f71af317a655f81d6446aebbd5912cd9089
Auto-generated-cl: translation import
 2014-10-22 16:20:52 -07:00
Sanket Padawe
828f5df065 am 9fbff5a3: am 59dc8d1d: SIM settings display name changes 
* commit '9fbff5a31b4041906c14f2f3d015a1611adb5209':
  SIM settings display name changes
 2014-10-22 21:30:29 +00:00
Paul Jensen
23f4c425a5 am 246273ae: am a1640daf: am d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev 
* commit '246273ae35035b99328a5300e84ecb93067627fc':
  Launch browser directly when user selects "Mobile Plan".
 2014-10-22 21:30:28 +00:00
Sanket Padawe
9fbff5a31b am 59dc8d1d: SIM settings display name changes 
* commit '59dc8d1db4c557ace1ded52122993be2e73f6863':
  SIM settings display name changes
 2014-10-22 21:22:25 +00:00
Paul Jensen
246273ae35 am a1640daf: am d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev 
* commit 'a1640daf6202b12e64bcc26647449695f9ef2a61':
  Launch browser directly when user selects "Mobile Plan".
 2014-10-22 21:22:20 +00:00
Sanket Padawe
eee65f0417 am 286e3c46: am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev 
* commit '286e3c4651fa0af76e092ea52349d5ae2235825d':
  Commit with dialog box but using subinfo records
 2014-10-22 21:08:13 +00:00
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
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
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
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
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
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
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
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
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
eda5136ba2 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-20 23:57:55 +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
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
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
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