PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,103 Commits 1 Branch 0 Tags
42fe05c89bf81c3e4d30cdd3a9e3a1ab8f9eea0c
Commit Graph

29103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
42fe05c89b DND header should be translated. am: 5a67d5f6f0 am: 9850695bfc 
am: 0df18a6a40

Change-Id: I556de9f7650dd88a5dd16e1e7dd67720d73261ee
 2016-06-14 02:06:41 +00:00
Julia Reynolds
c64453b073 DND header should be translated. am: 5a67d5f6f0 am: 46298697ce 
am: fdf4255ced

Change-Id: Ib9332e07b4dfd2a5b44a16328fbf3a84b49c14fc
 2016-06-14 02:06:40 +00:00
Julia Reynolds
0df18a6a40 DND header should be translated. am: 5a67d5f6f0 
am: 9850695bfc

Change-Id: I9e7538ba2ed31e374db6c6192d1faa00ba20f1ee
 2016-06-14 02:02:35 +00:00
Julia Reynolds
fdf4255ced DND header should be translated. am: 5a67d5f6f0 
am: 46298697ce

Change-Id: I9a3302467a75fae2ec01a63871ffcbefe08a58ff
 2016-06-14 02:02:07 +00:00
Julia Reynolds
46298697ce DND header should be translated. 
am: 5a67d5f6f0

Change-Id: Ia9ce4e1465fa20a769b7f66e5cb1ae3577525875
 2016-06-14 01:58:02 +00:00
Julia Reynolds
9850695bfc DND header should be translated. 
am: 5a67d5f6f0

Change-Id: I238ebd6abe78925fde071b3fb09b27690e6d6311
 2016-06-14 01:57:37 +00:00
Julia Reynolds
5a67d5f6f0 DND header should be translated. 
Change-Id: Iac764d71e91f5a0dc1b58bfca8a38d823f0598b9
Fixes: 29123731
 2016-06-14 01:47:05 +00:00
Roozbeh Pournader
a7cb91821a Merge "Make strings for data usage easier to localize" 2016-06-14 00:38:58 +00:00
Doris Ling
827acb4987 Merge \\"Added new setting for gestures.\\" into nyc-mr1-dev am: 8b8a012913 
am: 71e6b9a4d9

Change-Id: I03565452928e3f51f8a336cf7358dc63bf447131
 2016-06-13 23:17:22 +00:00
Daniel Nishi
36d06f6710 Merge \\"Use Settings.Secure for days to retain.\\" into nyc-mr1-dev am: 584320adb8 
am: 08ba377569

Change-Id: I96adf4fe9f3bca96b54486cf5c435a993517e144
 2016-06-13 22:48:56 +00:00
Roozbeh Pournader
0761a4bf06 Make strings for data usage easier to localize 
The strings were complex to localize, especially since they used
formatting that needed to be carefully reconstructed for cases where
the amount of data appears in the middle of a string. Also, we
already had a localization for file sizes, which we should avoid
redoing, to minimize discrepancies.

Finally, we are now bidi wrapping the usage amount, as it may break
in the RTL locales otherwise, since the RTL locales may be using
Latin abbreviations for gigabyte etc that are LTR.

Since formatting needs to be applied to everything except the number
of units in the amount of data used, and markup should be avoided
since it will confuse bidi wrapping, the code carefully constructs
CharSequence templates that are then decorated with spans after
getting filled in.

Bug: 28747101
Change-Id: I18756b4de99eb551a51fe5e74d1c9cf505551f08
 2016-06-13 15:34:00 -07:00
Doris Ling
71e6b9a4d9 Merge \"Added new setting for gestures.\" into nyc-mr1-dev 
am: 8b8a012913

Change-Id: I3bec17fcf1130c4948abeef256a169105d7ad464
 2016-06-13 22:29:14 +00:00
Daniel Nishi
08ba377569 Merge \"Use Settings.Secure for days to retain.\" into nyc-mr1-dev 
am: 584320adb8

Change-Id: Ifd3f1542b9feb2747a54f380ff7047868e563251
 2016-06-13 22:28:38 +00:00
TreeHugger Robot
8b8a012913 Merge "Added new setting for gestures." into nyc-mr1-dev 2016-06-13 22:01:45 +00:00
Daniel Nishi
584320adb8 Merge "Use Settings.Secure for days to retain." into nyc-mr1-dev 2016-06-13 21:18:29 +00:00
Robert Greenwalt
1bd411f64a resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp am: 89b8babe6a 
am: 69118dc9b1

Change-Id: I99d1b094d3de31905d1a72636146794c5ff00334
 2016-06-13 20:14:29 +00:00
Doris Ling
9136523a43 Added new setting for gestures. 
Added a new entry to the top level Settings' Device section to
enable/disable gestures.

Bug: 28565958

Change-Id: Icf642b6a3058c692fb2be9914579996598f03b7d
 2016-06-13 13:13:21 -07:00
宋凯伦
69118dc9b1 resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp 
am: 89b8babe6a

Change-Id: I5918f6a061ab0d5f3d81b99174d5517cd44e389c
 2016-06-13 20:10:42 +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
415da00e36 Merge \"Merge \\\"Remove \\\'You can choose to either trust or remove this certificate\\\' from Check certificate dialog\\\" into nyc-dev am: 86c9894f04 am: b57c55d42c\" into nyc-mr1-dev-plus-aosp 
am: fe91143d71

Change-Id: I04285077816418213ee775c624446a2a563f733b
 2016-06-13 17:52:25 +00:00
Michal Karpinski
24fc55bf27 Merge \\\"Remove \\\'You can choose to either trust or remove this certificate\\\' from Check certificate dialog\\\" into nyc-dev am: 86c9894f04 am: 8532049946 
am: c0832141a0

