PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,126 Commits 1 Branch 0 Tags
e365aa8cd9e118fe971a43d8dfb24003c68169cc
Commit Graph

27126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricky Wai
dae1ac5cb0 Remove work fingerprints when primary profile lock is removed 
Bug: 29264034
Change-Id: Ia4043e8a4f4481ff72b8d7069fd139a381158083
 2016-06-14 14:43:00 +01:00
Bill Yi
1779cc363d Merge \"Import translations. DO NOT MERGE\" into nyc-dev 
am: 7221f5b6b4  -s ours

Change-Id: I2c5809787112d866890e24f35d315c2f944af610
 2016-06-14 12:09:38 +00:00
TreeHugger Robot
7221f5b6b4 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-14 11:47:34 +00:00
Bill Yi
0f30207710 Import translations. DO NOT MERGE 
Change-Id: I4dca3edd37931754e3ba3d6152bde6fe235e7b42
Auto-generated-cl: translation import
 2016-06-14 03:17:02 -07:00
Julia Reynolds
46298697ce DND header should be translated. 
am: 5a67d5f6f0

Change-Id: Ia9ce4e1465fa20a769b7f66e5cb1ae3577525875
 2016-06-14 01:58:02 +00:00
Julia Reynolds
5a67d5f6f0 DND header should be translated. 
Change-Id: Iac764d71e91f5a0dc1b58bfca8a38d823f0598b9
Fixes: 29123731
 2016-06-14 01:47:05 +00:00
Robert Greenwalt
89b8babe6a resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp 
Change-Id: Ie6a95224a62023a2a19054aa95382d24365124f5
 2016-06-13 13:01:36 -07:00
宋凯伦
b34cf8647f Merge \"Fix the memory leak in TetherSettings\" 
am: 03393c4109

Change-Id: Iec6e2b02efe28491c988a530f401350f8ee5b52f
 2016-06-13 18:46:19 +00:00
Robert Greenwalt
03393c4109 Merge "Fix the memory leak in TetherSettings" 2016-06-13 18:35:32 +00:00
Michal Karpinski
8532049946 Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev 
am: 86c9894f04

Change-Id: Iee44fadb2563a162aa097bf101aea2045564277e
 2016-06-13 17:40:12 +00:00
TreeHugger Robot
86c9894f04 Merge "Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog" into nyc-dev 2016-06-13 17:29:22 +00:00
Jason Monk
f01d1d5dcb Make linkify handle emptys urls better DO NOT MERGE 
Change-Id: I60029b02e6cda334a8c66ba8453be28b35a818a3
Fixes: 29045818
 2016-06-13 13:08:32 -04:00
Julia Reynolds
cdd1a26465 Prevent users from blocking system notifications. 
Change-Id: I1864d54b01e4db03393078504b8f592ee41ed1c2
Fixes: 29191134
 2016-06-13 12:49:45 -04:00
Robin Lee
c7f0f2338a Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev 
am: cab4f9dc39

Change-Id: Ic81454dfe7e6d7d7d0586e2b5eb38770d93e9377
 2016-06-13 16:15:19 +00:00
Robin Lee
cab4f9dc39 Merge "Respect DISALLOW_CONFIG_VPN for disconnect dialog" into nyc-dev 2016-06-13 16:03:54 +00:00
Michal Karpinski
5666e5556f Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog 
Removing because user might not be able to remove (because the option is disallowed).

Bug: 29102580
Change-Id: I4aaedb2a74742a891e95c65e39d0f702377e6836
 2016-06-13 16:52:58 +01:00
Robin Lee
49be1c1b06 Respect DISALLOW_CONFIG_VPN for disconnect dialog 
Change-Id: Idfe3899e81eec5efdbd5700bdc65921de6853898
Fix: 29265163
 2016-06-13 15:08:32 +00:00
Nicolas Prevot
341b21d2f8 Merge \"Fix rendering of policy transparency activity.\" into nyc-dev 
am: 98704bc495

Change-Id: I0b66044361c76629f20d2bb56ebb0779885a5781
 2016-06-13 12:50:16 +00:00
