PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,174 Commits 1 Branch 0 Tags
cbcc76e8d32f95690d08258a91d58136cd9fb056
Commit Graph

20174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lifu Tang
0209af6bc7 am 6ff1a66c: am 1bbd8814: Removed extra "your" from device only subtext 
* commit '6ff1a66c3ce39396ec1cb70c45682407faa31376':
  Removed extra "your" from device only subtext
 2015-02-25 19:50:56 +00:00
Lifu Tang
2e2582c756 am 1bbd8814: Removed extra "your" from device only subtext 
* commit '1bbd8814c66f8e67cfb7e86e880c85727ed1743e':
  Removed extra "your" from device only subtext
 2015-02-25 19:43:39 +00:00
Lifu Tang
6ff1a66c3c am 1bbd8814: Removed extra "your" from device only subtext 
* commit '1bbd8814c66f8e67cfb7e86e880c85727ed1743e':
  Removed extra "your" from device only subtext
 2015-02-25 19:43:20 +00:00
Geoff Mendal
03f8c5c816 Import translations. DO NOT MERGE 
Change-Id: Iefd9997748c2bcfa757e4c138a764640ed6a29af
Auto-generated-cl: translation import
 2015-02-25 06:28:40 -08:00
Lifu Tang
1bbd8814c6 Removed extra "your" from device only subtext 
Bug: 19463511
Change-Id: Ic9449561ee974b6566bf76ea3ca2e774f5be03d2
 2015-02-24 15:25:27 -08:00
Sanket Padawe
8f77f435d8 Use TelephonyManager api to get SPN of sim to display in UI. 
Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
 2015-02-24 13:30:33 -08:00
xinhe
d51b9525c9 Do not provide 5GHz option for softap if there is no country code available 
Bug:19414134
Change-Id: I3899d9daa33eca5d2c5528c2e4da97b02d019160
 2015-02-24 10:09:56 -08:00
Jason Monk
88643ac6ba Support some changes to SettingsLib 
SettingsLib has a couple of bluetooth changes to support quick
settings and as a result a few updates are needed in Settings.

Depends on I7f828f0038ad0cf39274986ece6d486d545f0286
Change-Id: I9b207b74abb0175148fd4a3c421d33ab9a861587
 2015-02-24 14:01:47 +00:00
Jason Monk
67d71bef99 Merge "Move isolatable bluetooth code to SettingsLib" 2015-02-24 13:23:49 +00:00
Jason Monk
e77b04a64f Merge "Move some Tethering code to SettingsLib to share" 2015-02-24 13:16:43 +00:00
Mike Lockwood
a081f01ee8 Merge "Add support for MIDI USB configuration to MIDI settings screen" 2015-02-23 15:36:53 +00:00
Geoff Mendal
6048b0f8ae Import translations. DO NOT MERGE 
Change-Id: Iad2a04249a925e479142367a6540adb390c607ad
Auto-generated-cl: translation import
 2015-02-23 06:37:23 -08:00
Mike Lockwood
7af238e181 Add support for MIDI USB configuration to MIDI settings screen 
Change-Id: I41b7ef2090b8887d5d3c05494de9dd1fb4dd65eb
 2015-02-20 15:55:29 -08:00
Santos Cordon
9a9c361523 Update Multi-SIM setting to use getSubIdForPhoneAccount API. 
Settings app should not be parsing the subId direction from the phone
account.  Instead this CL updates the settings app to use a new API to
grab the sub ID.

Change-Id: Iefd1831b04c061168fa2b135a2d296a27e3d4e92
 2015-02-19 21:29:35 -08:00
John Spurlock
72495afdd3 Merge "Settings: Reorder the "Calls/messages from" dropdown." 2015-02-19 02:00:26 +00:00
John Spurlock
d9bd1688c9 Settings: Reorder the "Calls/messages from" dropdown. 
From least to most restrictive: Anyone/Contacts/Starred.

Bug: 19430944
Change-Id: I66326f3a02be615d0edbbd644b83b088f1e306c1
 2015-02-18 20:57:39 -05:00
Maurice Lam
689cb88811 Merge "[WifiSettings] Use arrows for advanced options" 2015-02-18 19:38:07 +00:00
Maurice Lam
a8b824d6d2 [WifiSettings] Use arrows for advanced options 
Use an arrow pointing up / down for advanced options instead of a
checkbox, making it more clear that it is merely hiding the options,
and not a setting in itself that others are dependent upon.

