Commit Graph

28844 Commits

Author SHA1 Message Date
Bill Yi
aba253e6c7 Import translations. DO NOT MERGE
Change-Id: I06952539cefb81ca62a8fde4455f1f3e3ba92f67
Auto-generated-cl: translation import
2016-06-14 03:33:30 -07: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
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
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
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
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
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
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
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
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
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
c7e9bfd2b8 Import translations. DO NOT MERGE am: c66bffa31f -s ours
am: 099609af97  -s ours

Change-Id: I61b5e43c6c626fcc18460d658384ff694b718bb3
2016-06-11 04:47:45 +00:00
Bill Yi
6cffc3f8ba Import translations. DO NOT MERGE am: c66bffa31f -s ours
am: b99a48f779  -s ours

Change-Id: Id5fc43bba4265fa74fe298c7efa898d526438484
2016-06-11 04:44:01 +00:00
Bill Yi
b99a48f779 Import translations. DO NOT MERGE
am: c66bffa31f  -s ours

Change-Id: I8396507cd5e07b07539beef48ba50a175455478a
2016-06-11 04:40:07 +00:00
Bill Yi
099609af97 Import translations. DO NOT MERGE
am: c66bffa31f  -s ours

Change-Id: I6351c67c9f6f4882079b269134f7d61abe07da04
2016-06-11 04:40:07 +00:00
Anna Galusza
db0dbef52b Remove "Help & feedback" from toggle screen for accessibility services to
prevent confusion when users are trying to submit feedback for a specific
accessibility service (accessibility services can place their own "Help &
feedabck" in their apks and route it appropriately).
Bug: 29278252

Change-Id: Ie6f0d92a9ded82eaf3a0ac1122861f26639bc58a
2016-06-10 23:40:11 +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