PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,647 Commits 1 Branch 0 Tags
4b32de0d355eb6e1fb7f17d5a1f9cfa8e01510e0
Commit Graph

26647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
4b32de0d35 Fix localization issues with disabled am: 9e9ba0d 
am: 22b5064

* commit '22b5064424547daf4cdda5d106aa559539e89c23':
  Fix localization issues with disabled

Change-Id: I958dffd6f1c8370d5408b811a804411095a9eb74
 2016-04-11 14:20:17 +00:00
Jason Monk
22b5064424 Fix localization issues with disabled 
am: 9e9ba0d

* commit '9e9ba0d75142c7af9d8f7eabb7dfd34ff59e2064':
  Fix localization issues with disabled

Change-Id: If37b22b8dd44ad42265227b20c449acc97b06bb4
 2016-04-11 14:14:53 +00:00
Jason Monk
9e9ba0d751 Fix localization issues with disabled 
Change-Id: Iba63b50000f546a1e323c855462841e82fce4df8
Fixes: 27948378
 2016-04-11 09:58:55 -04:00
Jason Monk
19fad2550e Merge "Settings tweaks" 2016-04-11 13:24:38 +00:00
Jason Monk
c19eb986f3 Settings tweaks 
Change-Id: I68829fa8e49534d4635a008c94dced3c7ab6f4b1
Fixes: 27834471
Fixes: 27834626
Fixes: 27567838
Fixes: 27834676
 2016-04-11 09:21:24 -04:00
Clara Bayarri
99ea9716d5 Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev am: 6599660 
am: 232302e

* commit '232302ef30ea47d19b635ea9839ed83eccb864b1':
  Add Keyboard Shortcuts Helper entry in Settings

Change-Id: Iff3367c55d8d92b25328224599cad9e445a6ab48
 2016-04-11 10:05:55 +00:00
Clara Bayarri
232302ef30 Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev 
am: 6599660

* commit '659966019601b64fecd24a80d549b8d870059435':
  Add Keyboard Shortcuts Helper entry in Settings

Change-Id: I99dd51ef8dfdb80a59e003f332988b298e20152c
 2016-04-11 09:55:54 +00:00
Clara Bayarri
6599660196 Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev 2016-04-11 09:44:20 +00:00
Yohei Yukawa
efa5468c0e Shorten title name so as not to hit char limit. am: cf87fd5 
am: 5eff28a

* commit '5eff28a5cfce5c7c29a367c4a9885514088d8a41':
  Shorten title name so as not to hit char limit.

Change-Id: Id00e95153de7464c8fcbf7adae9dd2009d1b1f98
 2016-04-10 06:40:36 +00:00
Yohei Yukawa
5eff28a5cf Shorten title name so as not to hit char limit. 
am: cf87fd5

* commit 'cf87fd5beda44205a0d87565d2672cf038fbe70e':
  Shorten title name so as not to hit char limit.

Change-Id: I849aacf5c30610a8396146b86b65c9ff612ac29d
 2016-04-10 06:36:54 +00:00
Yohei Yukawa
cf87fd5bed Shorten title name so as not to hit char limit. 
This is a follow up CL to my previous CL [1], which tried to rename a
settings item "Add virtual keyboard" but ended up with hitting char
limit in many languages.  We decided to use "Manage keyboards" instead
so as not to hit char limit.

 [1]: Id2ae61519152bbe622aa5915f728a4cbbc49e078
      611410a8c4

Bug: 27543291
Bug: 27959401
Change-Id: I6e4795f8c4dbe9857d036ca19689e05658aa0640
 2016-04-10 06:30:38 +00:00
Suprabh Shukla
2775de111b Fixed obsolete import 
Change-Id: Ibee0284c61f3e559efeb9a28788b55e86a8355c6
 2016-04-10 02:15:07 +00:00
Bill Yi
81870def82 Import translations. DO NOT MERGE am: 2f26075 -s ours 
am: 050ead0  -s ours

* commit '050ead07be0f67a49688a07dee5c42302e77e502':
  Import translations. DO NOT MERGE

Change-Id: I195bab1a4f01d40fd72b94befa89984550c0b112
 2016-04-09 22:44:03 +00:00
Jason Monk
a4be4da636 Merge "Settings tweaks" into nyc-dev am: db3fcfb 
am: 14b6f12  -s ours

* commit '14b6f12aeaaa00d35feee4e5b19f9b6792874c5f':
  Settings tweaks

Change-Id: I8b1c1cdcc17a6722c9aba2cb55956f0444f8b5fe
 2016-04-09 22:44:01 +00:00
Bill Yi
050ead07be Import translations. DO NOT MERGE 
am: 2f26075  -s ours

* commit '2f260757a2cec3f735d7cc175115cc1f6bee8903':
  Import translations. DO NOT MERGE

Change-Id: I99a3400ce2b1583832c46b20454fc97ecfb78870
 2016-04-09 14:11:35 +00:00
