PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,779 Commits 1 Branch 0 Tags
2ad430e74288be0af1db2c7623beebd76e5af20c
Commit Graph

18779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
f62af38266 am 5b7e25aa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '5b7e25aa7cfa2e39f4168049eda0b435e87e147a':
  Import translations. DO NOT MERGE
 2014-10-23 00:14:41 +00:00
Geoff Mendal
be214d3c94 am 4561b9e8: (-s ours) am 1303f19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '4561b9e834589e7b8921e446dd15a76a377dfeda':
  Import translations. DO NOT MERGE
 2014-10-23 00:03:23 +00:00
Geoff Mendal
7f2db9cb36 am c07b54af: (-s ours) am 04fc60c4: (-s ours) am 8e2fb4c9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c07b54afa615d23f88960161048b308d0829bacb':
  Import translations. DO NOT MERGE
 2014-10-23 00:03:22 +00:00
Amith Yamasani
526e4b4155 am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev 
* commit 'c1dc875224f9b2286bfe455f37006aabaa057431':
  Disable factory reset for secondary users
 2014-10-23 00:02:44 +00:00
Amith Yamasani
c1dc875224 Merge "Disable factory reset for secondary users" into lmp-dev 2014-10-22 23:59:19 +00:00
Geoff Mendal
4561b9e834 am 1303f19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '1303f19b5f11fe492e4531239c28ae807efc2e5b':
  Import translations. DO NOT MERGE
 2014-10-22 23:58:51 +00:00
Geoff Mendal
c07b54afa6 am 04fc60c4: (-s ours) am 8e2fb4c9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '04fc60c4d37617eaad6c2b8bb6002c4679bb0f0a':
  Import translations. DO NOT MERGE
 2014-10-22 23:58:50 +00:00
Geoff Mendal
e70de7dde2 Merge "Import translations. DO NOT MERGE" 2014-10-22 23:57:49 +00:00
Geoff Mendal
5b7e25aa7c Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-22 23:57:24 +00:00
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
b2a5a19e0c Import translations. DO NOT MERGE 
Change-Id: Ie249deb29eeccc524e22d79031615730599c6581
Auto-generated-cl: translation import
 2014-10-22 16:42:00 -07: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
6fe1f8d4ae am 49c5efde: am 828f5df0: am 9fbff5a3: am 59dc8d1d: SIM settings display name changes 
* commit '49c5efde90d75f07f13f01493a77495701545969':
  SIM settings display name changes
 2014-10-22 22:51:07 +00:00
Paul Jensen
0f28275a81 am 58fd281c: am 23f4c425: am 246273ae: am a1640daf: am d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev 
* commit '58fd281c1f038a382758ceab8f50ce405869d3db':
  Launch browser directly when user selects "Mobile Plan".
 2014-10-22 22:51:06 +00:00
Sanket Padawe
480ce321ea am f7fad6b6: am eee65f04: am 286e3c46: am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev 
* commit 'f7fad6b6db1476f1972fc7399bead8937057906a':
  Commit with dialog box but using subinfo records
 2014-10-22 22:40:47 +00:00
Sanket Padawe
49c5efde90 am 828f5df0: am 9fbff5a3: am 59dc8d1d: SIM settings display name changes 
* commit '828f5df065320b3f798f64a8b032e5b7c0534a4c':
  SIM settings display name changes
 2014-10-22 21:40:30 +00:00
Paul Jensen
58fd281c1f am 23f4c425: am 246273ae: am a1640daf: am d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev 
* commit '23f4c425a5855e72b0f0f1aa49329c37aef161c7':
  Launch browser directly when user selects "Mobile Plan".
 2014-10-22 21:40:29 +00: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
f7fad6b6db am eee65f04: am 286e3c46: am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev 
* commit 'eee65f0417e879be499a15d006520b30618cc7c2':
  Commit with dialog box but using subinfo records
 2014-10-22 21:27:13 +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
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