Bug: 18007635
Change-Id: Ie2f2cca708b661f76749bc4af5918275806af1a8
 2015-02-18 10:54:04 -08:00
Alexandra Gherghina
928a7973a7 Merge "Clarify important part of longer string" 2015-02-18 16:44:25 +00:00
Geoff Mendal
9df19b12f5 Merge "Import translations. DO NOT MERGE" 2015-02-18 14:56:57 +00:00
Geoff Mendal
6207543705 Import translations. DO NOT MERGE 
Change-Id: I2e2f09268940b69cc1ca74d9c7a147f6d536232d
Auto-generated-cl: translation import
 2015-02-18 06:54:11 -08:00
Geoff Mendal
a7d5d1044d am 201e61a0: (-s ours) am 84725dfb: (-s ours) am e991b546: (-s ours) Import translations. DO NOT MERGE 
* commit '201e61a0fe0590d41aabfb9044ff0fe66fa65299':
  Import translations. DO NOT MERGE
 2015-02-18 14:20:12 +00:00
Geoff Mendal
201e61a0fe am 84725dfb: (-s ours) am e991b546: (-s ours) Import translations. DO NOT MERGE 
* commit '84725dfb09399bde98c3541691cc330c46e4050d':
  Import translations. DO NOT MERGE
 2015-02-18 14:14:03 +00:00
Geoff Mendal
84725dfb09 am e991b546: (-s ours) Import translations. DO NOT MERGE 
* commit 'e991b5461fa67cc92ddcc4cd583a347550f43094':
  Import translations. DO NOT MERGE
 2015-02-18 14:07:43 +00:00
Geoff Mendal
0fc683a998 am fc45ee75: (-s ours) am 2594d2bf: (-s ours) Import translations. DO NOT MERGE 
* commit 'fc45ee755ad0acd7418f006313c7939eb8b1fbe9':
  Import translations. DO NOT MERGE
 2015-02-18 13:58:16 +00:00
Geoff Mendal
e991b5461f Import translations. DO NOT MERGE 
Change-Id: I134f0a955ac0f56ae8b16dbcace0d2fd855025e5
Auto-generated-cl: translation import
 2015-02-18 05:56:15 -08:00
Geoff Mendal
fc45ee755a am 2594d2bf: (-s ours) Import translations. DO NOT MERGE 
* commit '2594d2bf7af8ae0032be068da050535a67989a56':
  Import translations. DO NOT MERGE
 2015-02-18 13:51:26 +00:00
Geoff Mendal
2594d2bf7a Import translations. DO NOT MERGE 
Change-Id: I01ad7807e5a92775a53c3c5074425987517b5f95
Auto-generated-cl: translation import
 2015-02-18 05:44:54 -08:00
Alexandra Gherghina
1a3bc4f317 Clarify important part of longer string 
Bug: 18353106
Change-Id: I24d797aab74ab1edf840022bf0736d291a922cb0
 2015-02-18 10:36:24 +00:00
Geoff Mendal
a49fd145c7 Merge "Import translations. DO NOT MERGE" 2015-02-16 15:13:52 +00:00
Geoff Mendal
7d9885f884 Import translations. DO NOT MERGE 
Change-Id: I1c49c4b770a6c075beecfaba10bb73b961194af1
Auto-generated-cl: translation import
 2015-02-16 07:12:57 -08:00
Geoff Mendal
a204754b04 am 5198624c: (-s ours) am ae87c907: (-s ours) Import translations. DO NOT MERGE 
automerge: 4c54180  -s ours

* commit '4c54180dc708780d8eb99e97b0f9f78b11de7242':
 2015-02-16 14:36:50 +00:00
Geoff Mendal
4c54180dc7 am 5198624c: (-s ours) am ae87c907: (-s ours) Import translations. DO NOT MERGE 
* commit '5198624c2a4db659f0fea36ad6cbb66dc734d1e9':
 2015-02-16 14:33:12 +00:00
Geoff Mendal
38819187de Import translations. DO NOT MERGE automerge: ae87c90 -s ours 
automerge: 576a397  -s ours