Bill Yi
91e14b92a9 Merge "Import translations. DO NOT MERGE" 2016-04-09 14:01:50 +00:00
Bill Yi
2f260757a2 Import translations. DO NOT MERGE 
Change-Id: I89dec6af8243722e59f53b19ea182dc1357e4f47
Auto-generated-cl: translation import
 2016-04-09 06:46:45 -07:00
Bill Yi
e890fab34c Import translations. DO NOT MERGE 
Change-Id: Ia44b4686526adde07939fb18f43db0f792832a5f
Auto-generated-cl: translation import
 2016-04-09 06:07:07 -07:00
Suprabh Shukla
a6820166fa resolve merge conflicts of d83867c to master 
Change-Id: I999d87f33ef028055ea42197b518dbe57e8312cf
 2016-04-08 18:34:54 -07:00
Jason Monk
14b6f12aea Merge "Settings tweaks" into nyc-dev 
am: db3fcfb

* commit 'db3fcfb7cb652c0afdd093e2ec9f387dc01b7819':
  Settings tweaks

Change-Id: Ibc9882219ad819cd516bf3c1ce7ce556b36ad9e6
 2016-04-09 00:32:15 +00:00
Suprabh Shukla
d83867c551 Merge "Moving HelpUtils to SettingsLib" into nyc-dev 
am: 1d464b9

* commit '1d464b9677c4f956dab81622b2cb59c53cbf01dd':
  Moving HelpUtils to SettingsLib

Change-Id: I2b855b36d0f3af29f5bc35008017aa7539cd0677
 2016-04-09 00:32:15 +00:00
Jason Monk
db3fcfb7cb Merge "Settings tweaks" into nyc-dev 2016-04-08 20:46:49 +00:00
Jason Monk
be8d5aa2b9 Settings tweaks 
Change-Id: I68829fa8e49534d4635a008c94dced3c7ab6f4b1
Fixes: 27834471
Fixes: 27834626
Fixes: 27567838
Fixes: 27834676
 2016-04-08 16:44:31 -04:00
Suprabh Shukla
1d464b9677 Merge "Moving HelpUtils to SettingsLib" into nyc-dev 2016-04-08 19:31:37 +00:00
Jason Monk
e74ae23269 resolve merge conflicts of 65b5952 to master 
Change-Id: I0adc036416f21dfa7dd671d4920bce5c26fe7cb6
 2016-04-08 13:34:47 -04:00
Jason Monk
65b5952e4c Merge "Restore the premiume SMS Preference." into nyc-dev 
am: b8bce66

* commit 'b8bce66c02bef58d9df3bdfe0fc4a29da9491296':
  Restore the premiume SMS Preference.

Change-Id: Id83745add76b1afba24bf487dab12a66ebe4f0c3
 2016-04-08 17:11:43 +00:00
Jason Monk
b8bce66c02 Merge "Restore the premiume SMS Preference." into nyc-dev 2016-04-08 17:04:43 +00:00
Jason Monk
ea35f87377 Restore the premiume SMS Preference. 
Fixes: 27657256
Change-Id: I396eb9ba71f51fed517d7f958873369bc0ab011e
 2016-04-08 13:02:48 -04:00
Victor Chang
27fedfc2fa TrustedCredentialsSettings should be launched in personal user instead of work user am: 37afa28 
am: 0b4846e

* commit '0b4846e808f736abb5c524cf914e684d5b12627f':
  TrustedCredentialsSettings should be launched in personal user instead of work user

Change-Id: I5f06de99e8f70cb3e2cc4d028c0dd00f9f138818
 2016-04-08 16:02:11 +00:00
Victor Chang
0b4846e808 TrustedCredentialsSettings should be launched in personal user instead of work user 
am: 37afa28

* commit '37afa286f926b527c430c312d509eb8ebe7a2593':
  TrustedCredentialsSettings should be launched in personal user instead of work user

Change-Id: I85809994177a3c605e3b3ca4e9d57c7996016566
 2016-04-08 15:57:44 +00:00
Daniel U
1933b8eef8 Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev am: 9f4ad67 
am: 957ec6a

* commit '957ec6aee4ad8dfbde5cedb9791effdce1ca9825':
  Allow user to hide sensitive notifications with no work challenge

Change-Id: I999f240c0112abb9b366017e7def431a2c3dae79
 2016-04-08 15:55:32 +00:00
Abodunrinwa Toki
ada3b3a0d4 Merge "Input settings: Show keyboard layout collection." into nyc-dev am: f103d10 
am: 186d97b

* commit '186d97bbab34d51a88321da2556eda551ea0ddd3':
  Input settings: Show keyboard layout collection.

Change-Id: Ia7e6d50590ac19f9f8e9de333bc36c73d6790c09
 2016-04-08 15:55:32 +00:00
Daniel U
957ec6aee4 Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev 
am: 9f4ad67

* commit '9f4ad67fad34331aecbdabd4a0193038fa0e9f79':
  Allow user to hide sensitive notifications with no work challenge

Change-Id: I80943b49439532bdb676825ac9a8ee5bc7088b11
 2016-04-08 15:51:13 +00:00