Change-Id: Ieaa2292d49809073c7faa92861d73a4379f1d3fa
 2016-06-13 17:52:25 +00:00
Daniel Nishi
776c9eca39 Use Settings.Secure for days to retain. 
Previously, we used Shared Preferences, which worked when the
storage manager was localized to Settings. Now that it is in
its own separate APK, we need to use a separate setting to configure
it.

Bug: 28965462
Change-Id: I073859ef1a764679bbc63d3c0cd96af82306212e
 2016-06-13 10:47:23 -07:00
Android Build Merger (Role)
fe91143d71 Merge "Merge \\"Remove \\'You can choose to either trust or remove this certificate\\' from Check certificate dialog\\" into nyc-dev am: 86c9894f04 am: b57c55d42c" into nyc-mr1-dev-plus-aosp 2016-06-13 17:44:32 +00:00
Michal Karpinski
5b57a8991c Merge \\"Remove \\'You can choose to either trust or remove this certificate\\' from Check certificate dialog\\" into nyc-dev am: 86c9894f04 
am: b57c55d42c

Change-Id: If4c300dab4de45c86a7b4719b64cb32937e125b2
 2016-06-13 17:44:24 +00:00
Michal Karpinski
c0832141a0 Merge \\"Remove \\'You can choose to either trust or remove this certificate\\' from Check certificate dialog\\" into nyc-dev am: 86c9894f04 
am: 8532049946

Change-Id: I46c26216d66aa9478d4c8d71cbe7baf4a47de50e
 2016-06-13 17:44:09 +00:00
Michal Karpinski
b57c55d42c Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev 
am: 86c9894f04

Change-Id: I7d2252a50b54c765e2c2a9837ca181861a7bae35
 2016-06-13 17:40:13 +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
Robin Lee
65c8dd536b Merge \"Merge \\\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\\" into nyc-dev am: cab4f9dc39 am: 442498681d\" into nyc-mr1-dev-plus-aosp 
am: 14cc0fd5a3

Change-Id: I1b52da55c4a5ee489492d07c4c54089f6662f49c
 2016-06-13 16:23:02 +00:00
Robin Lee
a649206c19 Merge \\\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\\" into nyc-dev am: cab4f9dc39 am: c7f0f2338a 
am: b5b2fd5204

Change-Id: I7414ee261c0ad3c652e434c2eb0612dfe257488b
 2016-06-13 16:23:01 +00:00
Android Build Merger (Role)
14cc0fd5a3 Merge "Merge \\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\" into nyc-dev am: cab4f9dc39 am: 442498681d" into nyc-mr1-dev-plus-aosp 2016-06-13 16:19:21 +00:00
Robin Lee
f11141c0cd Merge \\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\" into nyc-dev am: cab4f9dc39 
am: 442498681d

Change-Id: I01069ad48a0ccd310b9e29fe11b5420f5057af04
 2016-06-13 16:19:13 +00:00
Robin Lee
b5b2fd5204 Merge \\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\" into nyc-dev am: cab4f9dc39 
am: c7f0f2338a

Change-Id: Ic885afb2eeda787f6a1f65da58db62f8485e285c
 2016-06-13 16:19:10 +00:00
Robin Lee
442498681d Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev 
am: cab4f9dc39

Change-Id: Iaab70bd402967dd628958abbbc06a469cea01b49
 2016-06-13 16:15:20 +00: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 Prévot
e000022872 Merge \"Merge \\\"Fix rendering of policy transparency activity.\\\" into nyc-dev am: 98704bc495 am: 1ba2cbbfc2\" into nyc-mr1-dev-plus-aosp 
am: a48e7e767b

Change-Id: I39c6c088f7e9445b8bd803f8d846d5c81ca3bb7e
 2016-06-13 12:58:28 +00:00
Nicolas Prevot
7f8c6354ac Merge \\\"Fix rendering of policy transparency activity.\\\" into nyc-dev am: 98704bc495 am: 341b21d2f8 
am: 21693422b4

Change-Id: Ifacb026d70a33edf0abb11bd6db6b3fd20cc2348
 2016-06-13 12:58:28 +00:00
Android Build Merger (Role)
a48e7e767b Merge "Merge \\"Fix rendering of policy transparency activity.\\" into nyc-dev am: 98704bc495 am: 1ba2cbbfc2" into nyc-mr1-dev-plus-aosp 2016-06-13 12:54:55 +00:00
Nicolas Prévot
88555d92ee Merge \\"Fix rendering of policy transparency activity.\\" into nyc-dev am: 98704bc495 
am: 1ba2cbbfc2

Change-Id: I2d991bac8336f9d6c017446aeaeffcde1a7960a5
 2016-06-13 12:54:43 +00:00
Nicolas Prévot
21693422b4 Merge \\"Fix rendering of policy transparency activity.\\" into nyc-dev am: 98704bc495 
am: 341b21d2f8

Change-Id: I9c7edec1124d042d045e7dbed77f75c6ec787b6b
 2016-06-13 12:54:36 +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 Prevot
1ba2cbbfc2 Merge \"Fix rendering of policy transparency activity.\" into nyc-dev 
am: 98704bc495

Change-Id: I42bba7f5351b214b45255d9e48c3c6802b306b14
 2016-06-13 12:50:11 +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
5c1a19c573 resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp am: f8c135a986 
am: 2fda09ad85

Change-Id: If97760070eb4b71f7b8ea6dfdc6f68024315d0d2
 2016-06-11 05:22:06 +00:00
Mark Salyzyn
2fda09ad85 resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp 
am: f8c135a986

Change-Id: Ie1a71f0f029e5ca156eee2c15dc4670a724cc69c
 2016-06-11 05:18:20 +00:00