* commit '576a39710071bebb5a9c10e30a83246154e9e11d':
  Import translations. DO NOT MERGE
 2015-02-16 14:31:30 +00:00
Geoff Mendal
5198624c2a am ae87c907: (-s ours) Import translations. DO NOT MERGE 
* commit 'ae87c9075e02466f842b0b7fe6a081c899ce954e':
  Import translations. DO NOT MERGE
 2015-02-16 14:27:34 +00:00
Geoff Mendal
576a397100 Import translations. DO NOT MERGE 
automerge: ae87c90  -s ours

* commit 'ae87c9075e02466f842b0b7fe6a081c899ce954e':
  Import translations. DO NOT MERGE
 2015-02-16 14:26:27 +00:00
Geoff Mendal
ae87c9075e Import translations. DO NOT MERGE 
Change-Id: I3870aad14e864485824f4a82c9b266e425c42da3
Auto-generated-cl: translation import
 2015-02-16 06:14:52 -08:00
Dianne Hackborn
c5df5ddef0 Fix voice settings to not be broken. :( 
It was setting the wrong recognizer activity, so when you
changed the voice interactor it would break the recognizer but
at least it would reset to the default interactor at boot and
not still be broken. :p

Change-Id: Icfec4f11526528b821e5fd67a6519bf5874ea133
 2015-02-13 10:06:52 -08:00
Maurice Lam
3dd090d916 Merge "Setup lock screen go back one screen at a time" 2015-02-13 01:07:13 +00:00
Sanket Padawe
62197c9a97 am 4a7ca7d5: am bdfdf07c: am 0362e870: am 7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab. 
* commit '4a7ca7d5a7c83dc77921c9c32abc7b366c18b46c':
  Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
 2015-02-13 00:07:22 +00:00
Sanket Padawe
4a7ca7d5a7 am bdfdf07c: am 0362e870: am 7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab. 
* commit 'bdfdf07ce3b788d2962f75027f6be615c9784e10':
  Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
 2015-02-13 00:01:08 +00:00
Sanket Padawe
bdfdf07ce3 am 0362e870: am 7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab. 
* commit '0362e870b258b03ec06110d032b521cac3d37bf2':
  Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
 2015-02-12 23:55:01 +00:00
Sanket Padawe
24401dfea0 am 7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab. 
* commit '7e21fa5ab4f867263088a38ed279d889b902a05b':
  Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
 2015-02-12 23:50:02 +00:00
Sanket Padawe
0362e870b2 am 7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab. 
* commit '7e21fa5ab4f867263088a38ed279d889b902a05b':
  Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
 2015-02-12 23:47:52 +00:00
Sanket Padawe
7e21fa5ab4 Data Usage tab title should say "Cellular" with only 1 sim and wifi tab. 
Bug: 19363726
Change-Id: Id4194deb126323b2f7674c58f9911f892793dff4
 2015-02-12 12:39:34 -08:00
Geoff Mendal
6fc2f7f65d am 785bfe71: (-s ours) am 31010cc1: (-s ours) Import translations. DO NOT MERGE 
* commit '785bfe719c408b6b188ea23a8472eccf9fbd3532':
  Import translations. DO NOT MERGE
 2015-02-12 19:31:44 +00:00
Geoff Mendal
785bfe719c am 31010cc1: (-s ours) Import translations. DO NOT MERGE 
* commit '31010cc15530338fdcf4e1a66a47d29c6851cbc6':
  Import translations. DO NOT MERGE
 2015-02-12 19:20:43 +00:00
Geoff Mendal
31010cc155 Import translations. DO NOT MERGE 
Change-Id: I130d234905731c2df5249e2c769c572bbb61f94e
Auto-generated-cl: translation import
 2015-02-12 11:05:53 -08:00
Maurice Lam
9066a5c8b3 Setup lock screen go back one screen at a time 
SetupChooseLockGeneric no longer finishes itself when it receives a
RESULT_CANCELED result from an activity it started.

Bug: 18631770
Change-Id: I892b76847904225fe607b9406d6e76f932daa062
 2015-02-12 10:52:20 -08:00
Jason Monk
4896c01729 Move some Tethering code to SettingsLib to share 
Change-Id: I43a356f2a14af4a15d1827919c39bbd1a04d3a94
 2015-02-12 10:33:40 -05:00