Abodunrinwa Toki
186d97bbab Merge "Input settings: Show keyboard layout collection." into nyc-dev 
am: f103d10

* commit 'f103d10861e6a702f8f29d42e48214c94b1ddb91':
  Input settings: Show keyboard layout collection.

Change-Id: I813b902c6638befc9dcd7ebd166e8fe9c33731a5
 2016-04-08 15:51:12 +00:00
Victor Chang
37afa286f9 TrustedCredentialsSettings should be launched in personal user instead of work user 
Bug: 18224038
Change-Id: I861a0b98b4b7f0792332b980c1c8e080864b4d57
 2016-04-08 15:48:04 +00:00
Daniel U
9f4ad67fad Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev 2016-04-08 15:44:44 +00:00
Abodunrinwa Toki
f103d10861 Merge "Input settings: Show keyboard layout collection." into nyc-dev 2016-04-08 15:43:13 +00:00
Abodunrinwa Toki
f6053d1536 Input settings: Show keyboard layout collection. 
E.g. Android keyboard or Nexus Compat keyboard.

Bug: 27250977
Change-Id: Icd256a760b157418f52046f10ca272561b692838
 2016-04-08 14:08:56 +01:00
Robin Lee
7da1bc30b9 Merge "Credential storage: check lock quality for right user" into nyc-dev am: 16b4ac8 
am: c6696f1

* commit 'c6696f1c8675692bb0977a35ab65920f9eef67f1':
  Credential storage: check lock quality for right user

Change-Id: Iea17251ba3d27f2d4a2978d4466e5f80c0effdbe
 2016-04-08 11:02:40 +00:00
Robin Lee
c6696f1c86 Merge "Credential storage: check lock quality for right user" into nyc-dev 
am: 16b4ac8

* commit '16b4ac8a8efb7ea06397ff559984c3c08f275398':
  Credential storage: check lock quality for right user

Change-Id: Iea518cce08617d5ccfa6d5e43d5a65e377631528
 2016-04-08 10:58:34 +00:00
Oleksandr Peletskyi
046501fb85 Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev am: 76a2981 
am: 717ed0e

* commit '717ed0eed7bf60ed5163b8139bfdf7fc4f8a3072':
  Improved UX when DISALLOW_SET_WALLPAPER is set.

Change-Id: I8d712b436c36041f28e3a1d0871b2a3d83a265f3
 2016-04-08 10:54:27 +00:00
Robin Lee
16b4ac8a8e Merge "Credential storage: check lock quality for right user" into nyc-dev 2016-04-08 10:53:23 +00:00
Oleksandr Peletskyi
717ed0eed7 Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev 
am: 76a2981

* commit '76a29810c30978b958f953c3248fbd4ef19b5f79':
  Improved UX when DISALLOW_SET_WALLPAPER is set.

Change-Id: I354816c172deb4624326128079b50d6de4bf9031
 2016-04-08 10:50:23 +00:00
Oleksandr Peletskyi
76a29810c3 Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev 2016-04-08 10:44:06 +00:00
Oleksandr Peletskyi
c485487ac5 Improved UX when DISALLOW_SET_WALLPAPER is set. 
Changed type of Settings > Display > Wallpeper menu item
to RestrictedPreference. This allows to show the reason,
why the Wallpaper menu item is blocked.

BUG: 27914814
Change-Id: I6eb23ec9fcaa39bb7e45d020a5aaca0d83cef81f
 2016-04-08 11:32:48 +02:00
Ruben Brunk
ec6e52649d Merge "Fix Settings activity typo." into nyc-dev am: 77359ad 
am: 3f32a9f

* commit '3f32a9ff1011134f7fcfb1da9b108074e3a988bc':
  Fix Settings activity typo.

Change-Id: Idef0d055fadbb2f7b1021bdee2b2601f9add66df
 2016-04-08 05:22:47 +00:00
Ruben Brunk
3f32a9ff10 Merge "Fix Settings activity typo." into nyc-dev 
am: 77359ad

* commit '77359ad76117c3ffc7fe40890f8bbdc8736f143c':
  Fix Settings activity typo.

Change-Id: Ie11bb09128fbbedc72252583e0a6a721ef1e17bd
 2016-04-08 05:18:52 +00:00
Ruben Brunk
77359ad761 Merge "Fix Settings activity typo." into nyc-dev 2016-04-08 05:13:18 +00:00
Ruben Brunk
c461d5c03d Fix Settings activity typo. 
Bug=28078304

Change-Id: I2744314bbd97b1c330baa53a07534c461dab3c0f
 2016-04-07 22:08:09 -07:00
Toni Barzic
b70e224060 Teach settings about PASSWORD_QUALITY_MANAGED constant am: e7d6e4d 
am: 513bdfd

* commit '513bdfd0526579d79336341d3bb7150ac53b5f20':
  Teach settings about PASSWORD_QUALITY_MANAGED constant

Change-Id: I2d329042ad356c568907336f82d5043d591f89d6
 2016-04-07 23:24:56 +00:00