Nicolas Prévot
98704bc495 Merge "Fix rendering of policy transparency activity." into nyc-dev 2016-06-13 12:37:05 +00:00
Ruchi Kandoi
f8c135a986 resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp 
Change-Id: If75736f8e36e2a8e13fe9740f89f632ee6bedd49
 2016-06-10 22:04:52 -07:00
Bill Yi
099609af97 Import translations. DO NOT MERGE 
am: c66bffa31f  -s ours

Change-Id: I6351c67c9f6f4882079b269134f7d61abe07da04
 2016-06-11 04:40:07 +00:00
Mark Salyzyn
9e28f9a7f7 Merge \"Settings: add logpersist selection (actions)\" 
am: 3c398ea710

Change-Id: I49312b7af5d153ab37ad60a404db12a200fe5c42
 2016-06-10 22:50:23 +00:00
Treehugger Robot
3c398ea710 Merge "Settings: add logpersist selection (actions)" 2016-06-10 22:37:55 +00:00
Mark Salyzyn
03af2286ee Settings: add logpersist selection (actions) 
- Only add logpersist menu if debuggable.
- Only enable logpersist menu if Logging is On.
- Add selection for Off, All and All minus radio.
- Pop up warning box that persistent storage is to be cleared when
  selecting Off (but not if turned off by Logging Size Off or
  Disabling Debugger Options).

Bug: 28936216
Change-Id: Ic0a58abdcd6ca41069efb818d1dcef4e3927d2de
 2016-06-10 21:44:32 +00:00
Bill Yi
c66bffa31f Import translations. DO NOT MERGE 
Change-Id: I1e7bce31415e722131d6127fc7534669ce527d37
Auto-generated-cl: translation import
 2016-06-10 13:49:23 -07:00
Jason Monk
3078e76284 Merge \"Fix crash in finish from onCreate.\" into nyc-dev 
am: 1a1f6b0b1b

Change-Id: I8c4a6902f6fcf0510b2a307ca3fe7e918f9702f9
 2016-06-10 15:11:24 +00:00
TreeHugger Robot
1a1f6b0b1b Merge "Fix crash in finish from onCreate." into nyc-dev 2016-06-10 15:06:34 +00:00
Jason Monk
656bc6004f Fix crash in finish from onCreate. 
Change-Id: Ia4937fecdc93e30a468b8fefd2f8776186c8e151
Fixes: 29245324
 2016-06-10 09:49:12 -04:00
Yohei Yukawa
74358619a0 Merge \"Fix sentence capitalization of locale names.\" into nyc-dev 
am: 294b1586ed

Change-Id: Id61473c100565d9d795bf314ccff6723bdd0c64c
 2016-06-09 23:57:58 +00:00
Yohei Yukawa
294b1586ed Merge "Fix sentence capitalization of locale names." into nyc-dev 2016-06-09 23:47:31 +00:00
Roozbeh Pournader
241f8e6e9c Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev 
am: 5eddc4bde9

Change-Id: If18910dba402d98ffc115af8c87b836fca50ec0f
 2016-06-09 23:06:55 +00:00
Roozbeh Pournader
5eddc4bde9 Merge "Use existing localizations for formatting data usage [DO NOT MERGE]" into nyc-dev 2016-06-09 23:04:22 +00:00
Svet Ganov
0984141943 Merge \"Don\'t send user to permissions screen if none requested\" into nyc-dev 
am: 3e5318496e

Change-Id: I6060ae5a113025b0cfbbd8ff1f58599cb8f4cf7e
 2016-06-09 22:53:07 +00:00
Svetoslav Ganov
3e5318496e Merge "Don't send user to permissions screen if none requested" into nyc-dev 2016-06-09 22:45:49 +00:00
Yohei Yukawa
91c23ca03f Fix sentence capitalization of locale names. 
It turns out that out previous CL [1] is not sufficient to address all
the requests regarding capitalization.

With [1], now InputMethodSubtype#getLocaleDisplayName() returns a locale
name whose capitalization is basically optimized to be used as a list
item.  It works well for list UI, but on a UI element that looks like a
sentence text, we still need to capitalize the first character.

This CL takes care of those UI elements in the Settings app.  This CL
also addresses a remaining TODO about locale-unaware text formatting by
using about android.icu.text.ListFormatter.

  [1]: If105082ce703db7a86738455db7e9fb37f3c6fe8
       e489baf96df2837a3a63b626d9023a4a8b322c28

Bug: 29035638
Change-Id: I59f93f0bc067cdd87c6065c972a7da3cde1128f9
 2016-06-09 15:01:52 -07:00
Roozbeh Pournader
3697dbeaa3 Use existing localizations for formatting data usage [DO NOT MERGE] 
This partially reverts I5be9bb7ce3b11709117da698d6c03610f4e5e40e in
order to use existing localizations and also avoid hard to localize
strings.

Also, we now bidi wrap the usage value, since it may break in the RTL
locales otherwise.

Bug: 28747101
Change-Id: Ibc03632cccfe671164cfbb670a423ada1177db65
 2016-06-09 13:25:56 -07:00
Mark Salyzyn
1f9e0cce2b Merge \\"Settings: add logpersist selection (strings)\\" am: 99afd4a87d 
am: 540ebc39ac  -s ours

Change-Id: I00cbd8cbbb926afccd664239c6064747c96c0142
 2016-06-09 20:18:14 +00:00
Nicolas Prevot
637d24c8b9 Fix rendering of policy transparency activity. 
Use the dialog's context instead of the activity
context to inflate the view.

BUG:29172155
Change-Id: I0fb32e3d4bfc522a4c8b6d7a6ed55acd01f97446
 2016-06-09 20:59:20 +01:00
Mark Salyzyn
540ebc39ac Merge \"Settings: add logpersist selection (strings)\" 
am: 99afd4a87d

Change-Id: I45d09fc05d11ce1dac413896706b4a7e4e11a8ba
 2016-06-09 19:46:46 +00:00
Mark Salyzyn
99afd4a87d Merge "Settings: add logpersist selection (strings)" 2016-06-09 19:38:32 +00:00
Mark Salyzyn
954ed57091 Settings: add logpersist selection (strings) 
Strings for selecting between Off, All and All minus radio to
store logs persistently on the local eMMC device. Strings for
warning button when erasing logpersist data.

Bug: 28936216
Change-Id: I3aaa59a6ebbe1a695490b4a72cad2c807c048985
 2016-06-09 19:37:34 +00:00
Svet Ganov
30ee6ab320 Don't send user to permissions screen if none requested 
bug:29105157

Change-Id: I90ef18f41deae9a7cf28192bd47f16c3af262c29
 2016-06-09 12:28:10 -07:00
Bill Yi
9190e13af2 Import translations. DO NOT MERGE 
am: b43b49c643  -s ours

Change-Id: Ibb7f8a46f201ab267cbb1833608d10b4512babf2
 2016-06-09 14:00:04 +00:00
Bill Yi
b43b49c643 Import translations. DO NOT MERGE 
Change-Id: I7b3039eadee367f4839682567022826320d208e0
Auto-generated-cl: translation import
 2016-06-08 22:38:29 -07:00
Jason Monk
feee247e0c Fix build 
Change-Id: I264b0d9507e62ad5a2debad663faedd549414012
(cherry picked from commit e3ce6713d3)
 2016-06-08 21:29:48 +00:00
Jason Monk
167f6cc87c Merge \"Remove PreferenceActivity\" into nyc-dev 
am: 7f7092c705

Change-Id: I1d7431bd7bf4654f2fbfe8c43344e22d28b5b2f7
 2016-06-08 19:15:42 +00:00
Jason Monk
2c7e1d844f Merge \"Fix data usage format strings\" into nyc-dev 
am: cb1972b908

Change-Id: I42ae51bb815f24b026ff0c25759634b23d13355c
 2016-06-08 19:15:42 +00:00
Jason Monk
4db5484a9d Merge \"Fix disabling of tiles that are not relevant\" into nyc-dev 
am: 9c5d3164f5

Change-Id: I778f8f766ace689b1bd4174000daaafb13253516
 2016-06-08 19:15:41 +00:00
Jason Monk
7f7092c705 Merge "Remove PreferenceActivity" into nyc-dev 2016-06-08 19:13:05 +00:00
Jason Monk
cb1972b908 Merge "Fix data usage format strings" into nyc-dev 2016-06-08 19:11:51 +00:00